Skip to content

Commit 2475423

Browse files
authored
style: use semantic focus-ring token across components (#2168)
* style: replace hardcoded purple-600 with focus-ring token * style(breadcrumbs): add focus ring to progressbar variant
1 parent cbe1212 commit 2475423

File tree

11 files changed

+22
-21
lines changed

11 files changed

+22
-21
lines changed

packages/sage-assets/lib/stylesheets/components/_alert.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ $-alert-text-colors: (
196196
}
197197

198198
&:focus-visible {
199-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
199+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
200200
}
201201
}
202202

@@ -224,7 +224,7 @@ $-alert-text-colors: (
224224
}
225225

226226
&:focus-visible {
227-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
227+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
228228
}
229229
}
230230

packages/sage-assets/lib/stylesheets/components/_breadcrumbs.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
$-breadcrumb-current-color: var(--pine-color-text);
88
$-breadcrumb-interactive-color: var(--pine-color-text);
9-
$-breadcrumb-outline-color: var(--pine-color-purple-600);
9+
$-breadcrumb-outline-color: var(--pine-color-focus-ring);
1010

1111
.sage-breadcrumbs {
1212
display: flex;
@@ -77,6 +77,7 @@ $-breadcrumb-outline-color: var(--pine-color-purple-600);
7777
.sage-breadcrumbs--progressbar & {
7878
position: relative;
7979
padding-block-end: sage-spacing(2xs);
80+
@include sage-focus-ring($-breadcrumb-outline-color);
8081

8182
&:active {
8283
color: $-breadcrumb-interactive-color;

packages/sage-assets/lib/stylesheets/components/_button.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $-btn-base-styles: (
5151
color: var(--pine-color-text-primary),
5252
background-color: var(--pine-color-primary),
5353
border-color: var(--pine-color-primary),
54-
ring-color: var(--pine-color-purple-600),
54+
ring-color: var(--pine-color-focus-ring),
5555
),
5656
hover: (
5757
color: var(--pine-color-text-primary),
@@ -119,23 +119,23 @@ $-btn-subtle-styles: (
119119
hover: var(--pine-color-primary),
120120
hover-background: var(--pine-color-blue-150),
121121
focus: var(--pine-color-primary),
122-
focus-outline: var(--pine-color-purple-600),
122+
focus-outline: var(--pine-color-focus-ring),
123123
disabled: var(--pine-color-blue-300),
124124
),
125125
primary: (
126126
default: var(--pine-color-text),
127127
hover: var(--pine-color-primary),
128128
hover-background: var(--pine-color-primary-disabled),
129129
focus: var(--pine-color-primary),
130-
focus-outline: var(--pine-color-purple-600),
130+
focus-outline: var(--pine-color-focus-ring),
131131
disabled: var(--pine-color-text-tertiary),
132132
),
133133
secondary: (
134134
default: var(--pine-color-text),
135135
hover: var(--pine-color-primary),
136136
hover-background: var(--pine-color-primary-disabled),
137137
focus: var(--pine-color-primary),
138-
focus-outline: var(--pine-color-purple-600),
138+
focus-outline: var(--pine-color-focus-ring),
139139
disabled: var(--pine-color-text-tertiary),
140140
),
141141
danger: (

packages/sage-assets/lib/stylesheets/components/_choice.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $-choice-radio-color-checked-inner: sage-radio-color(checked-inner);
7070
}
7171

7272
&:focus-visible {
73-
border-color: var(--pine-color-purple-600);
73+
border-color: var(--pine-color-focus-ring);
7474
outline: none;
7575
}
7676

packages/sage-assets/lib/stylesheets/components/_dropdown.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ $-dropdown-trigger-dropdown-offset: rem(16px) + sage-spacing(xs);
131131
&:focus-within {
132132
outline: none;
133133

134-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
134+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
135135
}
136136
}
137137

@@ -149,7 +149,7 @@ $-dropdown-trigger-dropdown-offset: rem(16px) + sage-spacing(xs);
149149

150150
.sage-dropdown__item--disabled {
151151
&:active {
152-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
152+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
153153
}
154154
}
155155

@@ -166,7 +166,7 @@ $-dropdown-trigger-dropdown-offset: rem(16px) + sage-spacing(xs);
166166
.sage-dropdown__item-control {
167167
@include sage-button-style-reset();
168168
@include sage-focus-outline($outline-offset-inline: 4px, $outline-offset-block: -2px);
169-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
169+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
170170

171171
@extend %t-sage-body-med;
172172

@@ -197,7 +197,7 @@ $-dropdown-trigger-dropdown-offset: rem(16px) + sage-spacing(xs);
197197

198198
&:focus-within {
199199
@include sage-focus-outline($outline-offset-inline: 4px, $outline-offset-block: -2px);
200-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
200+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
201201

202202
&::after {
203203
opacity: 1;

packages/sage-assets/lib/stylesheets/components/_hero.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ $-hero-play-icon-background-color: var(--pine-color-background-container);
142142
@include sage-focus-ring;
143143

144144
&:focus {
145-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
145+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
146146
}
147147
}
148148

packages/sage-assets/lib/stylesheets/components/_link.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $-link-base-styles: (
7777
&:focus-visible {
7878
color: var(--pine-color-primary);
7979

80-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
80+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
8181
}
8282

8383
.sage-card--interactive & {
@@ -224,7 +224,7 @@ $-link-base-styles: (
224224
$outline-offset-block: 4px,
225225
$outline-border-radius: sage-border(radius-round),
226226
);
227-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
227+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
228228
}
229229

230230
.sage-link--remove-underline {

packages/sage-assets/lib/stylesheets/components/_media_tile.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ $-media-tile-breakpoints: (
8686

8787
&::after {
8888
border-width: rem(2px);
89-
border-color: var(--pine-color-purple-600);
89+
border-color: var(--pine-color-focus-ring);
9090
}
9191
}
9292
}

packages/sage-assets/lib/stylesheets/components/_nav.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $-nav-subitem-border-width: rem(2px);
3636
$outline-offset-block: -1,
3737
$outline-border-radius: sage-border(radius-medium),
3838
);
39-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
39+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
4040

4141
display: flex;
4242
align-items: center;
@@ -63,7 +63,7 @@ $-nav-subitem-border-width: rem(2px);
6363
@extend %t-sage-body-small-med;
6464

6565
&.sage-nav__link--active {
66-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
66+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
6767

6868
background: $-nav-color-background;
6969
}
@@ -88,7 +88,7 @@ $-nav-subitem-border-width: rem(2px);
8888

8989
&:not(.sage-nav__list--sub) {
9090
.sage-nav__link--active {
91-
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
91+
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
9292
}
9393

9494
.sage-nav__link--active::after {

packages/sage-assets/lib/stylesheets/components/_pagination.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $-pagination-text-color: var(--pine-color-text);
1212
$-pagination-text-color-disabled: var(--pine-color-grey-600);
1313
$-pagination-bg-color-current: var(--pine-color-background-muted);
1414
$-pagination-bg-color-hover: var(--pine-color-border-disabled);
15-
$-pagination-focus-ring-color: var(--pine-color-purple-600);
15+
$-pagination-focus-ring-color: var(--pine-color-focus-ring);
1616

1717

1818
.sage-pagination {

0 commit comments

Comments
 (0)