Merge remote-tracking branch 'origin/main' into refactor/use-ds-primitives

Co-authored-by: Cursor <cursoragent@cursor.com>

# Conflicts:
#	web/src/components/BottomPickSheet.tsx
#	web/src/components/SidebarFooter.tsx
#	web/src/components/ui/card.tsx
#	web/src/components/ui/confirm-dialog.tsx
#	web/src/pages/ChatPage.tsx
This commit is contained in:
Austin Pickett
2026-05-28 14:20:49 -04:00
1254 changed files with 199373 additions and 11909 deletions
+2 -2
View File
@@ -35,7 +35,7 @@ export function PluginPage({ name }: { name: string }) {
<div
className={cn(
"max-w-lg p-4",
"font-mondwest text-sm tracking-[0.08em] text-midground/80",
"font-mondwest text-sm tracking-[0.08em] text-text-secondary",
)}
role="alert"
>
@@ -48,7 +48,7 @@ export function PluginPage({ name }: { name: string }) {
<div
className={cn(
"flex items-center gap-2 p-4",
"font-mondwest text-sm tracking-[0.1em] text-midground/60",
"font-mondwest text-sm tracking-[0.1em] text-text-tertiary",
)}
>
<Spinner className="shrink-0" />