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

public/sass/components/_gf-form.scss

@@ -1,4 +1,4 @@
-$gf-form-margin: 1px;
+$gf-form-margin: 3px;
 
 .gf-form {
   margin-bottom: $gf-form-margin;
@@ -55,6 +55,7 @@ $gf-form-margin: 1px;
 
 .gf-form-label {
   padding: $input-padding-y $input-padding-x;
+  margin-right: $gf-form-margin;
   flex-shrink: 0;
   font-weight: $font-weight-semi-bold;
 
@@ -107,6 +108,7 @@ $gf-form-margin: 1px;
   display: block;
   width: 100%;
   padding: $input-padding-y $input-padding-x;
+  margin-right: $gf-form-margin;
   font-size: $font-size-base;
   line-height: $input-line-height;
   color: $input-color;
@@ -114,8 +116,6 @@ $gf-form-margin: 1px;
   background-image: none;
   background-clip: padding-box;
   border: 1px solid $input-border-color;
-  border-bottom: none;
-  border-left: none;
   @include border-radius($input-border-radius-sm);
   @include box-shadow($input-box-shadow);
   white-space: nowrap;

public/sass/components/_navbar.scss

@@ -62,40 +62,6 @@
   background-color: $navbarLinkBackgroundActive;
 }
 
-.navbar-page-btn {
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-  display: block;
-  margin: 0;
-  color: darken($link-color, 5%);
-  font-size: $font-size-lg;
-  padding: 1rem 1rem 0.75rem 1rem;
-  min-height:: $navbarHeight;
-
-  .fa-caret-down {
-    font-size: 60%;
-    padding-left: 0.2rem;
-  }
-
-  .icon-gf {
-    position: relative;
-    top: 2px;
-    font-size: 20px;
-    line-height: 8px;
-    margin-right: 0.5rem;
-  }
-
-  > img {
-    max-width: 27px;
-    max-height: 27px;
-  }
-
-  &--search {
-    padding: 1rem 1.5rem 0.75rem 1.5rem;
-  }
-}
-
 .navbar-page-btn {
   text-overflow: ellipsis;
   overflow: hidden;

public/sass/components/_tabbed_view.scss

@@ -12,6 +12,9 @@
     .gf-tabs-link.active {
       background-color: $panel-bg;
     }
+    .tabbed-view-body {
+      min-height: 200px;
+    }
   }
 }
 
@@ -51,7 +54,6 @@
 .tabbed-view-body {
   background-color: $panel-bg;
   padding: $spacer*2 $spacer;
-  min-height: 250px;
 
   &--small {
     min-height: 0px;