Fix bug with Button component appearance inside of a ToolBar.

Backports PR #9526 **Commit 1:** Fix bug with Button component appearance inside of a ToolBar. * Original sha: 0c8eeab * Authored by CJ Cenizal <cj@cenizal.com> on 2016-12-16T17:35:17Z
elastic · Dec 16, 2016 · ef25eac · ef25eac
1 parent c08506c
commit ef25eac
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/ui_framework/components/button/_button.scss b/src/ui_framework/components/button/_button.scss
@@ -80,3 +80,21 @@
     @include focus(#ff523c);
   }
 }
+
+@mixin buttonOnReverseBackground {
+  .kuiButton--basic {
+    color: #5a5a5a;
+    background-color: #FFFFFF;
+
+    &:hover:enabled,
+    &:active:enabled {
+      color: #000000;
+      background-color: #FAFAFA;
+    }
+
+    &:disabled {
+      color: #a7a7a7;
+      background-color: #F3F3F3;
+    }
+  }
+}
diff --git a/src/ui_framework/components/tool_bar/_tool_bar.scss b/src/ui_framework/components/tool_bar/_tool_bar.scss
@@ -5,17 +5,7 @@
   height: 50px;
   background-color: $panelColor;
 
-  .kuiButton--basic {
-    background-color: #FFFFFF;
-
-    &:hover:enabled {
-      background-color: #FFFFFF;
-    }
-
-    &:active:enabled {
-      background-color: #FAFAFA;
-    }
-  }
+  @include buttonOnReverseBackground;
 }
 
 /**

diff --git a/src/ui_framework/doc_site/src/components/guide_nav/_guide_nav.scss b/src/ui_framework/doc_site/src/components/guide_nav/_guide_nav.scss
@@ -61,6 +61,7 @@
   @include scrollbar;
   display: flex;
   overflow: auto;
+  min-height: calc(100vh - 100px);
 }
 
 .guideNavItems {