From ef25eaca5e9f018992822b5932cff6c8e6f118c7 Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Fri, 16 Dec 2016 12:36:18 -0500 Subject: [PATCH] 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: 0c8eeabf978ef3940e40dfbe8c29b88eadf4e68b * Authored by CJ Cenizal on 2016-12-16T17:35:17Z --- .../components/button/_button.scss | 18 ++++++++++++++++++ .../components/tool_bar/_tool_bar.scss | 12 +----------- .../src/components/guide_nav/_guide_nav.scss | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/ui_framework/components/button/_button.scss b/src/ui_framework/components/button/_button.scss index 72c436d5bfbc9..434f59c65a5c0 100644 --- 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 index 683e952dc5db7..f447813f60088 100644 --- 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 index 3de72dc661479..65c54f6819ec6 100644 --- 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 {