diff options
| author | Mark Otto <[email protected]> | 2014-12-23 13:59:26 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-23 13:59:26 -0800 |
| commit | 6b394ab067f7af82c2e2e640642d47f6ff609ccf (patch) | |
| tree | 5cf9d9143409365dbabcbd4a57f27f9fd4838b17 /scss/_buttons.scss | |
| parent | 1f5a75e2d75daf231965dd59ea5b82364a375ffb (diff) | |
| parent | 5e102e26006ec8c8c3f19b7ce67d81a83c758b5e (diff) | |
| download | bootstrap-6b394ab067f7af82c2e2e640642d47f6ff609ccf.tar.xz bootstrap-6b394ab067f7af82c2e2e640642d47f6ff609ccf.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
docs/components/helpers.md
scss/_utilities.scss
Diffstat (limited to 'scss/_buttons.scss')
| -rw-r--r-- | scss/_buttons.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 08feff3b6..8f75cbec1 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -43,7 +43,7 @@ } &.disabled, - &[disabled], + &:disabled, fieldset[disabled] & { pointer-events: none; // Future-proof disabling of clicks cursor: $cursor-disabled; @@ -88,7 +88,7 @@ &, &:active, &.active, - &[disabled], + &:disabled, fieldset[disabled] & { background-color: transparent; @include box-shadow(none); @@ -105,7 +105,7 @@ text-decoration: underline; background-color: transparent; } - &[disabled], + &:disabled, fieldset[disabled] & { &:hover, &:focus { |