Skip to content

Commit f36aed8

Browse files
committed
align all the focus css rules to use the same, and add a margin botton, to ensure that the bottom styling does not get cut of when in focus
1 parent b48ea33 commit f36aed8

File tree

8 files changed

+16
-8
lines changed

8 files changed

+16
-8
lines changed

packages/uui-breadcrumbs/lib/uui-breadcrumb-item.element.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ export class UUIBreadcrumbItemElement extends LitElement {
7070
color: var(--uui-color-focus);
7171
}
7272
73+
a:focus-visible {
74+
outline: 2px solid var(--uui-color-focus, var(--color-emphasis));
75+
}
76+
7377
[part='separator']::after {
7478
content: '/';
7579
speak: never;

packages/uui-button/lib/uui-button.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ export class UUIButtonElement extends UUIFormControlMixin(
370370
}
371371
372372
#button:focus-visible {
373-
outline: 2px solid var(--uui-focus-outline-color, var(--color-emphasis));
373+
outline: 2px solid var(--uui-color-focus, var(--color-emphasis));
374374
}
375375
376376
button[disabled]:active,

packages/uui-card/lib/uui-card.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ export class UUICardElement extends SelectOnlyMixin(
151151
font-family: inherit;
152152
border: 0;
153153
padding: 0;
154+
margin: 0 0 1px 0;
154155
background-color: transparent;
155156
text-align: left;
156157
color: var(--uui-color-text);

packages/uui-color-picker/lib/uui-color-picker.element.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,10 @@ export class UUIColorPickerElement extends LabelMixin('label', LitElement) {
719719
flex: 1;
720720
}
721721
722+
button.color-picker__trigger:focus-visible {
723+
outline: 2px solid var(--uui-color-focus, var(--color-emphasis));
724+
}
725+
722726
uui-color-area {
723727
width: 100%;
724728
}

packages/uui-menu-item/lib/uui-menu-item.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
584584
border-radius: calc(var(--uui-border-radius) - 1px);
585585
position: absolute;
586586
inset: 3px 3px 3px -5px;
587-
border: 2px solid var(--uui-color-focus);
587+
outline: 2px solid var(--uui-color-focus, var(--color-emphasis));
588588
}
589589
590590
:host([select-mode='highlight']) #caret-button:focus-visible {
@@ -597,7 +597,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
597597
position: absolute;
598598
inset: 3px;
599599
border-radius: calc(var(--uui-border-radius) - 1px);
600-
border: 2px solid var(--uui-color-focus);
600+
outline: 2px solid var(--uui-color-focus, var(--color-emphasis));
601601
}
602602
603603
/** Slots */

packages/uui-radio/lib/uui-radio.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ export class UUIRadioElement extends LitElement {
201201
outline: none;
202202
}
203203
:host(:focus-within) input:focus-visible + #button {
204-
outline: 2px solid var(--uui-color-focus);
204+
outline: 2px solid var(--uui-color-focus, var(--color-emphasis));
205205
}
206206
207207
input:checked ~ #button::after {

packages/uui-ref-node/lib/uui-ref-node.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ export class UUIRefNodeElement extends UUIRefElement {
198198
cursor: pointer;
199199
display: flex;
200200
flex-grow: 1;
201+
margin: 0 0 1px 0;
201202
}
202203
203204
#icon {

packages/uui-ref/lib/uui-ref.element.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class UUIRefElement extends SelectOnlyMixin(
7979
}
8080
8181
:host([selectable]:focus-visible) {
82-
outline-color: var(--uui-color-focus);
82+
outline-color: var(--uui-color-focus), var(--color-emphasis);
8383
outline-width: var(--uui-card-border-width);
8484
outline-style: solid;
8585
outline-offset: var(--uui-card-border-width);
@@ -186,11 +186,9 @@ export class UUIRefElement extends SelectOnlyMixin(
186186
187187
button:focus,
188188
a:focus {
189-
outline-color: var(--uui-color-focus);
190-
outline-width: var(--uui-card-border-width);
191-
outline-style: solid;
192189
outline-offset: var(--uui-card-border-width);
193190
border-radius: var(--uui-border-radius);
191+
outline: 2px solid var(--uui-color-focus, var(--color-emphasis));
194192
}
195193
196194
slot[name='actions']::slotted(*) {

0 commit comments

Comments
 (0)