From 99ce5cad2b72deed78ce9e090146c16327bf2137 Mon Sep 17 00:00:00 2001 From: Christopher Keele Date: Sun, 5 Mar 2017 00:18:15 -0800 Subject: [PATCH] Respect $button-background for default buttons. Affects hollow and disabled buttons. Fixes #9838. --- scss/components/_button.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/components/_button.scss b/scss/components/_button.scss index 26170a3ae..3c8c76d10 100644 --- a/scss/components/_button.scss +++ b/scss/components/_button.scss @@ -157,7 +157,7 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau } @mixin button-hollow-style( - $color: $primary-color, + $color: $button-background, $hover-lightness: $button-hollow-hover-lightness, $border-width: $button-hollow-border-width ) { @@ -173,10 +173,10 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau } /// Adds disabled styles to a button by fading the element, reseting the cursor, and disabling pointer events. -/// @param [Color] $background [$primary-color] - Background color of the disabled button. +/// @param [Color] $background [$button-background] - Background color of the disabled button. /// @param [Color] $color [$button-color] - Text color of the disabled button. Set to `auto` to have the mixin automatically generate a color based on the background color. @mixin button-disabled( - $background: $primary-color, + $background: $button-background, $color: $button-color ) { @if $color == auto { -- 2.47.2