CSS only solution to focused messages

3 files changed, 8 insertions, 20 deletions

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 6317e328f..9358848bd 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -262,9 +262,6 @@ function rcmail_message_list($attrib)
   if (!in_array('threads', $a_show_cols))
     array_unshift($a_show_cols, 'threads');
 
-  // always put focus first
-  array_unshift($a_show_cols, 'focus');  
-
   $_SESSION['skin_path'] = $CONFIG['skin_path'];
 
   // set client env
@@ -314,9 +311,6 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
   if (!in_array('threads', $a_show_cols))
     array_unshift($a_show_cols, 'threads');
 
-  // always put focus first
-  array_unshift($a_show_cols, 'focus');  
-    
   $_SESSION['list_attrib']['columns'] = $a_show_cols;
 
   // Make sure there are no duplicated columns (#1486999)
@@ -342,8 +336,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
   if (empty($a_headers))
     return;
 
-  // remove 'threads', 'attachment', 'flag', 'status', 'focus' columns, we don't need them here
-  foreach (array('threads', 'attachment', 'flag', 'status', 'priority', 'focus') as $col) {
+  // remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
+  foreach (array('threads', 'attachment', 'flag', 'status', 'priority') as $col) {
     if (($key = array_search($col, $a_show_cols)) !== FALSE)
       unset($a_show_cols[$key]);
   }
@@ -471,7 +465,6 @@ function rcmail_message_list_head($attrib, $a_show_cols)
       case 'attachment':
       case 'priority':
       case 'status':
-      case 'focus':
         $col_name = '<span class="' . $col .'">&nbsp;</span>';
         break;
       case 'threads':
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 0c6166485..f3b95b850 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -453,11 +453,6 @@ a.iconbutton.threadmode.selected {
 
 /*** message list ***/
 
-/* this is necessary to make FF3 display borders */
-body:-moz-last-node #messagelist {
-	border-collapse: separate;
-}
-
 table.messagelist {
 	z-index: 1;
 }
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 172637028..f0d5ddd84 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1291,18 +1291,18 @@ table.records-table {
 	background-color: #fff;
 }
 
+/* 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 {
 	border-left: 0;
+	padding-left: 6px;
 }
 
-.records-table td.focus {
-	width: 2px;
-}
 
-.records-table tr.selected > td.focus {
-	filter: none;
-	background: white;
+/* 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, .records-table tr.focused > td.focus {