Skip to content

Commit d19fd5d

Browse files
committed
selected focus states
1 parent dbeb7a8 commit d19fd5d

File tree

6 files changed

+59
-6
lines changed

6 files changed

+59
-6
lines changed

src/base/base.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,10 @@ input[type='radio'],
119119
input[type='checkbox'] {
120120
&:focus,
121121
&:focus-visible {
122-
outline-offset: 2px;
122+
outline-offset: 0;
123123
}
124124
}
125125

126-
.faketarget {
127-
@include focusBoxShadowInset;
128-
}
129-
130126
// for handling focus conditionally
131127
.focus {
132128
@include focusBoxShadowInset;

src/buttons/button.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,22 @@ a.btn-primary {
210210
background-color: var(--color-btn-outline-selected-bg);
211211
border-color: var(--color-btn-outline-selected-border);
212212
box-shadow: var(--color-btn-outline-selected-shadow);
213+
214+
// fallback :focus state
215+
&:focus {
216+
@include focusOutlineOnEmphasis;
217+
218+
// remove fallback :focus if :focus-visible is supported
219+
&:not(:focus-visible) {
220+
outline: solid 1px transparent;
221+
box-shadow: none;
222+
}
223+
}
224+
225+
// default focus state
226+
&:focus-visible {
227+
@include focusOutlineOnEmphasis;
228+
}
213229
}
214230

215231
&:disabled,

src/buttons/misc.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
}
3030
}
3131

32-
&:not(.dropdown-item, .social-reaction-summary-item) {
32+
&:not(.dropdown-item) {
3333
&:focus,
3434
&:focus-visible {
3535
border-radius: $border-radius;

src/links/link.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
text-decoration: underline;
88
cursor: pointer;
99
}
10+
11+
&:focus,
12+
&:focus-visible {
13+
outline-offset: 0;
14+
}
1015
}
1116

1217
.Link--primary {

src/navigation/filter-list.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// stylelint-disable selector-max-specificity
2+
13
// Filters list
24
//
35
// A vertical list of filters.
@@ -45,6 +47,22 @@
4547
&[aria-current]:not([aria-current='false']) {
4648
color: var(--color-fg-on-emphasis);
4749
background-color: var(--color-accent-emphasis);
50+
51+
// fallback :focus state
52+
&:focus {
53+
@include focusOutlineOnEmphasis;
54+
55+
// remove fallback :focus if :focus-visible is supported
56+
&:not(:focus-visible) {
57+
outline: solid 1px transparent;
58+
box-shadow: none;
59+
}
60+
}
61+
62+
// default focus state
63+
&:focus-visible {
64+
@include focusOutlineOnEmphasis;
65+
}
4866
}
4967

5068
.count {

src/navigation/subnav.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// stylelint-disable selector-max-specificity
2+
13
// Needs refactoring
24
// Sub nav
35
.subnav {
@@ -46,6 +48,22 @@
4648
color: var(--color-fg-on-emphasis);
4749
background-color: var(--color-accent-emphasis);
4850
border-color: var(--color-accent-emphasis);
51+
52+
// fallback :focus state
53+
&:focus {
54+
@include focusOutlineOnEmphasis;
55+
56+
// remove fallback :focus if :focus-visible is supported
57+
&:not(:focus-visible) {
58+
outline: solid 1px transparent;
59+
box-shadow: none;
60+
}
61+
}
62+
63+
// default focus state
64+
&:focus-visible {
65+
@include focusOutlineOnEmphasis;
66+
}
4967
}
5068

5169
&:first-child {

0 commit comments

Comments
 (0)