Elastic: Small improvements in searchbar

roundcube · May 17, 2018 · 9746de2 · 9746de2
1 parent 0d62450
commit 9746de2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
@@ -81,6 +81,14 @@ public function __construct($task = null, $framed = false)
         $this->set_env('cookie_path', ini_get('session.cookie_path'));
         $this->set_env('cookie_secure', filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN));
 
+        // Easy way to change skin via GET argument, for developers
+        if ($this->devel_mode && !empty($_GET['skin']) && preg_match('/^[a-z0-9-_]+$/i', $_GET['skin'])) {
+            if ($this->check_skin($_GET['skin'])) {
+                $this->set_skin($_GET['skin']);
+                $this->app->user->save_prefs(array('skin' => $_GET['skin']));
+            }
+        }
+
         // load and setup the skin
         $this->set_skin($this->config->get('skin'));
         $this->set_assets_path($this->config->get('assets_path'), $this->config->get('assets_dir'));
@@ -503,14 +511,6 @@ public function redirect($p = array(), $delay = 1, $secure = false)
      */
     public function send($templ = null, $exit = true)
     {
-        // Easy way to change skin via GET argument, for developers
-        if ($this->devel_mode && !empty($_GET['skin']) && preg_match('/^[a-z0-9-_]+$/i', $_GET['skin'])) {
-            if ($this->check_skin($_GET['skin'])) {
-                $this->set_skin($_GET['skin']);
-                $this->app->user->save_prefs(array('skin' => $_GET['skin']));
-            }
-        }
-
         if ($templ != 'iframe') {
             // prevent from endless loops
             if ($exit != 'recur' && $this->app->plugins->is_processing('render_page')) {
@@ -2143,10 +2143,10 @@ public function search_form($attrib)
             ));
 
             $out = html::div(array(
-                'role'            => 'search',
-                'aria-labelledby' => $attrib['label'] ? 'aria-label-' . $attrib['label'] : null,
-                'class'           => $attrib['wrapper'],
-            ), "$header$out\n$options_button\n$reset_button\n$search_button");
+                    'role'            => 'search',
+                    'aria-labelledby' => $attrib['label'] ? 'aria-label-' . $attrib['label'] : null,
+                    'class'           => $attrib['wrapper'],
+                ), "$header$out\n$reset_button\n$options_button\n$search_button");
         }
 
         return $out;

diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
@@ -761,6 +761,7 @@ a.button.icon.toolbar-button {
 
 .searchbar {
     height: @layout-searchbar-height;
+    min-height: @layout-searchbar-height; // because of Flexbox
     line-height: @layout-searchbar-height;
     background-color: @color-searchbar-background;
     border-bottom: 1px solid @color-list-border;
@@ -779,6 +780,7 @@ a.button.icon.toolbar-button {
             &:extend(.font-icon-class);
             content: @fa-var-search;
             height: @layout-searchbar-height;
+            color: @color-toolbar-button;
         }
     }
 
@@ -792,12 +794,12 @@ a.button.icon.toolbar-button {
     a.button {
         height: @layout-searchbar-height;
         min-width: auto;
+        color: @color-toolbar-button;
 
         &:before {
             &:extend(.font-icon-class);
         }
 
-
         &.options {
             &:before {
                 content: @fa-var-filter;
@@ -807,19 +809,13 @@ a.button.icon.toolbar-button {
 
         &.reset {
             display: none;
-            position: absolute;
-            right: .5rem;
 
             &:before {
                 content: @fa-var-times;
                 font-size: 1em;
             }
         }
 
-        &.options + .reset {
-            right: 2.5rem;
-        }
-
         &.search {
             display: none;
         }
@@ -830,10 +826,6 @@ a.button.icon.toolbar-button {
     }
 
     &.active {
-        form:before {
-            color: @color-searchbar-icon-active;
-        }
-
         a.button.reset {
             display: inline;
         }