Skip to content

Commit ba93d3d

Browse files
committed
switch back to outline, address feedback
1 parent 9b17a70 commit ba93d3d

File tree

5 files changed

+32
-15
lines changed

5 files changed

+32
-15
lines changed

src/base/base.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,26 @@ details {
9393
// fallback :focus state
9494
:focus,
9595
.focus {
96-
&:is(a, button, input, textarea) {
96+
&:is(a, button, input, textarea, select) {
9797
@include focusOutline;
9898
}
9999
}
100100

101101
// remove fallback :focus if :focus-visible is supported
102-
:focus:is(a, button, input, textarea):not(:focus-visible) {
102+
:focus:is(a, button, input, textarea, select):not(:focus-visible) {
103103
outline: solid 1px transparent;
104104
}
105105

106106
// default :focus-visibile state
107-
:focus-visible:is(a, button, input, textarea) {
107+
:focus-visible:is(a, button, input, textarea, select) {
108108
@include focusOutline;
109109
}
110110

111111
// remove offset for form fields
112112
:focus,
113113
:focus-visible {
114-
&:is(input, textarea) {
115-
// stylelint-disable-next-line primer/box-shadow
116-
box-shadow: 0 0 0 2px var(--color-accent-fg);
114+
&:is(input, textarea, select) {
115+
outline-offset: 0;
116+
border-color: transparent;
117117
}
118118
}

src/buttons/misc.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
color: var(--color-accent-fg);
3838
background-color: transparent; // Reset default gradient backgrounds and colors
3939
border: 0;
40-
border-radius: 0;
40+
border-radius: $border-radius;
4141
box-shadow: none;
4242

4343
&:hover,

src/forms/input-group.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
&.inline {
1919
display: inline-table;
2020
}
21+
22+
// within input group, if button exists change focus styles to match input (no offset)
23+
&:focus-within {
24+
button {
25+
outline-offset: 0;
26+
}
27+
}
2128
}
2229

2330
.input-group .form-control,

src/support/mixins/misc.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@
2626
}
2727

2828
// global focus styles
29-
// change to outline when Safari has better support
30-
// outline: 2px solid var(--color-accent-fg);
31-
// outline-offset: 2px;
29+
3230
@mixin focusOutline {
3331
position: relative;
3432
z-index: 1;
35-
outline: solid 1px transparent;
36-
box-shadow: 0 0 0 2px var(--color-canvas-default), 0 0 0 4px var(--color-accent-fg);
33+
outline: 2px solid var(--color-accent-fg);
34+
outline-offset: 2px;
3735
}

src/utilities/details.scss

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,21 @@
2020

2121
.details-reset {
2222
// Remove marker added by the display: list-item browser default
23-
> summary { list-style: none; }
23+
> summary {
24+
list-style: none;
25+
}
2426
// Remove marker added by details polyfill
25-
> summary::before { display: none; }
27+
> summary::before {
28+
display: none;
29+
}
2630
// Remove marker added by Chrome
27-
> summary::-webkit-details-marker { display: none; }
31+
> summary::-webkit-details-marker {
32+
display: none;
33+
}
34+
}
35+
36+
.details-overlay > summary {
37+
&:focus {
38+
@include focusOutline;
39+
}
2840
}

0 commit comments

Comments
 (0)