diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /scss/_buttons.scss | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'scss/_buttons.scss')
| -rw-r--r-- | scss/_buttons.scss | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 265f35776..37ad14ddd 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -39,8 +39,7 @@ } &.disabled, - &:disabled, - fieldset[disabled] & { + &:disabled { cursor: $cursor-disabled; opacity: .65; @include box-shadow(none); @@ -111,8 +110,7 @@ fieldset[disabled] a.btn { &, &:active, &.active, - &:disabled, - fieldset[disabled] & { + &:disabled { background-color: transparent; @include box-shadow(none); } @@ -129,8 +127,7 @@ fieldset[disabled] a.btn { text-decoration: $link-hover-decoration; background-color: transparent; } - &:disabled, - fieldset[disabled] & { + &:disabled { @include hover-focus { color: $btn-link-disabled-color; text-decoration: none; |