root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Ensure active button styles are not applied to disabled buttons

This commit is contained in:
Prateek Goel 2017-10-09 23:32:48 +01:00 committed by Patrick H. Lauke
parent bab3246a1d
commit de3973b5e7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_buttons.scss
View File

@ -32,8 +32,8 @@
@include box-shadow(none); @include box-shadow(none);
} }
&:active, &:not([disabled]):not(.disabled):active,
&.active { &:not([disabled]):not(.disabled).active {
background-image: none; background-image: none;
@include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);
} }

8
scss/mixins/_buttons.scss
View File

@ -32,8 +32,8 @@
border-color: $border; border-color: $border;
} }
&:active, &:not([disabled]):not(.disabled):active,
&.active, &:not([disabled]):not(.disabled).active,
.show > &.dropdown-toggle { .show > &.dropdown-toggle {
background-color: $active-background; background-color: $active-background;
background-image: none; // Remove the gradient for the pressed/active state background-image: none; // Remove the gradient for the pressed/active state
@ -65,8 +65,8 @@
background-color: transparent; background-color: transparent;
} }
&:active, &:not([disabled]):not(.disabled):active,
&.active, &:not([disabled]):not(.disabled).active,
.show > &.dropdown-toggle { .show > &.dropdown-toggle {
color: $color-hover; color: $color-hover;
background-color: $color; background-color: $color;