diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-09-17 22:04:16 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-09-17 22:04:16 +0200 |
| commit | 8f098e8dead85b6512ac72b2d805314baec72a2f (patch) | |
| tree | 96b89dbcc2a58dab0f2dd1183beef3036c13287f /skins | |
| parent | 99d9f50a0000447d0a752e6c43716237dc0da176 (diff) | |
| parent | 6898b420ed4eb2bd2d1933758cde27bdd305d72a (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'skins')
| -rw-r--r-- | skins/classic/includes/messagetoolbar.html | 2 | ||||
| -rw-r--r-- | skins/larry/includes/mailtoolbar.html | 2 | ||||
| -rw-r--r-- | skins/larry/mail.css | 1 | ||||
| -rw-r--r-- | skins/larry/ui.js | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html index 3f4995b83..ecaf8f79b 100644 --- a/skins/classic/includes/messagetoolbar.html +++ b/skins/classic/includes/messagetoolbar.html @@ -45,7 +45,7 @@ <ul class="toolbarmenu"> <li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li> <li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li> - <li><roundcube:button class="editlink" command="edit" label="editasnew" classAct="editlink active" /></li> + <li><roundcube:button class="editlink" command="edit" prop="new" label="editasnew" classAct="editlink active" /></li> <li class="separator_below"><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li> <li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li> <roundcube:container name="messagemenu" id="messagemenu" /> diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html index f750e061a..60cebe01b 100644 --- a/skins/larry/includes/mailtoolbar.html +++ b/skins/larry/includes/mailtoolbar.html @@ -37,7 +37,7 @@ <ul class="toolbarmenu iconized"> <li><roundcube:button command="print" label="printmessage" class="icon" classAct="icon active" innerclass="icon print" /></li> <li><roundcube:button command="download" label="emlsave" class="icon" classAct="icon active" innerclass="icon download" /></li> - <li><roundcube:button command="edit" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /></li> + <li><roundcube:button command="edit" prop="new" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /></li> <li><roundcube:button command="viewsource" label="viewsource" class="icon" classAct="icon active" innerclass="icon viewsource" /></li> <li><roundcube:button command="open" label="openinextwin" target="_blank" class="icon" classAct="icon active" innerclass="icon extwin" /></li> <roundcube:container name="messagemenu" id="messagemenu" /> diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 496cbbd15..04f56e134 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -837,6 +837,7 @@ h3.subject { #messageheader { position: relative; height: auto; + min-height: 52px; margin: 0 8px 0 0; padding: 0 0 0 72px; border-bottom: 2px solid #f0f0f0; diff --git a/skins/larry/ui.js b/skins/larry/ui.js index e3b5eefe4..c221b8681 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -144,7 +144,7 @@ function rcube_mail_ui() new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details', orientation:'v', relative:true, start:266, min:180, size:12 }).init(); } - else if (rcmail.env.action == 'preferences') { + else if (rcmail.env.action == 'preferences' || !rcmail.env.action) { new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box', orientation:'v', relative:true, start:266, min:180, size:12 }).init(); } |