Tweak borders and paddings of focused/selected list rows. Don't show focus indicator when selected

4 files changed, 32 insertions, 25 deletions

diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css
index e4e88ca4c..db039f1ad 100644
--- a/skins/classic/addressbook.css
+++ b/skins/classic/addressbook.css
@@ -233,10 +233,15 @@
 
 /* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
 #contacts-table tbody tr.focused > td:first-child {
-	border-left: 4px solid #EBEBEB;
+	border-left: 4px solid #ddd;
 	padding-left: 4px;
 }
 
+#contacts-table tbody tr.selected.focused > td:first-child {
+	border-left: 0;
+	padding-left: 8px;
+}
+
 #contacts-table .contact.readonly td
 {
   font-style: italic;
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 2b09ba269..4475fd74d 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -958,20 +958,20 @@ table.messagelist.fixedcopy
   color: #CC0000;
 }
 
+/* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
+.messagelist tbody tr.focused > td:first-child {
+	border-left: 6px solid #ddd;
+	padding-left: 3px;
+}
+
 /* This padding-left minus the focused padding left should be half of the focused border-left */
 .messagelist thead tr td:first-child,
-.messagelist tbody tr td:first-child {
+.messagelist tbody tr td:first-child,
+.messagelist tbody tr.selected.focused > td:first-child {
 	border-left: 0;
 	padding-left: 6px;
 }
 
-
-/* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
-.messagelist tbody tr.focused > td:first-child {
-	border-left: 8px solid #EBEBEB;
-	padding-left: 2px;
-}
-
 .messagelist tr.selected td
 {
   color: #FFFFFF;
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 8681cda70..43e433b2a 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -159,17 +159,19 @@
 	font-weight: bold;
 }
 
-/* This padding-left should be equal to the focused border-left + the focused padding-left */
-#contacts-table thead tr td:first-child,
-#contacts-table tbody tr td:first-child {
-	border-left: 0;
-}
-
 /* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
 #contacts-table tbody tr.focused > td:first-child {
-	border-left: 2px ridge #ffffff;
+	border-left: 2px solid #b0ccd7;
 	padding-left: 34px;
-	background-position-x: 4px !important; /* important to override selected class */	
+	background-position-x: 4px;
+}
+
+/* This padding-left should be equal to the focused border-left + the focused padding-left */
+#contacts-table thead tr td:first-child,
+#contacts-table tbody tr td:first-child,
+#contacts-table tbody tr.selected.focused > td:first-child {
+	border-left: 0;
+	padding-left: 36px;
 }
 
 #contacts-table .group td.name {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 810299735..b19d9c725 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1378,20 +1378,20 @@ table.records-table {
 	background-color: #fff;
 }
 
+/* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
+.records-table tbody tr.focused > td:first-child {
+	border-left: 4px solid #b0ccd7;
+	padding-left: 2px;
+}
+
 /* This padding-left minus the focused padding left should be half of the focused border-left */
 .records-table thead tr td:first-child,
-.records-table tbody tr td:first-child {
+.records-table tbody tr td:first-child,
+.records-table tbody tr.selected.focused > td:first-child {
 	border-left: 0;
 	padding-left: 6px;
 }
 
-
-/* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
-.records-table tbody tr.focused > td:first-child {
-	border-left: 8px solid #DDDDDD;
-	padding-left: 2px;
-}
-
 .records-table tr.selected td {
 	color: #fff !important;
 	background: #019bc6;