Skip to content

Align focus ring color across components #1218

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
merged 4 commits into from
Nov 5, 2025
Merged

Align focus ring color across components #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f36aed8
align all the focus css rules to use the same, and add a margin botto…
Welander1994 Oct 29, 2025
45dfe3e
Merge branch 'main' into alignFocus
leekelleher Nov 5, 2025
b8c9c7a
Removed most of the `--color-emphasis` variable fallbacks
leekelleher Nov 5, 2025
0f2bf3d
Button: restored the `--uui-focus-outline-color` variable
leekelleher Nov 5, 2025
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
5 changes: 5 additions & 0 deletions packages/uui-breadcrumbs/lib/uui-breadcrumb-item.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ export class UUIBreadcrumbItemElement extends LitElement {
color: var(--uui-color-focus);
}

a:focus-visible {
border-radius: var(--uui-border-radius);
outline: 2px solid var(--uui-color-focus);
}

[part='separator']::after {
content: '/';
speak: never;
Expand Down
6 changes: 5 additions & 1 deletion packages/uui-button/lib/uui-button.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,11 @@ export class UUIButtonElement extends UUIFormControlMixin(
}

#button:focus-visible {
outline: 2px solid var(--uui-focus-outline-color, var(--color-emphasis));
outline: 2px solid
var(
--uui-focus-outline-color,
var(--color-emphasis, var(--uui-color-focus))
);
}

button[disabled]:active,
Expand Down
1 change: 1 addition & 0 deletions packages/uui-card/lib/uui-card.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ export class UUICardElement extends SelectOnlyMixin(
font-family: inherit;
border: 0;
padding: 0;
margin: 0 0 1px 0;
background-color: transparent;
text-align: left;
color: var(--uui-color-text);
Expand Down
4 changes: 4 additions & 0 deletions packages/uui-color-picker/lib/uui-color-picker.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,10 @@ export class UUIColorPickerElement extends LabelMixin('label', LitElement) {
flex: 1;
}

button.color-picker__trigger:focus-visible {
outline: 2px solid var(--uui-color-focus);
}

uui-color-area {
width: 100%;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/uui-menu-item/lib/uui-menu-item.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
border-radius: calc(var(--uui-border-radius) - 1px);
position: absolute;
inset: 3px 3px 3px -5px;
border: 2px solid var(--uui-color-focus);
outline: 2px solid var(--uui-color-focus);
}

:host([select-mode='highlight']) #caret-button:focus-visible {
Expand All @@ -597,7 +597,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
position: absolute;
inset: 3px;
border-radius: calc(var(--uui-border-radius) - 1px);
border: 2px solid var(--uui-color-focus);
outline: 2px solid var(--uui-color-focus);
}

/** Slots */
Expand Down
5 changes: 5 additions & 0 deletions packages/uui-ref-node/lib/uui-ref-node.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@ export class UUIRefNodeElement extends UUIRefElement {
padding: 1px;
}

#actions-container {
--uui-focus-outline-color: var(--uui-color-focus);
}

#content {
display: flex;
flex-grow: 1;
Expand All @@ -201,6 +205,7 @@ export class UUIRefNodeElement extends UUIRefElement {
cursor: pointer;
display: flex;
flex-grow: 1;
margin: 0 0 1px 0;
}

#icon {
Expand Down
4 changes: 1 addition & 3 deletions packages/uui-ref/lib/uui-ref.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,9 @@ export class UUIRefElement extends SelectOnlyMixin(

button:focus,
a:focus {
outline-color: var(--uui-color-focus);
outline-width: var(--uui-card-border-width);
outline-style: solid;
outline-offset: var(--uui-card-border-width);
border-radius: var(--uui-border-radius);
outline: 2px solid var(--uui-color-focus);
}

slot[name='actions']::slotted(*) {
Expand Down
Loading