From f52b185dc4e13805d0a69b3ad997a8ca2c241f65 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 6 Dec 2017 13:35:11 +0100
Subject: [PATCH] Move Refresh button to the list footer, make Compose button
 appear also on Compose page

---
 skins/elastic/styles/widgets/taskmenu.less |  6 ------
 skins/elastic/styles/widgets/toolbar.less  | 20 +++++++++++++-------
 skins/elastic/templates/includes/menu.html |  7 +------
 skins/elastic/templates/mail.html          |  1 +
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/skins/elastic/styles/widgets/taskmenu.less b/skins/elastic/styles/widgets/taskmenu.less
index b7f1d9ec2..3fe3a30cf 100644
--- a/skins/elastic/styles/widgets/taskmenu.less
+++ b/skins/elastic/styles/widgets/taskmenu.less
@@ -176,12 +176,6 @@
 
     @media screen and (max-width: @screen-width-xs) and (min-width: 320px) and (min-height: 480px) {
         text-align: left;
-
-        .special-buttons,
-        .action-buttons {
-            display: block;
-            width: 100%;
-        }
     }
 
     .menu-header {
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index 907b77dae..1d20daa97 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -164,6 +164,9 @@
         &.actions:before {
             content: @fa-var-cog;
         }
+        &.refresh:before {
+            content: @fa-var-refresh;
+        }
         &.addto:before {
             content: @fa-var-envelope-o;
         }
@@ -290,8 +293,16 @@
             display: none;
         }
     }
+
+
+    .listselectors {
+        max-width: 100%;
+        display: flex;
+        justify-content: space-around;
+    }
 }
 
+
 .header {
     a.button {
         color: @color-font;
@@ -665,13 +676,8 @@ html.ie11 .toolbar .dropbutton a.dropdown:before {
             justify-content: space-around;
         }
 
-        .listselectors {
-            display: flex;
-            justify-content: space-around;
-
-            & > * {
-                flex-grow: 1;
-            }
+        .listselectors > * {
+            flex-grow: 1;
         }
     }
 }
diff --git a/skins/elastic/templates/includes/menu.html b/skins/elastic/templates/includes/menu.html
index ef5026087..a64566703 100644
--- a/skins/elastic/templates/includes/menu.html
+++ b/skins/elastic/templates/includes/menu.html
@@ -3,12 +3,7 @@
 	<div id="taskmenu" role="navigation" aria-labelledby="aria-label-tasknav">
 		<div class="menu-header"><a class="button icon cancel"><roundcube:label name="close" /></a></div>
 		<span class="action-buttons">
-			<roundcube:if condition="env:task != 'mail' || env:action != 'compose'" />
-				<roundcube:button command="compose" type="link" class="button compose" label="compose" title="writenewmessage" innerclass="inner" />
-			<roundcube:endif />
-			<roundcube:if condition="env:task == 'mail' && !env:action" />
-				<roundcube:button command="checkmail" type="link" class="button refresh" label="refresh" title="checkmail" innerclass="inner" />
-			<roundcube:endif />
+			<roundcube:button command="compose" type="link" class="button compose" label="compose" title="writenewmessage" innerclass="inner" />
 		</span>
 		<roundcube:button command="mail" label="mail" type="link" class="button mail"
 			classSel="button mail selected" innerClass="inner" />
diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
index 0555739ef..c598a2f1f 100644
--- a/skins/elastic/templates/mail.html
+++ b/skins/elastic/templates/mail.html
@@ -55,6 +55,7 @@
 				<a href="#threads" class="button threads" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
 			<roundcube:endif />
 			<roundcube:object name="listmenulink" class="button settings" label="options" innerclass="inner" />
+			<roundcube:button command="checkmail" type="link" class="button refresh" label="refresh" title="checkmail" innerclass="inner" />
 			<roundcube:container name="listcontrols" id="listcontrols" />
 		</div>
 	</div>