Skip to content

Commit ae8c2ef

Browse files
committed
Adopts design tokens in switch, slider, and segmented styles
1 parent f2ce5b9 commit ae8c2ef

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/webviews/apps/shared/components/segmented/segmented.css.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ export const segmentedStyles = css`
77
88
.group {
99
display: inline-flex;
10-
gap: 0.2rem;
11-
padding: 0.2rem;
12-
border-radius: 0.5rem;
10+
gap: var(--gl-space-2);
11+
padding: var(--gl-space-2);
1312
background-color: var(--vscode-input-background);
14-
border: 1px solid var(--vscode-input-border, var(--vscode-contrastBorder, transparent));
13+
border: var(--gl-border-width) solid var(--vscode-input-border, var(--vscode-contrastBorder, transparent));
14+
border-radius: 0.5rem;
1515
}
1616
1717
.segment {
18-
appearance: none;
19-
border: 1px solid transparent;
20-
border-radius: 0.3rem;
2118
padding: 0.3rem 1.2rem;
2219
font-family: var(--vscode-font-family);
2320
font-size: 1.2rem;
2421
line-height: 1.4;
2522
color: var(--color-foreground--75);
26-
background-color: transparent;
27-
cursor: pointer;
2823
white-space: nowrap;
24+
appearance: none;
25+
cursor: pointer;
26+
background-color: transparent;
27+
border: 1px solid transparent;
28+
border-radius: 0.3rem;
2929
}
3030
3131
.segment:hover:not([aria-checked='true']) {
@@ -36,10 +36,10 @@ export const segmentedStyles = css`
3636
/* Fill + weight, not color alone, distinguish the selected segment;
3737
the contrast border keeps it visible in high-contrast themes. */
3838
.segment[aria-checked='true'] {
39+
font-weight: 600;
40+
color: var(--vscode-button-foreground);
3941
background-color: var(--vscode-button-background);
4042
border-color: var(--vscode-contrastBorder, transparent);
41-
color: var(--vscode-button-foreground);
42-
font-weight: 600;
4343
}
4444
4545
.segment:focus-visible {

src/webviews/apps/shared/components/slider/slider.css.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { css } from 'lit';
33
export const sliderStyles = css`
44
:host {
55
display: inline-flex;
6+
gap: var(--gl-space-12);
67
align-items: center;
7-
gap: 1.2rem;
88
}
99
1010
wa-slider {
@@ -18,7 +18,7 @@ export const sliderStyles = css`
1818
1919
wa-slider::part(track) {
2020
background-color: color-mix(in srgb, var(--color-foreground) 20%, transparent);
21-
border: 1px solid var(--vscode-contrastBorder, transparent);
21+
border: var(--gl-border-width) solid var(--vscode-contrastBorder, transparent);
2222
}
2323
2424
wa-slider::part(indicator) {
@@ -27,12 +27,12 @@ export const sliderStyles = css`
2727
2828
wa-slider::part(thumb) {
2929
background-color: var(--vscode-button-background);
30-
border: 1px solid var(--vscode-contrastBorder, var(--vscode-button-background));
30+
border: var(--gl-border-width) solid var(--vscode-contrastBorder, var(--vscode-button-background));
3131
box-shadow: 0 1px 2px var(--vscode-widget-shadow);
3232
}
3333
3434
wa-slider:focus-within::part(thumb) {
35-
outline: 1px solid var(--color-focus-border);
35+
outline: var(--gl-border-width) solid var(--color-focus-border);
3636
outline-offset: 2px;
3737
}
3838

src/webviews/apps/shared/components/switch/switch.css.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const switchStyles = css`
3333
border keeps the track visible in high-contrast themes where the fill may vanish. */
3434
wa-switch::part(control) {
3535
background-color: color-mix(in srgb, var(--color-foreground) 25%, transparent);
36-
border: 1px solid var(--vscode-contrastBorder, transparent);
36+
border: var(--gl-border-width) solid var(--vscode-contrastBorder, transparent);
3737
}
3838
3939
/* wa-switch exposes checked as a CSS custom state (customStates.set('checked', …)),
@@ -44,7 +44,7 @@ export const switchStyles = css`
4444
}
4545
4646
wa-switch::part(thumb) {
47-
background-color: var(--vscode-button-foreground, #ffffff);
47+
background-color: var(--vscode-button-foreground, #fff);
4848
border: none;
4949
box-shadow: 0 1px 2px var(--vscode-widget-shadow);
5050
}
@@ -54,7 +54,7 @@ export const switchStyles = css`
5454
}
5555
5656
wa-switch:focus-within::part(control) {
57-
outline: 1px solid var(--color-focus-border);
57+
outline: var(--gl-border-width) solid var(--color-focus-border);
5858
outline-offset: 2px;
5959
}
6060

0 commit comments

Comments
 (0)