diff options
| author | Mark Otto <[email protected]> | 2015-03-29 00:12:19 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-03-29 00:12:19 -0700 |
| commit | 2f7bfb44c28de0f27edf37b765aed24f455de833 (patch) | |
| tree | 8843fde974f6a590869608854f16656c51b35e1d | |
| parent | 58082cd83e9244fa05f316b4ba4102891ff5b0aa (diff) | |
| download | bootstrap-2f7bfb44c28de0f27edf37b765aed24f455de833.tar.xz bootstrap-2f7bfb44c28de0f27edf37b765aed24f455de833.zip | |
fixes
| -rw-r--r-- | scss/_animation.scss | 4 | ||||
| -rw-r--r-- | scss/_buttons.scss | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/scss/_animation.scss b/scss/_animation.scss index 30646da9a..d9e3e0a88 100644 --- a/scss/_animation.scss +++ b/scss/_animation.scss @@ -13,11 +13,9 @@ .collapse { display: none; - visibility: hidden; &.in { display: block; - visibility: visible; } // tr&.in { display: table-row; } // tbody&.in { display: table-row-group; } @@ -29,5 +27,5 @@ overflow: hidden; transition-timing-function: ease; transition-duration: .35s; - transition-property: height, visibility; + transition-property: height; } diff --git a/scss/_buttons.scss b/scss/_buttons.scss index b33081868..e9b20ad6c 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -50,13 +50,12 @@ opacity: .65; @include box-shadow(none); } +} - a& { - &.disabled, - fieldset[disabled] & { - pointer-events: none; // Future-proof disabling of clicks on `<a>` elements - } - } +// Future-proof disabling of clicks on `<a>` elements +a.btn.disaabled, +fieldset[disabled] a.btn { + pointer-events: none; } |