diff options
| author | Prateek Goel <[email protected]> | 2017-10-09 23:32:48 +0100 |
|---|---|---|
| committer | Patrick H. Lauke <[email protected]> | 2017-10-09 18:32:48 -0400 |
| commit | de3973b5e74058e37fd15fecc4cb7b9fd3409def (patch) | |
| tree | ea5343393ef6f957fe3cb883c45180cb338b34a5 | |
| parent | bab3246a1d7219e93ee12e09ff7608c5dd6bcbc2 (diff) | |
| download | bootstrap-de3973b5e74058e37fd15fecc4cb7b9fd3409def.tar.xz bootstrap-de3973b5e74058e37fd15fecc4cb7b9fd3409def.zip | |
Ensure active button styles are not applied to disabled buttons
| -rw-r--r-- | scss/_buttons.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_buttons.scss | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index d69c15998..72fc5f340 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -32,8 +32,8 @@ @include box-shadow(none); } - &:active, - &.active { + &:not([disabled]):not(.disabled):active, + &:not([disabled]):not(.disabled).active { background-image: none; @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); } diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 44ce4f72e..7ce8fef5f 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -32,8 +32,8 @@ border-color: $border; } - &:active, - &.active, + &:not([disabled]):not(.disabled):active, + &:not([disabled]):not(.disabled).active, .show > &.dropdown-toggle { background-color: $active-background; background-image: none; // Remove the gradient for the pressed/active state @@ -65,8 +65,8 @@ background-color: transparent; } - &:active, - &.active, + &:not([disabled]):not(.disabled):active, + &:not([disabled]):not(.disabled).active, .show > &.dropdown-toggle { color: $color-hover; background-color: $color; |