From b1e08fa684e028eafffea51d68f19c15707e6843 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Tue, 2 May 2017 12:09:47 +0200
Subject: [PATCH] Merge branch 'SPR-950' of
 gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master -
 check

---
 css/area_header.less              | 12 +-----------
 css/area_main-sidebar-search.less | 21 ++++++++++++++++-----
 css/area_nav-usertools.less       | 13 +++++++++++--
 css/base_mixins.less              |  2 +-
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/css/area_header.less b/css/area_header.less
index eedc601..9a560ab 100755
--- a/css/area_header.less
+++ b/css/area_header.less
@@ -142,33 +142,23 @@
         a {
             .fontello();
             .icon-menu();
+            .btn-hover();
 
             display: block;
             min-height: @toggle-size;
             min-width: @toggle-size;
             box-sizing: border-box;
-            background-color: #fff;
             border: 1px solid @ini_border;
             border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
-            color: @ini_nav_menu_color;
             font-size: 1rem;
             text-align: center;
             text-decoration: none;
             line-height: 1;
-            transition: @transition color, @transition background-color, @transition border-color;
 
             &::before {
                 font-size: 1.5rem;
                 margin: .1rem 0 0;
             }
-
-            &:hover,
-            &:active,
-            &:focus {
-                background-color: @ini_nav_menu_hover_bg;
-                border-color: @ini_nav_menu_hover_color;
-                color: @ini_nav_menu_hover_color;
-            }
         }
     }
 
diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less
index 337ef5b..70987bf 100644
--- a/css/area_main-sidebar-search.less
+++ b/css/area_main-sidebar-search.less
@@ -184,14 +184,12 @@
 @media @screen_min-md {
     .wide-content {
         .search.main-sidebar {
-            display: block;
-
             p.toggleSearch {
                 position: relative;
                 z-index: 1;
                 display: block;
                 float: left;
-                width: auto;
+                width: 100%;
             }
 
             form {
@@ -217,9 +215,22 @@
 
 
 @media @screen_max-md {
-    .show-mobile-sidebar {
+    // show when toggled
+    body.show-mobile-sidebar {
+        p.toggleSearch {
+            display: none !important;
+        }
+
         .search.main-sidebar {
-            display: block;
+            display: block !important;
+            position: relative;
+            z-index: 1;
+            margin-left: -1px;
+            margin-right: -1px;
+
+            form {
+                margin-bottom: 1rem;
+            }
         }
     }
 }
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index 26f5a1a..a18909f 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -33,6 +33,14 @@
         padding: 0;
         margin: (@very-small-spacing * 2) -.25rem 0 0;
 
+        @media @screen_max-md {
+            margin-right: .5rem;
+        }
+
+        @media @screen_max-xxs {
+            margin-right: -.3rem;
+        }
+
         li {
             .btn-usertools-wrapper(); // uniform li
             .btn-usertools-num();
@@ -108,7 +116,7 @@
                 @media @screen_max-xs {
                     position: absolute;
                     top: @headericons-margin-xxs;
-                    right: (@toggle-size + @headericons-margin-xxs);
+                    right: 2.9rem;
                     overflow: hidden;
                     white-space: nowrap;
                     margin: -1px 0 0;
@@ -116,6 +124,7 @@
 
                 @media @screen_max-xxs {
                     left: -10px;
+                    right: (@toggle-size + @headericons-margin-xxs);
                     width: auto;
                 }
 
@@ -178,11 +187,11 @@
                     &:focus,
                     &:active {
                         background-color: @ini_nav_menu_hover_color;
-                        border-color: @ini_nav_menu_hover_color;
                         color: @ini_nav_menu_hover_bg;
 
                         &::before {
                             opacity: 1;
+                            border-color: @ini_nav_menu_hover_bg;
                         }
 
                         bdi,
diff --git a/css/base_mixins.less b/css/base_mixins.less
index 9725764..e17ee37 100755
--- a/css/base_mixins.less
+++ b/css/base_mixins.less
@@ -151,7 +151,7 @@
     &:active,
     &:focus {
         background-color: @ini_nav_menu_hover_color;
-        border-color: @ini_nav_menu_hover_bg;
+        border-color: @ini_nav_menu_hover_color;
         color: @ini_nav_menu_hover_bg;
 
         .prefix {