diff options
| author | Mark Otto <[email protected]> | 2017-04-08 16:30:18 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-08 16:30:18 -0700 |
| commit | 2dfffbde89b1f8483dce560513f3ab97e6a17e86 (patch) | |
| tree | 1d420087f4790ed639626994d6e5cfa0ab4d4a8f | |
| parent | 0c59741812dbede4bb04a7a59caa47f5b3bc6f68 (diff) | |
| download | bootstrap-2dfffbde89b1f8483dce560513f3ab97e6a17e86.tar.xz bootstrap-2dfffbde89b1f8483dce560513f3ab97e6a17e86.zip | |
Rename some .open to .show (#22389)
* no more outline overrides
* rename old .open to .show
| -rw-r--r-- | scss/_button-group.scss | 10 | ||||
| -rw-r--r-- | scss/_navbar.scss | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/scss/_button-group.scss b/scss/_button-group.scss index af74a55f1..d4c79ab60 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -79,12 +79,6 @@ @include border-left-radius(0); } -// On active and open, don't show outline -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - // Sizing // @@ -119,8 +113,8 @@ // The clickable button for toggling the menu -// Remove the gradient and set the same inset shadow as the :active state -.btn-group.open .dropdown-toggle { +// Set the same inset shadow as the :active state +.btn-group.show .dropdown-toggle { @include box-shadow($btn-active-box-shadow); // Show no shadow for `.btn-link` since it has no other button styles. diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 854e7df12..419d9263a 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -216,9 +216,9 @@ } } - .open > .nav-link, + .show > .nav-link, .active > .nav-link, - .nav-link.open, + .nav-link.show, .nav-link.active { color: $navbar-light-active-color; } @@ -261,9 +261,9 @@ } } - .open > .nav-link, + .show > .nav-link, .active > .nav-link, - .nav-link.open, + .nav-link.show, .nav-link.active { color: $navbar-inverse-active-color; } |