diff options
Diffstat (limited to 'skins')
| -rw-r--r-- | skins/classic/addressbook.css | 35 | ||||
| -rw-r--r-- | skins/classic/common.css | 22 | ||||
| -rw-r--r-- | skins/classic/mail.css | 26 | ||||
| -rw-r--r-- | skins/classic/templates/addressbook.html | 3 | ||||
| -rw-r--r-- | skins/classic/templates/mail.html | 2 | ||||
| -rw-r--r-- | skins/larry/addressbook.css | 21 | ||||
| -rw-r--r-- | skins/larry/mail.css | 26 | ||||
| -rw-r--r-- | skins/larry/styles.css | 26 | ||||
| -rw-r--r-- | skins/larry/templates/addressbook.html | 2 | ||||
| -rw-r--r-- | skins/larry/templates/mail.html | 2 | ||||
| -rw-r--r-- | skins/larry/ui.js | 6 |
11 files changed, 101 insertions, 70 deletions
diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css index 78314538a..5afa4592f 100644 --- a/skins/classic/addressbook.css +++ b/skins/classic/addressbook.css @@ -118,7 +118,7 @@ #directorylistbox input { - margin: 0px; + margin: 0 0 0 20px; font-size: 11px; width: 90%; } @@ -144,7 +144,8 @@ width: 280px; } -#directorylist +#directorylist, +#directorylist li ul { list-style: none; margin: 0; @@ -152,11 +153,15 @@ background-color: #FFFFFF; } +#directorylist li ul +{ + border-top: 1px solid #EBEBEB; +} + #directorylist li { display: block; font-size: 11px; - background: url(images/icons/folders.png) 5px -108px no-repeat; border-bottom: 1px solid #EBEBEB; white-space: nowrap; } @@ -168,31 +173,37 @@ padding-left: 25px; padding-top: 2px; padding-bottom: 2px; + height: 16px; text-decoration: none; white-space: nowrap; + background: url(images/icons/folders.png) 5px -108px no-repeat; } -#directorylist li.contactgroup +#directorylist li ul li a { - padding-left: 15px; - background-position: 20px -143px; + padding-left: 45px; } -#directorylist li.contactsearch +#directorylist li ul li:last-child { - background-position: 6px -162px; + border-bottom: 0; } -#directorylist li.selected +#directorylist li.contactgroup a { - background-color: #929292; - border-bottom: 1px solid #898989; + background-position: 22px -143px; +} + +#directorylist li.contactsearch a +{ + background-position: 6px -162px; } -#directorylist li.selected a +#directorylist li.selected > a { color: #FFF; font-weight: bold; + background-color: #929292; } #directorylist li.droptarget diff --git a/skins/classic/common.css b/skins/classic/common.css index b4adc58a7..16edeedf6 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -622,6 +622,27 @@ table.records-table tr.unfocused td background-color: #929292; } +ul.treelist li div.treetoggle +{ + position: absolute; + left: 8px !important; + left: -16px; + top: 1px; + width: 14px; + height: 16px; + cursor: pointer; +} + +ul.treelist li div.collapsed +{ + background: url(images/icons/collapsed.png) bottom right no-repeat; +} + +ul.treelist li div.expanded +{ + background: url(images/icons/expanded.png) bottom right no-repeat; +} + /***** mac-style quicksearch field *****/ @@ -666,6 +687,7 @@ table.records-table tr.unfocused td font-size: 11px; padding: 0px; border: none; + outline: none; } /***** roundcube webmail pre-defined classes *****/ diff --git a/skins/classic/mail.css b/skins/classic/mail.css index 54673fe64..8be35aaa6 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -393,32 +393,6 @@ border-bottom: none; } -#mailboxlist li div -{ - position: absolute; - left: 8px !important; - left: -16px; - top: 1px; - width: 14px; - height: 16px; -} - -#mailboxlist li div.collapsed, -#mailboxlist li div.expanded -{ - cursor: pointer; -} - -#mailboxlist li div.collapsed -{ - background: url(images/icons/collapsed.png) bottom right no-repeat; -} - -#mailboxlist li div.expanded -{ - background: url(images/icons/expanded.png) bottom right no-repeat; -} - #mailboxlist li.inbox { background-position: 5px -18px; diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html index 404fb2c11..9d959d5ef 100644 --- a/skins/classic/templates/addressbook.html +++ b/skins/classic/templates/addressbook.html @@ -63,8 +63,7 @@ <div id="directorylistbox"> <div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div> <div id="directorylist-content" class="boxlistcontent"> - <roundcube:object name="directorylist" id="directorylist" /> - <roundcube:object name="groupslist" id="contactgroupslist" /> + <roundcube:object name="directorylist" id="directorylist" class="treelist" /> </div> <div id="directorylist-footer" class="boxfooter"> <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " /> diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html index 75a112ff5..c7010e87c 100644 --- a/skins/classic/templates/mail.html +++ b/skins/classic/templates/mail.html @@ -28,7 +28,7 @@ <div id="mailboxlist-container"> <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div> <div id="mailboxlist-content" class="boxlistcontent"> -<roundcube:object name="mailboxlist" id="mailboxlist" folder_filter="mail" /> +<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist" folder_filter="mail" /> </div> <div id="mailboxlist-footer" class="boxfooter"> <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " /> diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css index a1c453885..ff3951497 100644 --- a/skins/larry/addressbook.css +++ b/skins/larry/addressbook.css @@ -83,10 +83,23 @@ background-position: 6px -766px; } -#directorylist li.addressbook.selected a { +#directorylist li.addressbook.selected > a { background-position: 6px -791px; } +#directorylist li.addressbook ul li:last-child { + border-bottom: 0; +} + +#directorylist li.addressbook ul.groups { + margin: 0; + padding: 0; +} + +#directorylist li.addressbook ul.groups li { + width: 100%; +} + #directorylist li.contactgroup a { padding-left: 62px; background-position: 32px -1555px; @@ -112,6 +125,12 @@ margin-left: 8px; } +#directorylist li.addressbook div.collapsed, +#directorylist li.addressbook div.expanded { + top: 15px; + left: 20px; +} + #contacts-table .contact td.name { background-position: 6px -1603px; } diff --git a/skins/larry/mail.css b/skins/larry/mail.css index b98a89c8b..898e4e932 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -141,7 +141,7 @@ a.iconbutton.threadmode.selected { background-position: 6px 2px; } -#mailboxlist li:first-child { +#mailboxlist > li:first-child { border-radius: 4px 4px 0 0; border-top: 0; } @@ -247,32 +247,12 @@ a.iconbutton.threadmode.selected { border-bottom: 0; } -#mailboxlist li.mailbox div.collapsed, -#mailboxlist li.mailbox div.expanded { - position: absolute; +#mailboxlist li.mailbox div.treetoggle { top: 13px; left: 19px; - width: 13px; - height: 13px; - background: url(images/listicons.png) -3px -144px no-repeat; - cursor: pointer; -} - -#mailboxlist li.mailbox div.expanded { - background-position: -3px -168px; } -#mailboxlist li.mailbox.selected > div.collapsed { - background-position: -23px -144px; -} - -#mailboxlist li.mailbox.selected > div.expanded { - background-position: -23px -168px; -} - - -#mailboxlist li.mailbox ul li div.collapsed, -#mailboxlist li.mailbox ul li div.expanded { +#mailboxlist li.mailbox ul li div.treetoggle { left: 43px; top: 14px; } diff --git a/skins/larry/styles.css b/skins/larry/styles.css index f7adeba38..7458ebba9 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -986,6 +986,10 @@ ul.listing li { background-color: #d9ecf4; } +ul.listing li ul { + border-top: 1px solid #bbd3da; +} + ul.listing li.droptarget, table.listing tr.droptarget td { background-color: #e8e798; @@ -1002,6 +1006,28 @@ table.layout td { vertical-align: top; } +ul.treelist li div.treetoggle { + position: absolute; + top: 13px; + left: 19px; + width: 13px; + height: 13px; + background: url(images/listicons.png) -3px -144px no-repeat; + cursor: pointer; +} + +ul.treelist li div.treetoggle.expanded { + background-position: -3px -168px; +} + +ul.treelist li.selected > div.collapsed { + background-position: -23px -144px; +} + +ul.treelist li.selected > div.expanded { + background-position: -23px -168px; +} + .listbox .boxfooter { position: absolute; bottom: 0; diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html index 390f8d83b..401640f1f 100644 --- a/skins/larry/templates/addressbook.html +++ b/skins/larry/templates/addressbook.html @@ -30,7 +30,7 @@ <div id="directorylistbox" class="uibox listbox"> <h2 id="directorylist-header" class="boxtitle"><roundcube:label name="groups" /></h2> <div id="directorylist-content" class="scroller withfooter"> - <roundcube:object name="directorylist" id="directorylist" class="listing" /> + <roundcube:object name="directorylist" id="directorylist" class="treelist listing" /> </div> <div id="directorylist-footer" class="boxfooter"> <roundcube:button command="group-create" type="link" title="newcontactgroup" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="groupoptions" id="groupoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="UI.show_popup('groupoptions');return false" innerClass="inner" content="⚙" /> diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index e145ddff8..85cd5203b 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -30,7 +30,7 @@ <div id="folderlist-header"></div> <div id="mailboxcontainer" class="uibox listbox"> <div id="folderlist-content" class="scroller withfooter"> -<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" /> +<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" /> </div> <div id="folderlist-footer" class="boxfooter"> <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="UI.show_popup('mailboxmenu');return false" innerClass="inner" content="⚙" /> diff --git a/skins/larry/ui.js b/skins/larry/ui.js index d2faa3611..d2638bbca 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -1,7 +1,7 @@ /** * Roundcube functions for default skin interface * - * Copyright (c) 2011, The Roundcube Dev Team + * Copyright (c) 2013, The Roundcube Dev Team * * The contents are subject to the Creative Commons Attribution-ShareAlike * License. It is allowed to copy, distribute, transmit and to adapt the work @@ -940,11 +940,11 @@ function rcube_scroller(list, top, bottom) this.delay = 500; this.top - .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); }) + .mouseenter(function() { if (rcmail.drag_active) ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); }) .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); }); this.bottom - .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); }) + .mouseenter(function() { if (rcmail.drag_active) ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); }) .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); }); this.scroll = function(dir) |