From 795d9c0362b6bd4b68742b3fda0d6c12dbfc42ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 11 Dec 2017 11:42:13 +0100
Subject: [PATCH] ux: fixed navbar and sidemenu z-index issue and improved
 responsive rules

---
 pkg/cmd/grafana-server/main.go        |  2 +-
 public/sass/components/_navbar.scss   | 29 ++++++++++++++++++++-------
 public/sass/components/_sidemenu.scss |  9 +--------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go
index 183e4b047cd..46c899d3d81 100644
--- a/pkg/cmd/grafana-server/main.go
+++ b/pkg/cmd/grafana-server/main.go
@@ -30,7 +30,7 @@ import (
 	_ "github.com/grafana/grafana/pkg/tsdb/testdata"
 )
 
-var version = "4.6.0"
+var version = "5.0.0"
 var commit = "NA"
 var buildstamp string
 var build_date string
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index 25d7c6ffa82..231adbc4a55 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -1,7 +1,7 @@
 
 .navbar {
   position: relative;
-  padding-left: $side-menu-width;
+  margin-left: 40px;
   // box-shadow: $navbarShadow;
   z-index: $zindex-navbar-fixed;
   // background: $navbarBackground;
@@ -11,12 +11,6 @@
   flex-grow: 1;
 }
 
-.sidemenu-open {
-  .navbar {
-    padding-left: 15px;
-  }
-}
-
 .navbar-page-btn {
   text-overflow: ellipsis;
   overflow: hidden;
@@ -44,6 +38,8 @@
     line-height: 8px;
     opacity: 0.75;
     margin-right: 8px;
+    // icon hidden on smaller screens
+    display: none;
   }
 }
 
@@ -111,3 +107,22 @@
     }
   }
 }
+
+@include media-breakpoint-up(sm) {
+  .navbar {
+    margin-left: 50px;
+  }
+
+  .sidemenu-open {
+    .navbar {
+      margin-left: 15px;
+    }
+  }
+
+  .navbar-page-btn {
+    .gicon {
+      display: inline-block;
+    }
+  }
+}
+
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index 05882d75fc9..3bedd8a9f14 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -16,7 +16,6 @@
   .sidemenu__close {
     display: none;
   }
-
 }
 
 // body class that hides sidemenu
@@ -191,12 +190,6 @@ li.sidemenu-org-switcher {
 }
 
 @include media-breakpoint-down(xs) {
-  .sidemenu-open {
-    .navbar {
-      padding-left: 60px !important;
-    }
-  }
-
   .sidemenu-open--xs {
     .sidemenu {
       width: 100%;
@@ -227,7 +220,7 @@ li.sidemenu-org-switcher {
     }
 
     .sidemenu__logo_small_breakpoint {
-      padding: 12px 10px 26px;
+      padding: 16px 10px 26px;
       display: flex;
       flex-direction: row;
       justify-content: space-between;