diff options
| author | Mark Otto <[email protected]> | 2017-10-19 00:11:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-10-19 00:11:36 -0700 |
| commit | 9501ed87252b7f07a79667562f47818f60017196 (patch) | |
| tree | ff37025bcc970cca78b07252d074d76370545689 | |
| parent | 4a603f11e561bbb528a3a66870ab367c26518990 (diff) | |
| parent | c090c79a709a84cb6e2bd5dbed6343ae49c861a1 (diff) | |
| download | bootstrap-9501ed87252b7f07a79667562f47818f60017196.tar.xz bootstrap-9501ed87252b7f07a79667562f47818f60017196.zip | |
Merge branch 'btn-active' of https://github.com/andresgalante/bootstrap into andresgalante-btn-active
| -rw-r--r-- | scss/mixins/_buttons.scss | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 50cd4fcbc..7510b12a0 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -3,16 +3,16 @@ // Easily pump out default styles, as well as :hover, :focus, :active, // and disabled options for all buttons -@mixin button-variant($background, $border, $active-background: darken($background, 7.5%), $active-border: darken($border, 10%)) { - color: color-yiq($background); +@mixin button-variant($background, $border, $hover-background: darken($background, 7.5%), $hover-border: darken($border, 10%), $active-background: darken($background, 12.5%), $active-border: darken($border, 15%)) { + @include color-yiq($background); background-color: $background; border-color: $border; @include box-shadow($btn-box-shadow); @include hover { - color: color-yiq($active-background); - background-color: $active-background; - border-color: $active-border; + @include color-yiq($hover-background); + background-color: $hover-background; + border-color: $hover-border; } &:focus, |