From 72a8e79dae4ced5f2b3800c2976a2d450658bb9e Mon Sep 17 00:00:00 2001 From: Kevin Ball Date: Mon, 10 Apr 2017 09:25:04 -0700 Subject: [PATCH] Revert "Hollow button disabled consistency fix #9832" --- docs/pages/button.md | 4 ++-- scss/components/_button.scss | 26 +------------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/docs/pages/button.md b/docs/pages/button.md index bfb2ab3b9..9819d0998 100644 --- a/docs/pages/button.md +++ b/docs/pages/button.md @@ -108,9 +108,9 @@ The `.disabled` class will give buttons a faded appearance. The class is a purel ```html_example Disabled - + - + ``` diff --git a/scss/components/_button.scss b/scss/components/_button.scss index cfd81dfa6..c5054c74a 100644 --- a/scss/components/_button.scss +++ b/scss/components/_button.scss @@ -177,11 +177,6 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau &:hover, &:focus { border-color: $color-hover; color: $color-hover; - &.disabled, - &[disabled] { - border: $border-width solid $color; - color: $color; - } } } @@ -308,31 +303,12 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau } } - // Disabled style - &.disabled, - &[disabled] { - @include button-disabled; - - @each $name, $color in $button-palette { - &.#{$name} { - @include button-disabled($color, auto); - } - } - } - // Hollow style @if $button-fill != hollow { &.hollow { @include button-hollow; @include button-hollow-style; - &.disabled, - &[disabled] { - &, &:hover, &:focus { - background-color: transparent; - } - } - @each $name, $color in $button-palette { &.#{$name} { @include button-hollow-style($color); @@ -366,7 +342,7 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau } } } - + // Dropdown arrow &.dropdown { @include button-dropdown; -- 2.47.2