From 48cb0a2c0f39347a74971eeb049d600d0c4ebacb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 10 May 2018 12:29:32 +0200
Subject: [PATCH] Elastic: Fix various issues with the new toolbars layout

---
 skins/elastic/styles/layout.less          | 22 +++++++++-------------
 skins/elastic/styles/widgets/toolbar.less |  8 ++++++--
 skins/elastic/ui.js                       |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/skins/elastic/styles/layout.less b/skins/elastic/styles/layout.less
index 5a6643319..4ac8e6635 100644
--- a/skins/elastic/styles/layout.less
+++ b/skins/elastic/styles/layout.less
@@ -125,19 +125,6 @@ body > #layout {
             justify-content: center;
         }
 
-        &.list > .footer,
-        &.sidebar > .footer {
-            height: @layout-footer-height;
-            min-height: @layout-footer-height;
-            line-height: @layout-footer-height;
-
-            &.small {
-                height: @layout-footer-small-height;
-                min-height: @layout-footer-small-height;
-                line-height: @layout-footer-small-height;
-            }
-        }
-
         & > .header {
             border-bottom: 1px solid @color-layout-border;
             color: @color-layout-header;
@@ -157,6 +144,15 @@ body > #layout {
         & > .footer {
             border-top: 1px solid @color-layout-border;
             background-color: @color-layout-footer-background;
+            height: @layout-footer-height;
+            min-height: @layout-footer-height;
+            line-height: @layout-footer-height;
+
+            &.small {
+                height: @layout-footer-small-height;
+                min-height: @layout-footer-small-height;
+                line-height: @layout-footer-small-height;
+            }
 
             &:empty {
                 display: none;
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index c0a5f94b1..5b40a7eb5 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -234,8 +234,8 @@
     }
 
     &.pagenav {
-        text-align: center;
         display: flex;
+        justify-content: normal !important;
 
         a.button {
             flex-grow: 1;
@@ -246,6 +246,10 @@
             &:before {
                 line-height: 1.5 !important;
             }
+
+            &.toggleselect {
+                flex-grow: unset !important;
+            }
         }
 
         .pagenav-text {
@@ -270,7 +274,7 @@
             cursor: pointer;
 
             a.button {
-                flex-grow: initial;
+                flex-grow: unset;
             }
 
             .pagenav-text {
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 29795c112..516486235 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -161,7 +161,7 @@ function rcube_elastic_ui()
         });
 
         // Move form buttons from the content frame into the frame footer (on parent window)
-        $('.formbuttons').children().each(function() {
+        $('.formbuttons').filter(function() { return !$(this).parent('.searchoptions').length; }).children().each(function() {
             var target = $(this);
 
             // skip non-content buttons
@@ -445,7 +445,7 @@ function rcube_elastic_ui()
                 list = table.data('list');
 
             if (rcmail[list] && rcmail[list].multiselect) {
-                var parent = table.parents('.sidebar,.list,.content'),
+                var parent = table.parents('.sidebar,.list,.content').last(),
                     toolbar = parent.find('.pagenav');
 
                 if (!toolbar.length) {