Merge branch 'develop' of github.com:grafana/grafana into develop

public/sass/components/_navbar.scss

@@ -4,13 +4,14 @@
   overflow: visible;
   position: relative;
   margin-left: $side-menu-width;
+  box-shadow: 0 0 20px black;
+  z-index: 1;
 }
 
 .navbar-inner {
   min-height: $navbarHeight;
   padding-right: $spacer;
   background-color: $navbarBackground;
-  border-bottom: $navbarBorder;
   @include clearfix();
 }
 

public/sass/components/_sidemenu.scss

@@ -5,7 +5,8 @@
   flex-direction: column;
   width: $side-menu-width;
   background: $navbarBackground;
-  z-index: 1;
+  z-index: 10;
+  box-shadow: 0 0 20px black;
 
   a:focus {
     text-decoration: none;
@@ -17,6 +18,9 @@
     background: $side-menu-bg;
     position: initial;
     height: auto;
+    box-shadow: 0 0 20px black;
+    position: relative;
+    z-index: 1;
   }
   .sidemenu__top,
   .sidemenu__bottom {

public/sass/components/_tabbed_view.scss

@@ -1,9 +1,7 @@
 .tabbed-view {
-  background-color: $page-bg;
-  background-image: $page-gradient;
-  margin: (-$panel-margin*2) (-$panel-margin);
-  margin-bottom: $spacer*2;
+  background-color: $panel-bg;
   padding: $spacer*3;
+  margin-bottom: $dashboard-padding;
 
   &.tabbed-view--panel-edit {
     padding: 0;

public/sass/components/_view_states.scss

@@ -48,6 +48,10 @@
     }
   }
 
+  .navbar {
+    box-shadow: none;
+  }
+
   .navbar-page-btn {
     border-color: transparent;
     background: transparent;