Skip to content

Commit 6e4a791

Browse files
authored
UI: Toggles and border fixes on edge case themes. (#3051)
Toggles and border fix.
1 parent 67ec756 commit 6e4a791

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

webview-ui/src/components/settings/AutoApproveToggle.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export const AutoApproveToggle = ({ onToggle, ...props }: AutoApproveToggleProps
106106
onClick={() => onToggle(key, !props[key])}
107107
title={t(descriptionKey || "")}
108108
data-testid={testId}
109-
className={cn(" aspect-square h-[80px]")}>
109+
className={cn(" aspect-square h-[80px]", !props[key] && "opacity-50")}>
110110
<span className={cn("flex flex-col items-center gap-1")}>
111111
<span className={`codicon codicon-${icon}`} />
112112
<span className="text-sm text-center">{t(labelKey)}</span>

webview-ui/src/index.css

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@
8282

8383
--color-vscode-input-foreground: var(--vscode-input-foreground);
8484
--color-vscode-input-background: var(--vscode-input-background);
85-
--color-vscode-input-border: var(--vscode-input-border);
85+
--color-vscode-input-border: var(
86+
--vscode-input-border,
87+
transparent
88+
); /* Some themes don't have a border color, so we can fallback to transparent */
8689

8790
--color-vscode-focusBorder: var(--vscode-focusBorder);
8891

@@ -140,7 +143,7 @@
140143
--accent-foreground: var(--vscode-list-hoverForeground);
141144
--destructive: var(--vscode-errorForeground);
142145
--destructive-foreground: var(--vscode-button-foreground);
143-
--border: var(--vscode-input-border);
146+
--border: var(--vscode-input-border, transparent); /* --border gets theme value or transparent fallback */
144147
--input: var(--vscode-input-background);
145148
--ring: var(--vscode-input-border);
146149
--chart-1: var(--vscode-charts-red);
@@ -150,6 +153,13 @@
150153
--chart-5: var(--vscode-charts-green);
151154
--radius: 0.5rem;
152155
}
156+
157+
/* Higher specififty than VSCode's theme and root. */
158+
/* Used for baseline theme overrides, but avoid using for styling. */
159+
160+
body {
161+
--vscode-input-border: var(--border);
162+
}
153163
}
154164

155165
@layer components {

0 commit comments

Comments
 (0)