diff options
Diffstat (limited to 'skins')
| -rw-r--r-- | skins/classic/common.css | 12 | ||||
| -rw-r--r-- | skins/classic/functions.js | 6 | ||||
| -rw-r--r-- | skins/classic/includes/messagetoolbar.html | 16 | ||||
| -rw-r--r-- | skins/classic/settings.css | 6 | ||||
| -rw-r--r-- | skins/classic/templates/responses.html | 2 | ||||
| -rw-r--r-- | skins/larry/images/quota.png | bin | 2033 -> 4967 bytes | |||
| -rw-r--r-- | skins/larry/includes/mailtoolbar.html | 42 | ||||
| -rw-r--r-- | skins/larry/styles.css | 5 | ||||
| -rw-r--r-- | skins/larry/ui.js | 1 |
9 files changed, 60 insertions, 30 deletions
diff --git a/skins/classic/common.css b/skins/classic/common.css index 4d54f4992..6d5a33309 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -260,6 +260,7 @@ body > #message div body > #message div.notice, body > #messagebody .part-notice, +body > #mainscreen #messagebody .part-notice, #message-objects div.notice { background: url(images/display/icons.png) 6px 3px no-repeat; @@ -1267,6 +1268,17 @@ ul.toolbarmenu li.separator_above margin: 1px 4px 1px; } +#searchmenu ul.toolbarmenu li label +{ + padding: 2px 0; + color: black; +} + +#searchmenu ul.toolbarmenu li label.comment +{ + color: #999; +} + /*** folder selector ***/ diff --git a/skins/classic/functions.js b/skins/classic/functions.js index aaa4f7288..5a5ad3950 100644 --- a/skins/classic/functions.js +++ b/skins/classic/functions.js @@ -1027,6 +1027,12 @@ function rcube_init_mail_ui() .addEventListener('afterimport-messages', function(){ rcmail_ui.show_popup('uploadform', false); }); } + // fix message list header on window resize (#1490213) + if (bw.ie && rcmail.message_list) + $(window).resize(function() { + setTimeout(function() { rcmail.message_list.resize(); }, 10); + }); + if (rcmail.env.action == 'compose') rcmail_ui.init_compose_form(); else if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html index 7cf7d477c..a51a34173 100644 --- a/skins/classic/includes/messagetoolbar.html +++ b/skins/classic/includes/messagetoolbar.html @@ -27,23 +27,23 @@ </div> <div id="forwardmenu" class="popupmenu"> - <ul> + <ul id="forwardmenumenu"> <roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /> <roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /> - <roundcube:container name="forwardmenu" id="forwardmenu" /> + <roundcube:container name="forwardmenu" id="forwardmenumenu" /> </ul> </div> <div id="replyallmenu" class="popupmenu"> - <ul> + <ul id="replyallmenumenu"> <roundcube:button type="link-menuitem" command="reply-all" label="replyall" prop="sub" classAct="replyalllink active" class="replyalllink" /> <roundcube:button type="link-menuitem" command="reply-list" label="replylist" prop="sub" classAct="replylistlink active" class="replylistlink" /> - <roundcube:container name="replyallmenu" id="replyallmenu" /> + <roundcube:container name="replyallmenu" id="replyallmenumenu" /> </ul> </div> <div id="messagemenu" class="popupmenu"> - <ul class="toolbarmenu"> + <ul class="toolbarmenu" id="messagemenumenu"> <roundcube:button type="link-menuitem" class="printlink" command="print" label="printmessage" classAct="printlink active" /> <roundcube:button type="link-menuitem" class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /> <roundcube:button type="link-menuitem" class="editlink" command="edit" prop="new" label="editasnew" classAct="editlink active" /> @@ -51,16 +51,16 @@ <roundcube:button type="link-menuitem" class="copylink" command="copy" label="copyto" classAct="copylink active" innerclass="folder-selector-link" /> <roundcube:button type="link-menuitem" class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" menuitem-class="separator_below" /> <roundcube:button type="link-menuitem" class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /> - <roundcube:container name="messagemenu" id="messagemenu" /> + <roundcube:container name="messagemenu" id="messagemenumenu" /> </ul> </div> <div id="markmessagemenu" class="popupmenu"> - <ul class="toolbarmenu"> + <ul class="toolbarmenu" id="markmessagemenumenu"> <roundcube:button type="link-menuitem" command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /> <roundcube:button type="link-menuitem" command="mark" prop="unread" label="markunread" classAct="unreadlink active" class="unreadlink" /> <roundcube:button type="link-menuitem" command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /> <roundcube:button type="link-menuitem" command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /> - <roundcube:container name="markmenu" id="markmessagemenu" /> + <roundcube:container name="markmenu" id="markmessagemenumenu" /> </ul> </div> diff --git a/skins/classic/settings.css b/skins/classic/settings.css index 9dda7bb8d..673e145eb 100644 --- a/skins/classic/settings.css +++ b/skins/classic/settings.css @@ -33,6 +33,12 @@ table-layout: fixed; } +#identities-table tbody tr td, +#sections-table tbody tr td +{ + cursor: default; +} + #identities-table tbody tr.readonly td { font-style: italic; diff --git a/skins/classic/templates/responses.html b/skins/classic/templates/responses.html index b15053738..a93047efb 100644 --- a/skins/classic/templates/responses.html +++ b/skins/classic/templates/responses.html @@ -25,7 +25,7 @@ <roundcube:object name="responsesList" id="identities-table" class="records-table" cellspacing="0" summary="Responses list" noheader="true" editIcon="" /> </div> <div class="boxfooter"> -<roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="buttonPas delgroup" classAct="button delgroup" content=" " condition="config:identities_level:0<2" /> +<roundcube:button command="add" type="link" title="addresponse" class="buttonPas addgroup" classAct="button addgroup" content=" " /><roundcube:button command="delete" type="link" title="delete" class="buttonPas delgroup" classAct="button delgroup" content=" " /> </div> </div> diff --git a/skins/larry/images/quota.png b/skins/larry/images/quota.png Binary files differindex 61c1d414e..b9ca00cd6 100644 --- a/skins/larry/images/quota.png +++ b/skins/larry/images/quota.png diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html index 9d66763cd..45fc71860 100644 --- a/skins/larry/includes/mailtoolbar.html +++ b/skins/larry/includes/mailtoolbar.html @@ -23,7 +23,7 @@ <ul id="forwardmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-forwardmenu"> <roundcube:button type="link-menuitem" command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /> <roundcube:button type="link-menuitem" command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /> - <roundcube:container name="forwardmenu" id="forwardmenu" /> + <roundcube:container name="forwardmenu" id="forwardmenu-menu" /> </ul> </div> @@ -32,31 +32,31 @@ <ul id="replyallmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-replyallmenu"> <roundcube:button type="link-menuitem" command="reply-all" label="replyall" prop="sub" class="replyalllink" classAct="replyalllink active" /> <roundcube:button type="link-menuitem" command="reply-list" label="replylist" prop="sub" class="replylistlink" classAct="replylistlink active" /> - <roundcube:container name="replyallmenu" id="replyallmenu" /> + <roundcube:container name="replyallmenu" id="replyallmenu-menu" /> </ul> </div> <div id="messagemenu" class="popupmenu" aria-hidden="true"> - <h3 id="aria-label-messagemenu" class="voice"><roundcube:label name="arialabelmoremessageactions" /></h3> - <ul id="messagemenu-menu" class="toolbarmenu iconized" role="menu" aria-labelledby="aria-label-messagemenu"> - <roundcube:button type="link-menuitem" command="print" label="printmessage" class="icon" classAct="icon active" innerclass="icon print" /> - <roundcube:button type="link-menuitem" command="download" label="emlsave" class="icon" classAct="icon active" innerclass="icon download" /> - <roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /> - <roundcube:button type="link-menuitem" command="viewsource" label="viewsource" class="icon" classAct="icon active" innerclass="icon viewsource" /> - <roundcube:button type="link-menuitem" command="move" label="moveto" class="icon" classAct="icon active" innerclass="icon move folder-selector-link" /> - <roundcube:button type="link-menuitem" command="copy" label="copyto" class="icon" classAct="icon active" innerclass="icon copy folder-selector-link" /> - <roundcube:button type="link-menuitem" command="open" label="openinextwin" target="_blank" class="icon" classAct="icon active" innerclass="icon extwin" /> - <roundcube:container name="messagemenu" id="messagemenu" /> - </ul> + <h3 id="aria-label-messagemenu" class="voice"><roundcube:label name="arialabelmoremessageactions" /></h3> + <ul id="messagemenu-menu" class="toolbarmenu iconized" role="menu" aria-labelledby="aria-label-messagemenu"> + <roundcube:button type="link-menuitem" command="print" label="printmessage" class="icon" classAct="icon active" innerclass="icon print" /> + <roundcube:button type="link-menuitem" command="download" label="emlsave" class="icon" classAct="icon active" innerclass="icon download" /> + <roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /> + <roundcube:button type="link-menuitem" command="viewsource" label="viewsource" class="icon" classAct="icon active" innerclass="icon viewsource" /> + <roundcube:button type="link-menuitem" command="move" label="moveto" class="icon" classAct="icon active" innerclass="icon move folder-selector-link" /> + <roundcube:button type="link-menuitem" command="copy" label="copyto" class="icon" classAct="icon active" innerclass="icon copy folder-selector-link" /> + <roundcube:button type="link-menuitem" command="open" label="openinextwin" target="_blank" class="icon" classAct="icon active" innerclass="icon extwin" /> + <roundcube:container name="messagemenu" id="messagemenu-menu" /> + </ul> </div> <div id="markmessagemenu" class="popupmenu" aria-hidden="true"> - <h3 id="aria-label-markmessagemenu" class="voice"><roundcube:label name="arialabelmarkmessagesas" /></h3> - <ul id="markmessagemenu-menu" class="toolbarmenu iconized" role="menu" aria-labelledby="aria-label-markmessagemenu"> - <roundcube:button type="link-menuitem" command="mark" prop="read" label="markread" classAct="icon active" class="icon" innerclass="icon read" /> - <roundcube:button type="link-menuitem" command="mark" prop="unread" label="markunread" classAct="icon active" class="icon" innerclass="icon unread" /> - <roundcube:button type="link-menuitem" command="mark" prop="flagged" label="markflagged" classAct="icon active" class="icon" innerclass="icon flagged" /> - <roundcube:button type="link-menuitem" command="mark" prop="unflagged" label="markunflagged" classAct="icon active" class="icon" innerclass="icon unflagged" /> - <roundcube:container name="markmenu" id="markmessagemenu" /> - </ul> + <h3 id="aria-label-markmessagemenu" class="voice"><roundcube:label name="arialabelmarkmessagesas" /></h3> + <ul id="markmessagemenu-menu" class="toolbarmenu iconized" role="menu" aria-labelledby="aria-label-markmessagemenu"> + <roundcube:button type="link-menuitem" command="mark" prop="read" label="markread" classAct="icon active" class="icon" innerclass="icon read" /> + <roundcube:button type="link-menuitem" command="mark" prop="unread" label="markunread" classAct="icon active" class="icon" innerclass="icon unread" /> + <roundcube:button type="link-menuitem" command="mark" prop="flagged" label="markflagged" classAct="icon active" class="icon" innerclass="icon flagged" /> + <roundcube:button type="link-menuitem" command="mark" prop="unflagged" label="markunflagged" classAct="icon active" class="icon" innerclass="icon unflagged" /> + <roundcube:container name="markmenu" id="markmessagemenu-menu" /> + </ul> </div> diff --git a/skins/larry/styles.css b/skins/larry/styles.css index c8c9a038a..2f3cefdb0 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -2231,6 +2231,11 @@ a.iconbutton:focus, background: url(images/quota.png) -100px 0 no-repeat; } +#quotadisplay.p90, +#quotadisplay.p100 { + color: #e03221; +} + table.quota-info { border-spacing: 0; border-collapse: collapse; diff --git a/skins/larry/ui.js b/skins/larry/ui.js index a4c29fd9e..a1c00eb29 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -532,6 +532,7 @@ function rcube_mail_ui() y -= step; element.css('background-position', '0 -' + y + 'px'); + element.attr('class', 'countdisplay p' + (Math.round(p.percent / 10) * 10)); if (p.table) { if (!menu.length) |
