Skip to content

Commit

Permalink
Darken outline hover color to match default button hover (#24150)
Browse files Browse the repository at this point in the history
* Fix Issue #24144

Alter button-outline-variant mixin to darken hover and active background in same fashion as filled button.

* Fix Issue #24144

Filled button on hover should utilize the same color-yiq mixin so that theme buttons match

* default values, fix mixin
  • Loading branch information
afholderman authored and mdo committed Nov 25, 2017
1 parent 02e4f6e commit 7c10068
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions scss/mixins/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
}
}

@mixin button-outline-variant($color, $color-hover: #fff) {
@mixin button-outline-variant($color, $color-hover: #fff, $active-background: $color, $active-border: $color) {
color: $color;
background-color: transparent;
background-image: none;
border-color: $color;

@include hover {
color: $color-hover;
background-color: $color;
border-color: $color;
&:hover {
color: color-yiq($color);
background-color: $active-background;
border-color: $active-border;
}

&:focus,
Expand All @@ -77,9 +77,9 @@
&:not([disabled]):not(.disabled):active,
&:not([disabled]):not(.disabled).active,
.show > &.dropdown-toggle {
color: $color-hover;
background-color: $color;
border-color: $color;
color: color-yiq($color-hover);
background-color: $active-background;
border-color: $active-border;
// Avoid using mixin so we can pass custom focus shadow properly
box-shadow: 0 0 0 $btn-focus-width rgba($color, .5);
}
Expand Down

0 comments on commit 7c10068

Please sign in to comment.