Skip to content

Commit 481de93

Browse files
committed
Move icon-button styles from overrides.css to Dialog and Drawer component stylesheets
1 parent dabb148 commit 481de93

File tree

4 files changed

+34
-26
lines changed

4 files changed

+34
-26
lines changed

src/components/dialog/dialog.styles.ts

+12
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,18 @@ export default css`
149149
align-items: center;
150150
display: flex;
151151
flex: none;
152+
border-radius: var(--sl-border-radius-circle);
153+
color: var(--ts-color-text-subdued);
154+
}
155+
156+
.dialog__close:hover {
157+
background-color: var(--sl-color-neutral-200);
158+
color: var(--ts-color-text-default);
159+
}
160+
161+
.dialog__close:active {
162+
background-color: var(--sl-color-neutral-300);
163+
color: var(--ts-color-text-default);
152164
}
153165
154166
.dialog--announcement .dialog__header-actions {

src/components/drawer/drawer.styles.ts

+19-2
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ export default css`
9696
}
9797
9898
.drawer__header-actions {
99-
flex-shrink: 0;
99+
flex: 0 0 auto;
100100
display: flex;
101-
flex-wrap: wrap;
102101
justify-content: end;
102+
align-items: center;
103103
gap: var(--sl-spacing-2x-small);
104104
padding: 0 var(--header-spacing);
105105
}
@@ -112,9 +112,26 @@ export default css`
112112
font-size: var(--sl-font-size-medium);
113113
}
114114
115+
.drawer__close {
116+
border-radius: var(--sl-border-radius-circle);
117+
color: var(--ts-color-text-subdued);
118+
}
119+
120+
.drawer__close:hover {
121+
background-color: var(--sl-color-neutral-200);
122+
color: var(--ts-color-text-default);
123+
}
124+
125+
.drawer__close:active {
126+
background-color: var(--sl-color-neutral-300);
127+
color: var(--ts-color-text-default);
128+
}
129+
115130
.drawer__body {
116131
flex: 1 1 auto;
117132
display: block;
133+
border-top: 1px solid var(--sl-color-neutral-300);
134+
border-bottom: 1px solid var(--sl-color-neutral-300);
118135
padding: var(--body-spacing);
119136
overflow: auto;
120137
-webkit-overflow-scrolling: touch;

src/components/icon-button/icon-button.styles.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default css`
1212
align-items: center;
1313
background: none;
1414
border: none;
15-
border-radius: var(--sl-border-radius-medium);
15+
border-radius: var(--sl-border-radius-circle);
1616
font-size: inherit;
1717
color: inherit;
1818
padding: var(--sl-spacing-x-small);
@@ -23,11 +23,11 @@ export default css`
2323
2424
.icon-button:hover:not(.icon-button--disabled),
2525
.icon-button:focus-visible:not(.icon-button--disabled) {
26-
color: var(--sl-color-primary-600);
26+
background-color: var(--sl-color-neutral-200);
2727
}
2828
2929
.icon-button:active:not(.icon-button--disabled) {
30-
color: var(--sl-color-primary-700);
30+
background-color: var(--sl-color-neutral-300);
3131
}
3232
3333
.icon-button:focus {

src/styles/exports/overrides.css

-21
Original file line numberDiff line numberDiff line change
@@ -296,27 +296,6 @@ sl-icon.contained {
296296
padding: var(--sl-spacing-x-small);
297297
}
298298

299-
/** ********** **/
300-
/* Icon button custom */
301-
/** ********** **/
302-
sl-icon-button::part(base),
303-
sl-dialog::part(close-button__base) {
304-
border-radius: var(--sl-border-radius-circle);
305-
color: var(--ts-color-text-subdued);
306-
}
307-
308-
sl-icon-button::part(base):hover,
309-
sl-dialog::part(close-button__base):hover {
310-
background-color: var(--sl-color-neutral-200);
311-
color: var(--ts-color-text-default);
312-
}
313-
314-
sl-icon-button::part(base):active,
315-
sl-dialog::part(close-button__base):active {
316-
background-color: var(--sl-color-neutral-300);
317-
color: var(--ts-color-text-default);
318-
}
319-
320299
/** ****************** */
321300
/* Range */
322301
/** ****************** */

0 commit comments

Comments
 (0)