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

Jump to bottom

Rework button focus/active styling, with extra changes for checks/radios #37026

Merged
merged 10 commits into from Sep 4, 2022
Merged

Rework button focus/active styling, with extra changes for checks/radios #37026

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1ad1002
Replace :focus styles with :focus-visible
patrickhlauke Aug 25, 2022
b654ef1
Remove :active / .active styles
patrickhlauke Aug 25, 2022
a98f616
Don't apply :hover styles for `.btn` that follows a `.btn-check`
patrickhlauke Aug 25, 2022
6ea6edd
Reintroduce :active, but *not* for button checks/radios
patrickhlauke Aug 25, 2022
c942ef1
Sort focus styling specifically for button checks/radios
patrickhlauke Aug 25, 2022
136ef18
Merge branch 'main' into patrickhlauke-check-radio-buttons-focus-visible
patrickhlauke Sep 1, 2022
5685463
Re-add `outline:0` which was lost when resolving last merge conflict
patrickhlauke Sep 1, 2022
d747558
Merge branch 'main' into patrickhlauke-check-radio-buttons-focus-visible
patrickhlauke Sep 1, 2022
5aab767
Merge branch 'main' into patrickhlauke-check-radio-buttons-focus-visible
mdo Sep 1, 2022
deae030
Merge branch 'main' into patrickhlauke-check-radio-buttons-focus-visible
mdo Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 17 additions & 10 deletions scss/_buttons.scss
View file
Open in desktop
Expand Up @@ -40,18 +40,19 @@
@include box-shadow(var(--#{$prefix}btn-box-shadow));
@include transition($btn-transition);

&:hover {
:not(.btn-check) + &:hover,
&:first-child:hover {
color: var(--#{$prefix}btn-hover-color);
text-decoration: if($link-hover-decoration == underline, none, null);
background-color: var(--#{$prefix}btn-hover-bg);
border-color: var(--#{$prefix}btn-hover-border-color);
}

.btn-check:focus + &,
&:focus {
&:focus-visible {
color: var(--#{$prefix}btn-hover-color);
@include gradient-bg(var(--#{$prefix}btn-hover-bg));
border-color: var(--#{$prefix}btn-hover-border-color);
outline: 0;
// Avoid using mixin so we can pass custom focus shadow properly
@if $enable-shadows {
box-shadow: var(--#{$prefix}btn-box-shadow), var(--#{$prefix}btn-focus-box-shadow);
Expand All @@ -60,14 +61,20 @@
}
}

.btn-check:focus:not(:focus-visible) + &,
&:focus:not(:focus-visible) {
.btn-check:focus-visible + & {
border-color: var(--#{$prefix}btn-hover-border-color);
outline: 0;
// Avoid using mixin so we can pass custom focus shadow properly
@if $enable-shadows {
box-shadow: var(--#{$prefix}btn-box-shadow), var(--#{$prefix}btn-focus-box-shadow);
} @else {
box-shadow: var(--#{$prefix}btn-focus-box-shadow);
}
}

.btn-check:checked + &,
.btn-check:active + &,
&:active,
:not(.btn-check) + &:active,
&:first-child:active,
&.active,
&.show {
color: var(--#{$prefix}btn-active-color);
Expand All @@ -77,7 +84,7 @@
border-color: var(--#{$prefix}btn-active-border-color);
@include box-shadow(var(--#{$prefix}btn-active-shadow));

&:focus {
&:focus-visible {
// Avoid using mixin so we can pass custom focus shadow properly
@if $enable-shadows {
box-shadow: var(--#{$prefix}btn-active-shadow), var(--#{$prefix}btn-focus-box-shadow);
Expand Down Expand Up @@ -162,11 +169,11 @@
text-decoration: $link-decoration;

&:hover,
&:focus {
&:focus-visible {
text-decoration: $link-hover-decoration;
}

&:focus {
&:focus-visible {
color: var(--#{$prefix}btn-color);
}

Expand Down