Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Darken outline hover color to match default button hover #24150

Merged
merged 5 commits into from
Nov 25, 2017
Merged

Darken outline hover color to match default button hover #24150

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c63beb
Fix Issue #24144
afholderman Sep 27, 2017
e4e4934
Fix Issue #24144
afholderman Sep 27, 2017
a11055e
Merge branch 'v4-dev' into button-outline-variant
afholderman Sep 28, 2017
a7f84b4
Merge branch 'v4-dev' into button-outline-variant
mdo Nov 24, 2017
9ca0206
default values, fix mixin
mdo Nov 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions scss/mixins/_buttons.scss
View file
Open in desktop
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