aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-07-01 23:36:11 -0700
committerMark Otto <[email protected]>2017-07-01 23:36:11 -0700
commit7bce8648edb1f66c6dd1525d55e8de343a25b9ee (patch)
treef7c04ad7a1f8ceafeec2363092d53a4fc8f11a31
parent4e067f72297cc72c53b13933f401e7c078d80352 (diff)
parentf282a8847555b0139881aa6f9e2e796ce4bf76ea (diff)
downloadbootstrap-7bce8648edb1f66c6dd1525d55e8de343a25b9ee.tar.xz
bootstrap-7bce8648edb1f66c6dd1525d55e8de343a25b9ee.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
-rw-r--r--scss/mixins/_buttons.scss6
1 files changed, 1 insertions, 5 deletions
diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 1e01de867..f7ec5764e 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -3,16 +3,12 @@
// 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%);
-
+@mixin button-variant($background, $border, $active-background: darken($background, 7.5%), $active-border: darken($border, 10%)) {
@include color-yiq($background);
background-color: $background;
border-color: $border;
@include box-shadow($btn-box-shadow);
- // Hover and focus styles are shared
&:hover {
@include color-yiq($background);
background-color: $active-background;