Merge branch 'develop' into develop-settings

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

public/app/features/dashboard/dashboardLoaderSrv.js

@@ -43,7 +43,7 @@ function (angular, moment, _, $, kbn, dateMath, impressionSrv) {
           });
       } else {
         promise = backendSrv.getDashboard($routeParams.type, $routeParams.slug)
-          .then(result => {
+          .then(function(result) {
             if (result.meta.isFolder) {
               $rootScope.appEvent("alert-error", ['Dashboard not found']);
               throw new Error("Dashboard not found");

public/sass/components/_navbar.scss

@@ -1,7 +1,7 @@
 
 .navbar {
   position: relative;
-  padding-left: $side-menu-width;
+  margin-left: 40px;
   z-index: $zindex-navbar-fixed;
   height: $navbarHeight;
   padding-right: $spacer;
@@ -48,12 +48,6 @@
   }
 }
 
-.sidemenu-open {
-  .navbar {
-    padding-left: 15px;
-  }
-}
-
 .navbar-page-btn {
   text-overflow: ellipsis;
   overflow: hidden;
@@ -82,6 +76,8 @@
     line-height: 8px;
     opacity: 0.75;
     margin-right: 8px;
+    // icon hidden on smaller screens
+    display: none;
   }
 }
 
@@ -143,3 +139,22 @@
     @include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl);
   }
 }
+
+@include media-breakpoint-up(sm) {
+  .navbar {
+    margin-left: 50px;
+  }
+
+  .sidemenu-open {
+    .navbar {
+      margin-left: 15px;
+    }
+  }
+
+  .navbar-page-btn {
+    .gicon {
+      display: inline-block;
+    }
+  }
+}
+

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;