From c99901fd16d18b27af716f4ec7a4e66df6208ac4 Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Mon, 4 Nov 2013 07:47:22 -0600 Subject: style for focused messages --- skins/larry/styles.css | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'skins') diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 0d7a50069..261618f7f 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -1296,7 +1296,7 @@ table.records-table { border-left: 0; } -.records-table tr.selected td { +.records-table tr.selected td, .records-table tr.focused > td.focus { color: #fff !important; background: #019bc6; background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%); @@ -1326,7 +1326,25 @@ table.records-table { color: #ccc !important; } +.records-table td.focus { + /*background: none repeat scroll 0 0 rgba(0, 0, 0, 0);*/ + width: 2px; +} + .records-table tr.focused > td.focus { + border-bottom: 1px solid #017cb4; + border-top: 1px double #019bc6; + } +.records-table tr.selected.focused > td.focus { + background: none repeat scroll 0 0 white; + border-top: none; + border-bottom: 1px solid #ddd; +} +/* +.records-table tr.focused > td.focus { + background: #019bc6 !important; +} +*/ /*** iFrames ***/ #aboutframe { -- cgit v1.2.3 From 48f65c6a7129073fb8c04abdfdaaee77dfd6709e Mon Sep 17 00:00:00 2001 From: Charles McNulty Date: Mon, 4 Nov 2013 11:01:55 -0800 Subject: tiny-focus column for determining where focus should be --- config/defaults.inc.php | 2 +- program/localization/en_US/labels.inc | 1 + program/steps/mail/func.inc | 8 ++------ skins/larry/iehacks.css | 2 +- skins/larry/styles.css | 28 +++++++++------------------- skins/larry/templates/mail.html | 3 ++- 6 files changed, 16 insertions(+), 28 deletions(-) (limited to 'skins') diff --git a/config/defaults.inc.php b/config/defaults.inc.php index ab0e188bd..b430e1d19 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -496,7 +496,7 @@ $config['message_sort_order'] = 'DESC'; // These cols are shown in the message list. Available cols are: // subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); +$config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment', 'focus'); // the default locale setting (leave empty for auto-detection) // RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 8f221a3a9..8084365d3 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -53,6 +53,7 @@ $labels['size'] = 'Size'; $labels['priority'] = 'Priority'; $labels['organization'] = 'Organization'; $labels['readstatus'] = 'Read status'; +$labels['focus'] = 'Focus'; $labels['listoptions'] = 'List options...'; $labels['mailboxlist'] = 'Folders'; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b5a8de408..0019d79c4 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -260,8 +260,6 @@ function rcmail_message_list($attrib) array_unshift($a_show_cols, 'subject'); if (!in_array('threads', $a_show_cols)) array_unshift($a_show_cols, 'threads'); - if (!in_array('focus', $a_show_cols)) - array_unshift($a_show_cols, 'focus'); $_SESSION['skin_path'] = $CONFIG['skin_path']; @@ -311,9 +309,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null array_unshift($a_show_cols, 'subject'); if (!in_array('threads', $a_show_cols)) array_unshift($a_show_cols, 'threads'); - if (!in_array('focus', $a_show_cols)) - array_unshift($a_show_cols, 'focus'); - + $_SESSION['list_attrib']['columns'] = $a_show_cols; // Make sure there are no duplicated columns (#1486999) @@ -339,7 +335,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null if (empty($a_headers)) return; - // remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here + // remove 'threads', 'attachment', 'flag', 'status', 'focus' columns, we don't need them here foreach (array('threads', 'attachment', 'flag', 'status', 'priority', 'focus') as $col) { if (($key = array_search($col, $a_show_cols)) !== FALSE) unset($a_show_cols[$key]); diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css index 960ce7648..340e8511f 100644 --- a/skins/larry/iehacks.css +++ b/skins/larry/iehacks.css @@ -74,7 +74,7 @@ input.button:active { left: 10px; } -.records-table tr.selected td { +.records-table tr.selected td, .records-table tr.focused > td.focus { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0); } diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 261618f7f..172637028 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -1296,6 +1296,15 @@ table.records-table { border-left: 0; } +.records-table td.focus { + width: 2px; +} + +.records-table tr.selected > td.focus { + filter: none; + background: white; +} + .records-table tr.selected td, .records-table tr.focused > td.focus { color: #fff !important; background: #019bc6; @@ -1326,25 +1335,6 @@ table.records-table { color: #ccc !important; } -.records-table td.focus { - /*background: none repeat scroll 0 0 rgba(0, 0, 0, 0);*/ - width: 2px; -} - .records-table tr.focused > td.focus { - border-bottom: 1px solid #017cb4; - border-top: 1px double #019bc6; - } - -.records-table tr.selected.focused > td.focus { - background: none repeat scroll 0 0 white; - border-top: none; - border-bottom: 1px solid #ddd; -} -/* -.records-table tr.focused > td.focus { - background: #019bc6 !important; -} -*/ /*** iFrames ***/ #aboutframe { diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index f2c52c820..640c73950 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -175,7 +175,7 @@
- +
    @@ -192,6 +192,7 @@
    • +
-- cgit v1.2.3 From 6c0b1fde43a79d2c31b3f1fc94868e67936280ea Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Wed, 6 Nov 2013 22:04:09 -0600 Subject: Move focus column to the left-most side --- config/defaults.inc.php | 2 +- program/localization/en_US/labels.inc | 1 - program/steps/mail/func.inc | 11 +++++++++-- skins/larry/templates/mail.html | 1 - 4 files changed, 10 insertions(+), 5 deletions(-) (limited to 'skins') diff --git a/config/defaults.inc.php b/config/defaults.inc.php index b430e1d19..ab0e188bd 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -496,7 +496,7 @@ $config['message_sort_order'] = 'DESC'; // These cols are shown in the message list. Available cols are: // subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment', 'focus'); +$config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); // the default locale setting (leave empty for auto-detection) // RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 8084365d3..8f221a3a9 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -53,7 +53,6 @@ $labels['size'] = 'Size'; $labels['priority'] = 'Priority'; $labels['organization'] = 'Organization'; $labels['readstatus'] = 'Read status'; -$labels['focus'] = 'Focus'; $labels['listoptions'] = 'List options...'; $labels['mailboxlist'] = 'Folders'; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0019d79c4..4cc578751 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -255,12 +255,16 @@ function rcmail_message_list($attrib) // save some variables for use in ajax list $_SESSION['list_attrib'] = $attrib; + // make sure 'threads' and 'subject' columns are present if (!in_array('subject', $a_show_cols)) array_unshift($a_show_cols, 'subject'); 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 @@ -303,13 +307,16 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null } $mbox = $RCMAIL->storage->get_folder(); - + // make sure 'threads' and 'subject' columns are present if (!in_array('subject', $a_show_cols)) array_unshift($a_show_cols, 'subject'); 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) diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index 640c73950..f60fe2a3f 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -192,7 +192,6 @@
    • -
    • -- cgit v1.2.3 From 1f705968827f9dea3ee66e5ea9d35f00d360ad9a Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Sat, 9 Nov 2013 20:49:23 -0600 Subject: CSS only solution to focused messages --- program/steps/mail/func.inc | 11 ++--------- skins/larry/mail.css | 5 ----- skins/larry/styles.css | 12 ++++++------ 3 files changed, 8 insertions(+), 20 deletions(-) (limited to 'skins') 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 = ' '; 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 { -- cgit v1.2.3 From c503ee45ed3a50dc45073df985d80d2bb9653c6e Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Sat, 9 Nov 2013 20:55:56 -0600 Subject: remerge with master --- program/steps/mail/func.inc | 1 - skins/larry/iehacks.css | 2 +- skins/larry/templates/mail.html | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'skins') diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 9358848bd..78a977b82 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -255,7 +255,6 @@ function rcmail_message_list($attrib) // save some variables for use in ajax list $_SESSION['list_attrib'] = $attrib; - // make sure 'threads' and 'subject' columns are present if (!in_array('subject', $a_show_cols)) array_unshift($a_show_cols, 'subject'); diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css index 340e8511f..960ce7648 100644 --- a/skins/larry/iehacks.css +++ b/skins/larry/iehacks.css @@ -74,7 +74,7 @@ input.button:active { left: 10px; } -.records-table tr.selected td, .records-table tr.focused > td.focus { +.records-table tr.selected td { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0); } diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index f60fe2a3f..f2c52c820 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -175,7 +175,7 @@
    - +
      -- cgit v1.2.3 From fc5457d8ba3b470487f31fdddc85cc760911a7a4 Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Sat, 9 Nov 2013 21:11:40 -0600 Subject: remove remnant of focus td --- skins/larry/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'skins') diff --git a/skins/larry/styles.css b/skins/larry/styles.css index f0d5ddd84..b47edec34 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -1305,7 +1305,7 @@ table.records-table { padding-left: 2px; } -.records-table tr.selected td, .records-table tr.focused > td.focus { +.records-table tr.selected td { color: #fff !important; background: #019bc6; background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%); -- cgit v1.2.3 From c07b7b7143ea8bd42c545b25423fc012d0591539 Mon Sep 17 00:00:00 2001 From: cmcnulty Date: Mon, 11 Nov 2013 07:54:56 -0600 Subject: apply focused styles to address book and classic skin --- skins/classic/addressbook.css | 13 +++++++++++++ skins/classic/mail.css | 14 ++++++++++++++ skins/larry/addressbook.css | 13 +++++++++++++ 3 files changed, 40 insertions(+) (limited to 'skins') diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css index 9575ae25f..e4e88ca4c 100644 --- a/skins/classic/addressbook.css +++ b/skins/classic/addressbook.css @@ -224,6 +224,19 @@ -o-text-overflow: ellipsis; } +/* 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; + padding-left: 8px; +} + +/* 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; + padding-left: 4px; +} + #contacts-table .contact.readonly td { font-style: italic; diff --git a/skins/classic/mail.css b/skins/classic/mail.css index dce49b36f..23350dda4 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -958,6 +958,20 @@ table.messagelist.fixedcopy color: #CC0000; } +/* 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 { + 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 39d0cce21..a70b1ba69 100644 --- a/skins/larry/addressbook.css +++ b/skins/larry/addressbook.css @@ -159,6 +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; + padding-left: 34px; + background-position-x: 4px !important; /* important to override selected class */ +} + #contacts-table .group td.name { background-position: 6px -1555px; } -- cgit v1.2.3