Skip to content

style: use semantic focus-ring token across components #2168

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

Merged
pixelflips merged 2 commits into from
Feb 23, 2026
Merged

style: use semantic focus-ring token across components #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c004e0f
style: replace hardcoded purple-600 with focus-ring token
pixelflips Feb 20, 2026
b6245dd
style(breadcrumbs): add focus ring to progressbar variant
pixelflips Feb 20, 2026
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
4 changes: 2 additions & 2 deletions packages/sage-assets/lib/stylesheets/components/_alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ $-alert-text-colors: (
}

&:focus-visible {
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
}
}

Expand Down Expand Up @@ -224,7 +224,7 @@ $-alert-text-colors: (
}

&:focus-visible {
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
}
}

Expand Down
3 changes: 2 additions & 1 deletion packages/sage-assets/lib/stylesheets/components/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

$-breadcrumb-current-color: var(--pine-color-text);
$-breadcrumb-interactive-color: var(--pine-color-text);
$-breadcrumb-outline-color: var(--pine-color-purple-600);
$-breadcrumb-outline-color: var(--pine-color-focus-ring);

.sage-breadcrumbs {
display: flex;
Expand Down Expand Up @@ -77,6 +77,7 @@ $-breadcrumb-outline-color: var(--pine-color-purple-600);
.sage-breadcrumbs--progressbar & {
position: relative;
padding-block-end: sage-spacing(2xs);
@include sage-focus-ring($-breadcrumb-outline-color);

&:active {
color: $-breadcrumb-interactive-color;
Expand Down
8 changes: 4 additions & 4 deletions packages/sage-assets/lib/stylesheets/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $-btn-base-styles: (
color: var(--pine-color-text-primary),
background-color: var(--pine-color-primary),
border-color: var(--pine-color-primary),
ring-color: var(--pine-color-purple-600),
ring-color: var(--pine-color-focus-ring),
),
hover: (
color: var(--pine-color-text-primary),
Expand Down Expand Up @@ -119,23 +119,23 @@ $-btn-subtle-styles: (
hover: var(--pine-color-primary),
hover-background: var(--pine-color-blue-150),
focus: var(--pine-color-primary),
focus-outline: var(--pine-color-purple-600),
focus-outline: var(--pine-color-focus-ring),
disabled: var(--pine-color-blue-300),
),
primary: (
default: var(--pine-color-text),
hover: var(--pine-color-primary),
hover-background: var(--pine-color-primary-disabled),
focus: var(--pine-color-primary),
focus-outline: var(--pine-color-purple-600),
focus-outline: var(--pine-color-focus-ring),
disabled: var(--pine-color-text-tertiary),
),
secondary: (
default: var(--pine-color-text),
hover: var(--pine-color-primary),
hover-background: var(--pine-color-primary-disabled),
focus: var(--pine-color-primary),
focus-outline: var(--pine-color-purple-600),
focus-outline: var(--pine-color-focus-ring),
disabled: var(--pine-color-text-tertiary),
),
danger: (
Expand Down
2 changes: 1 addition & 1 deletion packages/sage-assets/lib/stylesheets/components/_choice.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ $-choice-radio-color-checked-inner: sage-radio-color(checked-inner);
}

&:focus-visible {
border-color: var(--pine-color-purple-600);
border-color: var(--pine-color-focus-ring);
outline: none;
}

Expand Down
8 changes: 4 additions & 4 deletions packages/sage-assets/lib/stylesheets/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ $-dropdown-trigger-dropdown-offset: rem(16px) + sage-spacing(xs);
&:focus-within {
outline: none;

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

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

.sage-dropdown__item--disabled {
&:active {
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
}
}

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

@extend %t-sage-body-med;

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

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

&::after {
opacity: 1;
Expand Down
2 changes: 1 addition & 1 deletion packages/sage-assets/lib/stylesheets/components/_hero.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ $-hero-play-icon-background-color: var(--pine-color-background-container);
@include sage-focus-ring;

&:focus {
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/sage-assets/lib/stylesheets/components/_link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ $-link-base-styles: (
&:focus-visible {
color: var(--pine-color-primary);

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

.sage-card--interactive & {
Expand Down Expand Up @@ -224,7 +224,7 @@ $-link-base-styles: (
$outline-offset-block: 4px,
$outline-border-radius: sage-border(radius-round),
);
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));
}

.sage-link--remove-underline {
Expand Down
2 changes: 1 addition & 1 deletion packages/sage-assets/lib/stylesheets/components/_media_tile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ $-media-tile-breakpoints: (

&::after {
border-width: rem(2px);
border-color: var(--pine-color-purple-600);
border-color: var(--pine-color-focus-ring);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/sage-assets/lib/stylesheets/components/_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $-nav-subitem-border-width: rem(2px);
$outline-offset-block: -1,
$outline-border-radius: sage-border(radius-medium),
);
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));

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

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

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

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

.sage-nav__link--active::after {
Expand Down
2 changes: 1 addition & 1 deletion packages/sage-assets/lib/stylesheets/components/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $-pagination-text-color: var(--pine-color-text);
$-pagination-text-color-disabled: var(--pine-color-grey-600);
$-pagination-bg-color-current: var(--pine-color-background-muted);
$-pagination-bg-color-hover: var(--pine-color-border-disabled);
$-pagination-focus-ring-color: var(--pine-color-purple-600);
$-pagination-focus-ring-color: var(--pine-color-focus-ring);


.sage-pagination {
Expand Down
2 changes: 1 addition & 1 deletion packages/sage-assets/lib/stylesheets/components/_status_icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
$outline-offset-block: 4px,
$outline-border-radius: sage-border(radius-round),
);
@include sage-focus-outline--update-color(var(--pine-color-purple-600));
@include sage-focus-outline--update-color(var(--pine-color-focus-ring));

&:hover:not(:focus):not(:active) {
color: var(--pine-color-text);
Expand Down
Loading