diff options
| author | Chris Rebert <[email protected]> | 2016-01-09 15:41:29 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-09 15:41:29 -0800 |
| commit | 64b9ad4d7f09c4d71612d9176bdda52d706ef2de (patch) | |
| tree | 37bdd64c24b3b4caa4a38ca621e4db0f8ab353a6 | |
| parent | 496f9c2da40cda8f9cde6109893932ad27db0439 (diff) | |
| parent | ed3551415c37a5bc6683080c424786adb5a0ef60 (diff) | |
| download | bootstrap-64b9ad4d7f09c4d71612d9176bdda52d706ef2de.tar.xz bootstrap-64b9ad4d7f09c4d71612d9176bdda52d706ef2de.zip | |
Merge pull request #18823 from twbs/btn-active-box-shadow
Extract $btn-active-box-shadow variable & refactor accordingly
| -rw-r--r-- | scss/_button-group.scss | 2 | ||||
| -rw-r--r-- | scss/_buttons.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 1 | ||||
| -rw-r--r-- | scss/mixins/_buttons.scss | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/scss/_button-group.scss b/scss/_button-group.scss index e0c6c9af4..4c47725bd 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -115,7 +115,7 @@ // 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 { - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + @include box-shadow($btn-active-box-shadow); // Show no shadow for `.btn-link` since it has no other button styles. &.btn-link { diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 9696154f7..640fe1dfe 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -34,7 +34,7 @@ &.active { background-image: none; outline: 0; - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + @include box-shadow($btn-active-box-shadow); } &.disabled, diff --git a/scss/_variables.scss b/scss/_variables.scss index b85ab50b1..cb478d76a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -237,6 +237,7 @@ $table-border-color: $gray-lighter !default; $btn-padding-x: 1rem !default; $btn-padding-y: .375rem !default; $btn-font-weight: normal !default; +$btn-active-box-shadow: inset 0 3px 5px rgba(0,0,0,.125) !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 61b9f9caf..ec250c464 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -33,7 +33,7 @@ border-color: $active-border; // Remove the gradient for the pressed/active state background-image: none; - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + @include box-shadow($btn-active-box-shadow); &:hover, &:focus, |