diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-07-12 11:24:49 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-07-12 11:24:49 +0200 |
| commit | 688d16e88296e2ae96ab9b7fc379eaef31d77933 (patch) | |
| tree | 74c8dcdd2ffa43083a5ac0b6a86bb6b41a920306 | |
| parent | 9d72713987bb990b40cb51199fc4effcc5c2772e (diff) | |
Join address book toolbars again
| -rw-r--r-- | skins/larry/addressbook.css | 8 | ||||
| -rw-r--r-- | skins/larry/templates/addressbook.html | 17 | ||||
| -rw-r--r-- | skins/larry/templates/mail.html | 4 |
3 files changed, 10 insertions, 19 deletions
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css index 37315cf5c..fe087aece 100644 --- a/skins/larry/addressbook.css +++ b/skins/larry/addressbook.css @@ -18,6 +18,7 @@ left: 0; width: 220px; bottom: 0; + z-index: 2; } #addressview-right { @@ -26,9 +27,9 @@ left: 232px; right: 0; bottom: 0; + z-index: 3; } -#directorytoolbar, #addressbooktoolbar { position: absolute; top: -6px; @@ -36,10 +37,7 @@ right: 260px; height: 40px; white-space: nowrap; -} - -#directorytoolbar { - right: 0; + z-index: 10; } #directorylistbox { diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html index ee92ff4dc..c39c2fe87 100644 --- a/skins/larry/templates/addressbook.html +++ b/skins/larry/templates/addressbook.html @@ -10,14 +10,18 @@ <div id="mainscreen"> -<div id="addressview-left"> - <!-- toolbar --> -<div id="directorytoolbar" class="toolbar"> +<div id="addressbooktoolbar" class="toolbar"> <roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="importcontacts" /> <roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" /> + <span class="spacer"></span> + <roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" /> + <roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" /> + <roundcube:container name="toolbar" id="addressbooktoolbar" /> </div> +<div id="addressview-left"> + <!-- sources/groups list --> <div id="directorylistbox" class="uibox listbox"> <h2 id="directorylist-header" class="boxtitle"><roundcube:label name="groups" /></h2> @@ -33,13 +37,6 @@ <div id="addressview-right"> -<!-- toolbar --> -<div id="addressbooktoolbar" class="toolbar"> - <roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" /> - <roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" /> - <roundcube:container name="toolbar" id="addressbooktoolbar" /> -</div> - <!-- search box --> <div id="quicksearchbar"> <roundcube:object name="searchform" id="quicksearchbox" /> diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index f6b53f2f8..32c64d929 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -46,10 +46,6 @@ <div id="mailview-right"> -<!-- toolbar --> -<div id="messagetoolbar"> -</div> - <div id="messagesearchtools"> <!-- search filter --> |