Skip to content

Commit 13e6bc8

Browse files
committed
correct focus styles
1 parent 1eff22c commit 13e6bc8

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,18 @@ export class UUICardElement extends SelectOnlyMixin(
102102
transition: box-shadow 100ms ease-out;
103103
}
104104
105-
:host(*) {
106-
/* TODO: implement globally shared outline style */
105+
:host([selectable]:focus-visible) {
107106
outline-color: var(--uui-color-focus);
108-
outline-offset: 4px;
107+
outline-width: var(--uui-card-border-width);
108+
outline-style: solid;
109+
outline-offset: var(--uui-card-border-width);
109110
}
110111
111-
:host(*) * {
112+
:host() * {
112113
/* TODO: implement globally shared outline style */
113114
outline-color: var(--uui-color-focus);
114115
}
115116
116-
:host(:focus) {
117-
outline-color: var(--uui-color-focus);
118-
outline-width: var(--uui-card-border-width);
119-
outline-style: solid;
120-
outline-offset: var(--uui-card-border-width);
121-
}
122-
123117
:host([error])::before {
124118
content: '';
125119
position: absolute;
@@ -148,6 +142,15 @@ export class UUICardElement extends SelectOnlyMixin(
148142
color: inherit;
149143
}
150144
145+
button:focus,
146+
a:focus {
147+
outline-color: var(--uui-color-focus);
148+
outline-width: var(--uui-card-border-width);
149+
outline-style: solid;
150+
outline-offset: var(--uui-card-border-width);
151+
border-radius: var(--uui-border-radius);
152+
}
153+
151154
:host([selectable]) {
152155
cursor: pointer;
153156
}

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,11 @@ export class UUIRefElement extends SelectOnlyMixin(
7777
transition: --uui-card-before-opacity 120ms;
7878
}
7979
80-
:host(:focus) {
81-
/** TODO: implement focus outline. */
82-
outline-color: #6ab4f0;
80+
:host([selectable]:focus-visible) {
81+
outline-color: var(--uui-color-focus);
82+
outline-width: var(--uui-card-border-width);
83+
outline-style: solid;
84+
outline-offset: var(--uui-card-border-width);
8385
}
8486
8587
:host([error]) {
@@ -184,6 +186,15 @@ export class UUIRefElement extends SelectOnlyMixin(
184186
color: inherit;
185187
}
186188
189+
button:focus,
190+
a:focus {
191+
outline-color: var(--uui-color-focus);
192+
outline-width: var(--uui-card-border-width);
193+
outline-style: solid;
194+
outline-offset: var(--uui-card-border-width);
195+
border-radius: var(--uui-border-radius);
196+
}
197+
187198
slot[name='actions'] {
188199
display: flex;
189200
align-items: center;

0 commit comments

Comments
 (0)