Skip to content

Commit a80b8bc

Browse files
ctecte
committed
More tweaks
1 parent f70948e commit a80b8bc

File tree

6 files changed

+19
-56
lines changed

6 files changed

+19
-56
lines changed

‎webview-ui/src/components/settings/ModelPicker.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export const ModelPicker = ({
138138
{searchValue.length > 0 && (
139139
<div className="absolute right-2 top-0 bottom-0 flex items-center justify-center">
140140
<X
141-
className="opacity-25 hover:opacity-100 cursor-pointer size-4 bg-vscode-button-secondaryBackground rounded-full p-0.5"
141+
className="text-vscode-input-foreground opacity-50 hover:opacity-100 cursor-pointer size-4 rounded-full p-0.5"
142142
onClick={onClearSearch}
143143
/>
144144
</div>

‎webview-ui/src/components/ui/button.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const buttonVariants = cva(
1919
ghost: "hover:bg-accent hover:text-accent-foreground",
2020
link: "text-primary underline-offset-4 hover:underline",
2121
combobox:
22-
"border border-[var(--vscode-input-border,var(--vscode-input-background))] focus-visible:border-vscode-focusBorder bg-vscode-input-background hover:bg-transparent text-vscode-input-foreground",
22+
"border border-vscode-dropdown-border focus-visible:border-vscode-focusBorder bg-vscode-dropdown-background hover:bg-transparent text-vscode-dropdown-foreground font-normal",
2323
},
2424
size: {
2525
default: "h-7 px-3",

‎webview-ui/src/components/ui/command.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const Command = React.forwardRef<
1414
<CommandPrimitive
1515
ref={ref}
1616
className={cn(
17-
"flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground",
17+
"flex h-full w-full flex-col overflow-hidden rounded-xs bg-popover text-popover-foreground",
1818
className,
1919
)}
2020
{...props}
@@ -43,7 +43,7 @@ const CommandInput = React.forwardRef<
4343
<CommandPrimitive.Input
4444
ref={ref}
4545
className={cn(
46-
"flex h-10 w-full rounded-md bg-transparent py-3 text-base outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
46+
"flex h-10 w-full rounded-xs bg-transparent py-3 text-base outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
4747
className,
4848
)}
4949
{...props}
@@ -108,8 +108,9 @@ const CommandItem = React.forwardRef<
108108
<CommandPrimitive.Item
109109
ref={ref}
110110
className={cn(
111-
"relative flex cursor-pointer gap-2 select-none items-center rounded-sm px-2 py-1.5 text-base text-vscode-dropdown-foreground outline-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
111+
"relative flex cursor-pointer gap-2 select-none items-center rounded-xs px-2 py-1.5 text-sm outline-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
112112
"data-[selected=true]:bg-vscode-list-activeSelectionBackground data-[selected=true]:text-vscode-list-activeSelectionForeground",
113+
"text-vscode-dropdown-foreground",
113114
className,
114115
)}
115116
{...props}

‎webview-ui/src/components/ui/dropdown-menu.tsx‎

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react"
22
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
33
import { PortalProps } from "@radix-ui/react-portal"
4-
import { CheckIcon, ChevronRightIcon, DotFilledIcon } from "@radix-ui/react-icons"
4+
import { CheckIcon, DotFilledIcon } from "@radix-ui/react-icons"
55

66
import { cn } from "@/lib/utils"
77

@@ -13,47 +13,8 @@ const DropdownMenuGroup = DropdownMenuPrimitive.Group
1313

1414
const DropdownMenuPortal = DropdownMenuPrimitive.Portal
1515

16-
const DropdownMenuSub = DropdownMenuPrimitive.Sub
17-
1816
const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup
1917

20-
const DropdownMenuSubTrigger = React.forwardRef<
21-
React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
22-
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
23-
inset?: boolean
24-
}
25-
>(({ className, inset, children, ...props }, ref) => (
26-
<DropdownMenuPrimitive.SubTrigger
27-
ref={ref}
28-
className={cn(
29-
"flex cursor-default gap-2 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
30-
"focus:bg-vscode-list-activeSelectionBackground focus:text-vscode-list-activeSelectionForeground",
31-
"data-[state=open]:bg-vscode-list-activeSelectionBackground data-[state=open]:text-vscode-list-activeSelectionForeground",
32-
inset && "pl-8",
33-
className,
34-
)}
35-
{...props}>
36-
{children}
37-
<ChevronRightIcon className="ml-auto" />
38-
</DropdownMenuPrimitive.SubTrigger>
39-
))
40-
DropdownMenuSubTrigger.displayName = DropdownMenuPrimitive.SubTrigger.displayName
41-
42-
const DropdownMenuSubContent = React.forwardRef<
43-
React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
44-
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
45-
>(({ className, ...props }, ref) => (
46-
<DropdownMenuPrimitive.SubContent
47-
ref={ref}
48-
className={cn(
49-
"z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
50-
className,
51-
)}
52-
{...props}
53-
/>
54-
))
55-
DropdownMenuSubContent.displayName = DropdownMenuPrimitive.SubContent.displayName
56-
5718
const DropdownMenuContent = React.forwardRef<
5819
React.ElementRef<typeof DropdownMenuPrimitive.Content>,
5920
React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content> & Pick<PortalProps, "container">
@@ -63,8 +24,11 @@ const DropdownMenuContent = React.forwardRef<
6324
ref={ref}
6425
sideOffset={sideOffset}
6526
className={cn(
66-
"z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md",
27+
"z-50 min-w-[8rem] overflow-hidden rounded-xs p-1 shadow-xs",
6728
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
29+
"border border-vscode-dropdown-border",
30+
"bg-vscode-dropdown-background",
31+
"text-vscode-dropdown-foreground",
6832
className,
6933
)}
7034
{...props}
@@ -179,8 +143,5 @@ export {
179143
DropdownMenuShortcut,
180144
DropdownMenuGroup,
181145
DropdownMenuPortal,
182-
DropdownMenuSub,
183-
DropdownMenuSubContent,
184-
DropdownMenuSubTrigger,
185146
DropdownMenuRadioGroup,
186147
}

‎webview-ui/src/components/ui/select.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ function SelectTrigger({ className, children, ...props }: React.ComponentProps<t
2222
<SelectPrimitive.Trigger
2323
data-slot="select-trigger"
2424
className={cn(
25-
"data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground aria-invalid:border-destructive flex h-7 w-fit items-center justify-between gap-2 rounded-xs px-3 py-2 whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 cursor-pointer",
26-
"border border-[var(--vscode-input-border,var(--vscode-input-background))] aria-expanded:border-vscode-focusBorder focus-visible:border-vscode-focusBorder",
27-
"bg-vscode-input-background hover:bg-transparent",
28-
"text-vscode-input-foreground",
25+
"data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground aria-invalid:border-destructive flex h-7 w-fit items-center justify-between gap-2 rounded-xs px-3 py-2 whitespace-nowrap transition-[color,box-shadow] outline-none disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 cursor-pointer",
26+
"border border-vscode-dropdown-border aria-expanded:border-vscode-focusBorder focus-visible:border-vscode-focusBorder",
27+
"bg-vscode-dropdown-background hover:bg-transparent",
28+
"text-vscode-dropdown-foreground",
2929
className,
3030
)}
3131
{...props}>
@@ -49,7 +49,7 @@ function SelectContent({
4949
<SelectPrimitive.Content
5050
data-slot="select-content"
5151
className={cn(
52-
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-72 min-w-[8rem] overflow-hidden rounded-xs border border-vscode-focusBorder shadow-md",
52+
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-72 min-w-[8rem] overflow-hidden rounded-xs border border-vscode-focusBorder shadow-xs",
5353
position === "popper" &&
5454
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
5555
className,
@@ -88,6 +88,7 @@ function SelectItem({ className, children, ...props }: React.ComponentProps<type
8888
className={cn(
8989
"[&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full items-center gap-2 rounded-xs py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2 cursor-pointer",
9090
"focus:bg-vscode-list-activeSelectionBackground focus:text-vscode-list-activeSelectionForeground",
91+
"text-vscode-dropdown-foreground",
9192
className,
9293
)}
9394
{...props}>
@@ -105,7 +106,7 @@ function SelectSeparator({ className, ...props }: React.ComponentProps<typeof Se
105106
return (
106107
<SelectPrimitive.Separator
107108
data-slot="select-separator"
108-
className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}
109+
className={cn("bg-vscode-dropdown-border pointer-events-none -mx-1 my-1 h-px", className)}
109110
{...props}
110111
/>
111112
)

‎webview-ui/src/index.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
--muted: var(--vscode-disabledForeground);
135135
--muted-foreground: var(--vscode-descriptionForeground);
136136
--accent: var(--vscode-list-hoverBackground);
137-
--accent-foreground: var(--vscode-button-foreground);
137+
--accent-foreground: var(--vscode-list-hoverForeground);
138138
--destructive: var(--vscode-errorForeground);
139139
--destructive-foreground: var(--vscode-button-foreground);
140140
--border: var(--vscode-input-border);

0 commit comments

Comments
 (0)