Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

feat(web): add Akeru Noir and flatten shared controls (#191)

Leo190e0f14ef68
diff --git a/apps/web/index.html b/apps/web/index.html
index 170c38781..94bd6fb6d 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -52,6 +52,20 @@
// Keep this small boot-time copy in sync with the built-in palettes so
// the selected theme is visible before the app has mounted.
const BUILT_IN_THEME_PALETTES = {
+ "akeru-noir": {
+ light: {
+ background: "oklch(0.99 0.001 286.375)",
+ foreground: "oklch(0.21 0.006 285.885)",
+ accent: "oklch(0.607447 0.134946 296.512)",
+ chrome: "oklch(0.975 0.0015 286.375)",
+ },
+ dark: {
+ background: "oklch(0.105 0 0)",
+ foreground: "oklch(0.97 0.0013 286.375)",
+ accent: "oklch(0.607447 0.134946 296.512)",
+ chrome: "oklch(0.135 0 0)",
+ },
+ },
"akeru-paper": {
light: {
background: "oklch(0.958531 0.009845 87.471)",
@@ -149,6 +163,7 @@
"system",
"light",
"dark",
+ "akeru-noir",
"akeru-paper",
"t3-chat",
"grove",
diff --git a/apps/web/src/components/chat/ComposerPendingApprovalActions.test.tsx b/apps/web/src/components/chat/ComposerPendingApprovalActions.test.tsx
index e44cc066f..4a0130d24 100644
--- a/apps/web/src/components/chat/ComposerPendingApprovalActions.test.tsx
+++ b/apps/web/src/components/chat/ComposerPendingApprovalActions.test.tsx
@@ -24,7 +24,8 @@ describe("ComposerPendingApprovalActions", () => {
expect(markup).toContain("h-7");
expect(markup).toContain("sm:h-6");
expect(markup).toContain("bg-primary");
- expect(markup).toContain("border-input");
+ expect(markup).toContain("bg-secondary");
+ expect(markup).not.toContain("border-input");
});
it("shows only the approval choices advertised by an MCP server", () => {
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
index c22ea175a..ec699b05f 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -89,7 +89,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
<button
type="button"
className={cn(
- "flex cursor-pointer items-center justify-center rounded-full bg-destructive/90 text-white shadow-xs shadow-destructive/24 inset-shadow-[0_1px_--theme(--color-white/16%)] transition-all duration-150 hover:bg-destructive hover:scale-105 active:inset-shadow-[0_1px_--theme(--color-black/8%)] active:shadow-none",
+ "flex cursor-pointer items-center justify-center rounded-full bg-destructive/90 text-white transition-all duration-150 hover:bg-destructive hover:scale-105",
insidePendingAction
? "size-8 sm:size-7"
: showSendWhileRunning && hasSendableContent
@@ -222,7 +222,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
<button
type="submit"
className={cn(
- "relative isolate flex h-9 w-9 items-center justify-center overflow-hidden rounded-full shadow-xs transition-all duration-150 enabled:cursor-pointer enabled:inset-shadow-[0_1px_--theme(--color-white/16%)] hover:scale-105 active:inset-shadow-[0_1px_--theme(--color-black/8%)] active:shadow-none disabled:pointer-events-none disabled:opacity-30 disabled:shadow-none disabled:hover:scale-100 sm:h-8 sm:w-8",
+ "relative isolate flex h-9 w-9 items-center justify-center overflow-hidden rounded-full transition-all duration-150 enabled:cursor-pointer hover:scale-105 disabled:pointer-events-none disabled:opacity-30 disabled:hover:scale-100 sm:h-8 sm:w-8",
stageBackdropVariant
? "bg-transparent text-white enabled:shadow-black/24 enabled:hover:brightness-110"
: "bg-message-action text-message-action-foreground enabled:shadow-message-action/24 hover:bg-message-action-hover",
diff --git a/apps/web/src/components/ui/alert.tsx b/apps/web/src/components/ui/alert.tsx
index d071fd2da..c0e2dc48d 100644
--- a/apps/web/src/components/ui/alert.tsx
+++ b/apps/web/src/components/ui/alert.tsx
@@ -10,13 +10,13 @@ const alertVariants = cva("relative rounded-xl border px-3.5 py-3 text-card-fore
},
variants: {
variant: {
- default: "bg-transparent dark:bg-input/32 [&_svg]:text-muted-foreground",
+ default: "border-transparent bg-secondary [&_svg]:text-muted-foreground",
error:
- "border-error/32 bg-error-surface text-error-foreground [&_[data-slot=alert-description]]:text-error-foreground/80 [&_svg]:text-error",
- info: "border-info/32 bg-info/4 [&_svg]:text-info",
- success: "border-success/32 bg-success/4 [&_svg]:text-success",
+ "border-transparent bg-error-surface text-error-foreground [&_[data-slot=alert-description]]:text-error-foreground/80 [&_svg]:text-error",
+ info: "border-transparent bg-info/8 [&_svg]:text-info",
+ success: "border-transparent bg-success/8 [&_svg]:text-success",
warning:
- "border-warning/32 bg-warning-surface text-warning-foreground [&_[data-slot=alert-description]]:text-warning-foreground/80 [&_svg]:text-warning",
+ "border-transparent bg-warning-surface text-warning-foreground [&_[data-slot=alert-description]]:text-warning-foreground/80 [&_svg]:text-warning",
},
},
});
diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
index b81701e25..cedc4a0e0 100644
--- a/apps/web/src/components/ui/autocomplete.tsx
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -104,7 +104,7 @@ function AutocompletePopup({
>
<span
className={cn(
- "relative flex max-h-full min-w-(--anchor-width) max-w-(--available-width) origin-(--transform-origin) rounded-lg border bg-popover not-dark:bg-clip-padding shadow-lg/5 transition-[scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "dropdown-glass relative flex max-h-full min-w-(--anchor-width) max-w-(--available-width) origin-(--transform-origin) rounded-lg shadow-[0_16px_40px_-18px_rgb(0_0_0/55%)] transition-[scale,opacity] dark:shadow-[0_18px_44px_-18px_rgb(0_0_0/80%)]",
className,
)}
>
diff --git a/apps/web/src/components/ui/badge.tsx b/apps/web/src/components/ui/badge.tsx
index e06d9b9a0..b75e50489 100644
--- a/apps/web/src/components/ui/badge.tsx
+++ b/apps/web/src/components/ui/badge.tsx
@@ -25,8 +25,7 @@ const badgeVariants = cva(
destructive: "bg-destructive text-white [button&,a&]:hover:bg-destructive/90",
error: "bg-destructive/8 text-destructive-foreground dark:bg-destructive/16",
info: "bg-info/8 text-info-foreground dark:bg-info/16",
- outline:
- "border-input bg-background text-foreground dark:bg-input/32 [button&,a&]:hover:bg-accent/50 dark:[button&,a&]:hover:bg-input/48",
+ outline: "bg-secondary text-foreground [button&,a&]:hover:bg-accent/80",
secondary: "bg-secondary text-secondary-foreground [button&,a&]:hover:bg-secondary/90",
success: "bg-success/8 text-success-foreground dark:bg-success/16",
warning: "bg-warning/8 text-warning-foreground dark:bg-warning/16",
diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx
index 274eb00d7..4f68bdf8b 100644
--- a/apps/web/src/components/ui/button.tsx
+++ b/apps/web/src/components/ui/button.tsx
@@ -37,20 +37,20 @@ const buttonVariants = cva(
},
variant: {
default:
- "not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-primary bg-primary text-primary-foreground shadow-primary/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-primary/90",
+ "border-transparent bg-primary text-primary-foreground [:active,[data-pressed]]:bg-primary/80 [:hover,[data-pressed]]:bg-primary/90",
destructive:
- "not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-destructive bg-destructive text-white shadow-destructive/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-destructive/90",
+ "border-transparent bg-destructive text-white [:active,[data-pressed]]:bg-destructive/80 [:hover,[data-pressed]]:bg-destructive/90",
"destructive-outline":
- "border-input bg-popover not-dark:bg-clip-padding text-destructive-foreground shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-disabled:before:shadow-[0_-1px_--theme(--color-white/2%)] dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:border-destructive/32 [:hover,[data-pressed]]:bg-destructive/4",
+ "border-transparent bg-secondary text-destructive-foreground [:hover,[data-pressed]]:bg-destructive/12",
ghost:
"[--control-icon-color:var(--contrast-muted-foreground)] border-transparent text-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent",
"ghost-muted":
"[--control-icon-color:var(--contrast-muted-foreground)] border-transparent text-muted-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent [:hover,[data-pressed]]:text-foreground",
glass:
- "surface-glass [--control-icon-color:var(--contrast-muted-foreground)] border-border/60 text-foreground shadow-sm [:hover,[data-pressed]]:border-border",
+ "surface-glass [--control-icon-color:var(--contrast-muted-foreground)] border-transparent text-foreground [:hover,[data-pressed]]:bg-accent/60",
link: "border-transparent underline-offset-4 [:hover,[data-pressed]]:underline",
outline:
- "[--control-icon-color:var(--contrast-muted-foreground)] border-input bg-popover not-dark:bg-clip-padding text-foreground shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-disabled:before:shadow-[0_-1px_--theme(--color-white/2%)] dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-accent/50 dark:[:hover,[data-pressed]]:bg-input/64",
+ "[--control-icon-color:var(--contrast-muted-foreground)] border-transparent bg-secondary text-foreground [:active,[data-pressed]]:bg-accent [:hover,[data-pressed]]:bg-accent/80",
secondary:
"border-transparent bg-secondary text-secondary-foreground [:active,[data-pressed]]:bg-secondary/80 [:hover,[data-pressed]]:bg-secondary/90",
},
diff --git a/apps/web/src/components/ui/card.tsx b/apps/web/src/components/ui/card.tsx
index f1428d13d..703bdbe3b 100644
--- a/apps/web/src/components/ui/card.tsx
+++ b/apps/web/src/components/ui/card.tsx
@@ -8,7 +8,7 @@ import { cn } from "~/lib/utils";
function Card({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
- "relative flex flex-col rounded-2xl border bg-card not-dark:bg-clip-padding text-card-foreground shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "relative flex flex-col rounded-2xl border border-border/60 bg-card text-card-foreground",
className,
),
"data-slot": "card",
@@ -24,7 +24,7 @@ function Card({ className, render, ...props }: useRender.ComponentProps<"div">)
function CardFrame({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
- "[--clip-top:-1rem] [--clip-bottom:-1rem] *:data-[slot=card]:first:[--clip-top:1px] *:data-[slot=card]:last:[--clip-bottom:1px] flex flex-col relative rounded-2xl border bg-card before:bg-muted/72 not-dark:bg-clip-padding text-card-foreground shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)] *:data-[slot=card]:-m-px *:not-last:data-[slot=card]:rounded-b-xl *:not-last:data-[slot=card]:before:rounded-b-[calc(var(--radius-xl)-1px)] *:not-first:data-[slot=card]:rounded-t-xl *:not-first:data-[slot=card]:before:rounded-t-[calc(var(--radius-xl)-1px)] *:data-[slot=card]:[clip-path:inset(var(--clip-top)_1px_var(--clip-bottom)_1px_round_calc(var(--radius-2xl)-1px))] *:data-[slot=card]:shadow-none *:data-[slot=card]:before:hidden *:data-[slot=card]:bg-clip-padding",
+ "[--clip-top:-1rem] [--clip-bottom:-1rem] *:data-[slot=card]:first:[--clip-top:1px] *:data-[slot=card]:last:[--clip-bottom:1px] flex flex-col relative rounded-2xl border border-border/60 bg-card before:bg-muted/72 text-card-foreground before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] *:data-[slot=card]:-m-px *:not-last:data-[slot=card]:rounded-b-xl *:not-first:data-[slot=card]:rounded-t-xl *:data-[slot=card]:[clip-path:inset(var(--clip-top)_1px_var(--clip-bottom)_1px_round_calc(var(--radius-2xl)-1px))] *:data-[slot=card]:shadow-none *:data-[slot=card]:before:hidden",
className,
),
"data-slot": "card-frame",
diff --git a/apps/web/src/components/ui/checkbox.tsx b/apps/web/src/components/ui/checkbox.tsx
index d842c7277..6f0c48a83 100644
--- a/apps/web/src/components/ui/checkbox.tsx
+++ b/apps/web/src/components/ui/checkbox.tsx
@@ -8,7 +8,7 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
return (
<CheckboxPrimitive.Root
className={cn(
- "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-[.25rem] border border-input bg-background not-dark:bg-clip-padding shadow-xs/5 outline-none ring-ring transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[3px] not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:aria-invalid:ring-destructive/24 dark:not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [[data-disabled],[data-checked],[aria-invalid]]:shadow-none",
+ "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-[.25rem] border border-transparent bg-input outline-none ring-ring transition-shadow focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:ring-2 aria-invalid:ring-destructive/40 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4",
className,
)}
data-slot="checkbox"
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index cf3a46142..8341d0845 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -330,7 +330,7 @@ function ComboboxChips({
return (
<ComboboxPrimitive.Chips
className={cn(
- "relative inline-flex min-h-9 w-full flex-wrap gap-1 rounded-lg border border-input bg-background not-dark:bg-clip-padding p-[calc(--spacing(1)-1px)] text-base shadow-xs/5 outline-none ring-ring/24 transition-shadow *:min-h-7 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-has-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-within:border-ring focus-within:ring-[3px] has-disabled:pointer-events-none has-data-[size=lg]:min-h-10 has-data-[size=sm]:min-h-8 has-aria-invalid:border-destructive/36 has-autofill:bg-foreground/4 has-disabled:opacity-64 has-[:disabled,:focus-within,[aria-invalid]]:shadow-none focus-within:has-aria-invalid:border-destructive/64 focus-within:has-aria-invalid:ring-destructive/16 has-data-[size=lg]:*:min-h-8 has-data-[size=sm]:*:min-h-6 sm:min-h-8 sm:text-sm sm:has-data-[size=lg]:min-h-9 sm:has-data-[size=sm]:min-h-7 sm:*:min-h-6 sm:has-data-[size=lg]:*:min-h-7 sm:has-data-[size=sm]:*:min-h-5 dark:not-has-disabled:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-aria-invalid:ring-destructive/24 dark:not-has-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "relative inline-flex min-h-9 w-full flex-wrap gap-1 rounded-lg border border-transparent bg-secondary p-[calc(--spacing(1)-1px)] text-base outline-none ring-ring/70 transition-shadow *:min-h-7 focus-within:ring-2 has-disabled:pointer-events-none has-data-[size=lg]:min-h-10 has-data-[size=sm]:min-h-8 has-aria-invalid:ring-2 has-aria-invalid:ring-destructive/40 has-autofill:bg-foreground/4 has-disabled:opacity-64 focus-within:has-aria-invalid:ring-destructive/60 has-data-[size=lg]:*:min-h-8 has-data-[size=sm]:*:min-h-6 sm:min-h-8 sm:text-sm sm:has-data-[size=lg]:min-h-9 sm:has-data-[size=sm]:min-h-7 sm:*:min-h-6 sm:has-data-[size=lg]:*:min-h-7 sm:has-data-[size=sm]:*:min-h-5 dark:has-autofill:bg-foreground/8",
className,
)}
data-slot="combobox-chips"
diff --git a/apps/web/src/components/ui/empty.tsx b/apps/web/src/components/ui/empty.tsx
index 5390dd665..c98e88015 100644
--- a/apps/web/src/components/ui/empty.tsx
+++ b/apps/web/src/components/ui/empty.tsx
@@ -34,7 +34,7 @@ const emptyMediaVariants = cva(
variants: {
variant: {
default: "bg-transparent",
- icon: "relative flex size-9 shrink-0 items-center justify-center rounded-md border bg-card not-dark:bg-clip-padding text-foreground shadow-sm/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-md)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='size-'])]:size-4.5",
+ icon: "relative flex size-9 shrink-0 items-center justify-center rounded-md border border-transparent bg-secondary text-foreground [&_svg:not([class*='size-'])]:size-4.5",
},
},
},
diff --git a/apps/web/src/components/ui/group.tsx b/apps/web/src/components/ui/group.tsx
index 6eedfdda9..2c085cd9d 100644
--- a/apps/web/src/components/ui/group.tsx
+++ b/apps/web/src/components/ui/group.tsx
@@ -51,7 +51,7 @@ function Group({
function GroupText({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
- "relative inline-flex items-center whitespace-nowrap gap-2 rounded-lg border border-input bg-muted not-dark:bg-clip-padding px-[calc(--spacing(3)-1px)] text-muted-foreground text-base sm:text-sm shadow-xs/5 outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/6%)] dark:bg-input/64 dark:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 [&_svg]:-mx-0.5",
+ "relative inline-flex items-center whitespace-nowrap gap-2 rounded-lg border border-transparent bg-secondary px-[calc(--spacing(3)-1px)] text-muted-foreground text-base sm:text-sm outline-none transition-shadow [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 [&_svg]:-mx-0.5",
className,
),
"data-slot": "group-text",
diff --git a/apps/web/src/components/ui/input-group.tsx b/apps/web/src/components/ui/input-group.tsx
index 04e34e561..18928e07b 100644
--- a/apps/web/src/components/ui/input-group.tsx
+++ b/apps/web/src/components/ui/input-group.tsx
@@ -8,17 +8,16 @@ import { Input, type InputProps } from "~/components/ui/input";
import { Textarea, type TextareaProps } from "~/components/ui/textarea";
const inputGroupVariants = cva(
- "relative inline-flex w-full min-w-0 items-center rounded-[var(--control-radius)] border text-base text-foreground ring-ring/24 transition-shadow has-[input:focus-visible,textarea:focus-visible]:has-[input[aria-invalid],textarea[aria-invalid]]:border-destructive/64 has-[input:focus-visible,textarea:focus-visible]:has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/16 has-[textarea]:h-auto has-data-[align=block-end]:h-auto has-data-[align=block-start]:h-auto has-data-[align=block-end]:flex-col has-data-[align=block-start]:flex-col has-[input:focus-visible,textarea:focus-visible]:border-ring has-[input[aria-invalid],textarea[aria-invalid]]:border-destructive/36 has-autofill:bg-foreground/4 has-[input:disabled,textarea:disabled]:opacity-64 has-[input:disabled,textarea:disabled,input:focus-visible,textarea:focus-visible,input[aria-invalid],textarea[aria-invalid]]:shadow-none has-[input:focus-visible,textarea:focus-visible]:ring-[3px] sm:text-sm dark:has-autofill:bg-foreground/8 dark:has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/24 has-data-[align=inline-start]:**:[[data-size=sm]_input]:ps-1.5 has-data-[align=inline-end]:**:[[data-size=sm]_input]:pe-1.5 *:[[data-slot=input-control],[data-slot=textarea-control]]:contents *:[[data-slot=input-control],[data-slot=textarea-control]]:before:hidden has-[[data-align=block-start],[data-align=block-end]]:**:[input]:h-auto has-data-[align=inline-start]:**:[input]:ps-2 has-data-[align=inline-end]:**:[input]:pe-2 has-data-[align=block-end]:**:[input]:pt-1.5 has-data-[align=block-start]:**:[input]:pb-1.5 **:[textarea]:min-h-20.5 **:[textarea]:resize-none **:[textarea]:py-[calc(--spacing(3)-1px)] **:[textarea]:max-sm:min-h-23.5 **:[textarea_button]:rounded-[calc(var(--control-radius)-1px)]",
+ "relative inline-flex w-full min-w-0 items-center rounded-[var(--control-radius)] border border-transparent text-base text-foreground ring-ring/70 transition-shadow has-[input:focus-visible,textarea:focus-visible]:has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/60 has-[textarea]:h-auto has-data-[align=block-end]:h-auto has-data-[align=block-start]:h-auto has-data-[align=block-end]:flex-col has-data-[align=block-start]:flex-col has-[input[aria-invalid],textarea[aria-invalid]]:ring-2 has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/40 has-autofill:bg-foreground/4 has-[input:disabled,textarea:disabled]:opacity-64 has-[input:focus-visible,textarea:focus-visible]:ring-2 sm:text-sm dark:has-autofill:bg-foreground/8 has-data-[align=inline-start]:**:[[data-size=sm]_input]:ps-1.5 has-data-[align=inline-end]:**:[[data-size=sm]_input]:pe-1.5 *:[[data-slot=input-control],[data-slot=textarea-control]]:contents *:[[data-slot=input-control],[data-slot=textarea-control]]:before:hidden has-[[data-align=block-start],[data-align=block-end]]:**:[input]:h-auto has-data-[align=inline-start]:**:[input]:ps-2 has-data-[align=inline-end]:**:[input]:pe-2 has-data-[align=block-end]:**:[input]:pt-1.5 has-data-[align=block-start]:**:[input]:pb-1.5 **:[textarea]:min-h-20.5 **:[textarea]:resize-none **:[textarea]:py-[calc(--spacing(3)-1px)] **:[textarea]:max-sm:min-h-23.5 **:[textarea_button]:rounded-[calc(var(--control-radius)-1px)]",
{
defaultVariants: {
variant: "default",
},
variants: {
variant: {
- default:
- "border-input bg-background not-dark:bg-clip-padding shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--control-radius)-1px)] not-has-[input:disabled,textarea:disabled]:not-has-[input:focus-visible,textarea:focus-visible]:not-has-[input[aria-invalid],textarea[aria-invalid]]:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-has-[input:disabled,textarea:disabled]:not-has-[input:focus-visible,textarea:focus-visible]:not-has-[input[aria-invalid],textarea[aria-invalid]]:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ default: "bg-secondary",
ghost:
- "border-transparent bg-transparent shadow-none hover:bg-muted/40 has-[input:focus-visible,textarea:focus-visible]:bg-background",
+ "bg-transparent hover:bg-muted/40 has-[input:focus-visible,textarea:focus-visible]:bg-secondary",
},
},
},
diff --git a/apps/web/src/components/ui/input.tsx b/apps/web/src/components/ui/input.tsx
index cae3dfe62..b0a7b3ba9 100644
--- a/apps/web/src/components/ui/input.tsx
+++ b/apps/web/src/components/ui/input.tsx
@@ -59,7 +59,7 @@ function Input({
className={
cn(
!unstyled &&
- "relative inline-flex w-full rounded-lg border border-input bg-background not-dark:bg-clip-padding text-base text-foreground shadow-xs/5 ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-has-disabled:not-has-focus-visible:not-has-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] has-focus-visible:has-aria-invalid:border-destructive/64 has-focus-visible:has-aria-invalid:ring-destructive/16 has-aria-invalid:border-destructive/36 has-focus-visible:border-ring has-autofill:bg-foreground/4 has-disabled:opacity-64 has-[:disabled,:focus-visible,[aria-invalid]]:shadow-none has-focus-visible:ring-[3px] sm:text-sm dark:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-aria-invalid:ring-destructive/24 dark:not-has-disabled:not-has-focus-visible:not-has-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "relative inline-flex w-full rounded-lg border border-transparent bg-secondary text-base text-foreground ring-ring/70 transition-shadow has-focus-visible:has-aria-invalid:ring-destructive/60 has-aria-invalid:ring-2 has-aria-invalid:ring-destructive/40 has-autofill:bg-foreground/4 has-disabled:opacity-64 has-focus-visible:ring-2 sm:text-sm dark:has-autofill:bg-foreground/8",
!unstyled &&
size === "compact" &&
"rounded-md before:rounded-[calc(var(--radius-md)-1px)]",
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
index b66782ebe..1925d89c1 100644
--- a/apps/web/src/components/ui/menu.tsx
+++ b/apps/web/src/components/ui/menu.tsx
@@ -63,7 +63,7 @@ function MenuPopup({
data-slot="menu-popup"
{...props}
>
- <div className="max-h-(--available-height) w-full overflow-y-auto p-1">{children}</div>
+ <div className="max-h-(--available-height) w-full overflow-y-auto p-1.5">{children}</div>
</MenuPrimitive.Popup>
</MenuPrimitive.Positioner>
</MenuPrimitive.Portal>
@@ -86,7 +86,7 @@ function MenuItem({
return (
<MenuPrimitive.Item
className={cn(
- "[&>svg]:-mx-0.5 flex min-h-8 cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1 text-base text-foreground outline-none data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-highlighted:bg-accent data-inset:ps-8 data-[variant=destructive]:text-destructive-foreground data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&>svg:not([class*='opacity-'])]:opacity-80 [&>svg:not([class*='size-'])]:size-4.5 sm:[&>svg:not([class*='size-'])]:size-4 [&>svg:not([class*='text-'])]:text-muted-foreground data-[variant=destructive]:[&>svg:not([class*='text-'])]:text-current [&>svg]:pointer-events-none [&>svg]:shrink-0",
+ "[&>svg]:-mx-0.5 flex min-h-8 cursor-pointer select-none items-center gap-2 rounded-md px-2.5 py-1 text-base text-foreground outline-none data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-highlighted:bg-accent data-inset:ps-8 data-[variant=destructive]:text-destructive-foreground data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&>svg:not([class*='opacity-'])]:opacity-80 [&>svg:not([class*='size-'])]:size-4.5 sm:[&>svg:not([class*='size-'])]:size-4 [&>svg:not([class*='text-'])]:text-muted-foreground data-[variant=destructive]:[&>svg:not([class*='text-'])]:text-current [&>svg]:pointer-events-none [&>svg]:shrink-0",
className,
)}
data-inset={inset}
@@ -110,7 +110,7 @@ function MenuCheckboxItem({
<MenuPrimitive.CheckboxItem
checked={checked}
className={cn(
- "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center gap-2 rounded-sm py-1 ps-2 text-base text-foreground outline-none data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center gap-2 rounded-md py-1 ps-2.5 text-base text-foreground outline-none data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
variant === "switch" ? "grid-cols-[1fr_auto] gap-4 pe-1.5" : "grid-cols-[1rem_1fr] pe-4",
className,
)}
@@ -121,7 +121,7 @@ function MenuCheckboxItem({
<>
<span className="col-start-1">{children}</span>
<MenuPrimitive.CheckboxItemIndicator
- className="inset-shadow-[0_1px_--theme(--color-black/4%)] inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(4)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(3)]"
+ className="inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(4)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(3)]"
keepMounted
>
<span className="pointer-events-none block aspect-square h-full in-[[data-slot=menu-checkbox-item][data-checked]]:origin-[var(--thumb-size)_50%] origin-left in-[[data-slot=menu-checkbox-item][data-checked]]:translate-x-[calc(var(--thumb-size)-4px)] in-[[data-slot=menu-checkbox-item]:active]:not-data-disabled:scale-x-110 in-[[data-slot=menu-checkbox-item]:active]:rounded-[var(--thumb-size)/calc(var(--thumb-size)*1.10)] rounded-(--thumb-size) bg-background shadow-sm/5 will-change-transform [transition:translate_.15s,border-radius_.15s,scale_.1s_.1s,transform-origin_.15s]" />
diff --git a/apps/web/src/components/ui/number-field.tsx b/apps/web/src/components/ui/number-field.tsx
index 4b348f2ff..40ec47f8c 100644
--- a/apps/web/src/components/ui/number-field.tsx
+++ b/apps/web/src/components/ui/number-field.tsx
@@ -44,7 +44,7 @@ export function NumberFieldGroup({
return (
<NumberFieldPrimitive.Group
className={cn(
- "relative flex w-full justify-between rounded-lg border border-input bg-background not-dark:bg-clip-padding text-base text-foreground shadow-xs/5 ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-data-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-within:border-ring focus-within:ring-[3px] has-aria-invalid:border-destructive/36 has-autofill:bg-foreground/4 focus-within:has-aria-invalid:border-destructive/64 focus-within:has-aria-invalid:ring-destructive/48 data-disabled:pointer-events-none data-disabled:opacity-64 sm:text-sm dark:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-aria-invalid:ring-destructive/24 dark:not-data-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0 [[data-disabled],:focus-within,[aria-invalid]]:shadow-none",
+ "relative flex w-full justify-between rounded-lg border border-transparent bg-secondary text-base text-foreground ring-ring/70 transition-shadow focus-within:ring-2 has-aria-invalid:ring-2 has-aria-invalid:ring-destructive/40 has-autofill:bg-foreground/4 focus-within:has-aria-invalid:ring-destructive/48 data-disabled:pointer-events-none data-disabled:opacity-64 sm:text-sm dark:has-autofill:bg-foreground/8 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="number-field-group"
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
index 9534112e4..cc5d8c37d 100644
--- a/apps/web/src/components/ui/popover.tsx
+++ b/apps/web/src/components/ui/popover.tsx
@@ -49,7 +49,7 @@ function PopoverPopup({
>
<PopoverPrimitive.Popup
className={cn(
- "dropdown-glass relative flex h-(--popup-height,auto) w-(--popup-width,auto) origin-(--transform-origin) rounded-lg text-popover-foreground outline-none transition-[width,height,scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] has-data-[slot=calendar]:rounded-xl has-data-[slot=calendar]:before:rounded-[calc(var(--radius-xl)-1px)] data-starting-style:scale-98 data-starting-style:opacity-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "dropdown-glass relative flex h-(--popup-height,auto) w-(--popup-width,auto) origin-(--transform-origin) rounded-lg text-popover-foreground outline-none transition-[width,height,scale,opacity] has-data-[slot=calendar]:rounded-xl data-starting-style:scale-98 data-starting-style:opacity-0 shadow-[0_16px_40px_-18px_rgb(0_0_0/55%)] dark:shadow-[0_18px_44px_-18px_rgb(0_0_0/80%)]",
tooltipStyle &&
"w-fit text-balance rounded-md text-xs shadow-md/5 before:rounded-[calc(var(--radius-md)-1px)]",
!tooltipStyle &&
diff --git a/apps/web/src/components/ui/radio-group.tsx b/apps/web/src/components/ui/radio-group.tsx
index 025ba7a84..c9199668d 100644
--- a/apps/web/src/components/ui/radio-group.tsx
+++ b/apps/web/src/components/ui/radio-group.tsx
@@ -19,7 +19,7 @@ function Radio({ className, ...props }: RadioPrimitive.Root.Props) {
return (
<RadioPrimitive.Root
className={cn(
- "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-full border border-input bg-background not-dark:bg-clip-padding shadow-xs/5 outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-full not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:aria-invalid:ring-destructive/24 dark:not-data-disabled:not-data-checked:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)] [[data-disabled],[data-checked],[aria-invalid]]:shadow-none",
+ "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-full border border-transparent bg-input outline-none transition-shadow focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:ring-2 aria-invalid:ring-destructive/40 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4",
className,
)}
data-slot="radio"
diff --git a/apps/web/src/components/ui/select.tsx b/apps/web/src/components/ui/select.tsx
index 46b2c8eb1..1c5e45f14 100644
--- a/apps/web/src/components/ui/select.tsx
+++ b/apps/web/src/components/ui/select.tsx
@@ -21,7 +21,7 @@ const selectTriggerVariants = cva(
variants: {
variant: {
default:
- "w-full min-w-36 border-input bg-background not-dark:bg-clip-padding text-foreground shadow-xs/5 ring-ring/24 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-data-disabled:not-focus-visible:not-aria-invalid:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 focus-visible:border-ring focus-visible:ring-[3px] aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/16 dark:bg-input/32 dark:aria-invalid:ring-destructive/24 dark:not-data-disabled:not-focus-visible:not-aria-invalid:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='text-'])]:text-icon-muted [[data-disabled],:focus-visible,[aria-invalid],[data-pressed]]:shadow-none",
+ "w-full min-w-36 border-transparent bg-secondary text-foreground ring-ring/70 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 focus-visible:ring-2 aria-invalid:ring-2 aria-invalid:ring-destructive/40 [:hover,[data-pressed]]:bg-accent/80 [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='text-'])]:text-icon-muted",
ghost:
"border-transparent text-secondary-label focus-visible:ring-2 focus-visible:ring-ring data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent [:hover,[data-pressed]]:text-foreground",
},
@@ -158,7 +158,7 @@ function SelectPopup({
)}
>
<SelectPrimitive.List
- className={cn("max-h-(--available-height) overflow-y-auto p-1", className)}
+ className={cn("max-h-(--available-height) overflow-y-auto p-1.5", className)}
data-slot="select-list"
>
{children}
@@ -187,7 +187,7 @@ function SelectItem({
return (
<SelectPrimitive.Item
className={cn(
- "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-sm px-2 py-1 text-base outline-none data-selected:bg-foreground/[0.08] data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-md px-2.5 py-1 text-base outline-none data-selected:bg-foreground/[0.08] data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7.5 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
data-slot="select-item"
diff --git a/apps/web/src/components/ui/sheet.tsx b/apps/web/src/components/ui/sheet.tsx
index 9d0436b66..ff1c9dcaa 100644
--- a/apps/web/src/components/ui/sheet.tsx
+++ b/apps/web/src/components/ui/sheet.tsx
@@ -77,7 +77,7 @@ function SheetPopup({
<SheetViewport side={side} variant={variant}>
<SheetPrimitive.Popup
className={cn(
- "relative flex max-h-full min-h-0 w-full min-w-0 flex-col bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 transition-[opacity,translate] duration-200 ease-in-out will-change-transform before:pointer-events-none before:absolute before:inset-0 before:shadow-[0_1px_--theme(--color-black/4%)] data-ending-style:opacity-0 data-starting-style:opacity-0 max-sm:before:hidden dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "relative flex max-h-full min-h-0 w-full min-w-0 flex-col bg-popover text-popover-foreground shadow-[0_24px_64px_-24px_rgb(0_0_0/65%)] transition-[opacity,translate] duration-200 ease-in-out will-change-transform data-ending-style:opacity-0 data-starting-style:opacity-0",
side === "bottom" &&
"row-start-2 border-t data-ending-style:translate-y-8 data-starting-style:translate-y-8",
side === "top" &&
diff --git a/apps/web/src/components/ui/textarea.tsx b/apps/web/src/components/ui/textarea.tsx
index 586ae8e44..7643e2b03 100644
--- a/apps/web/src/components/ui/textarea.tsx
+++ b/apps/web/src/components/ui/textarea.tsx
@@ -17,7 +17,7 @@ function Textarea({ className, size = "default", unstyled = false, ...props }: T
className={
cn(
!unstyled &&
- "relative inline-flex w-full rounded-lg border border-input bg-background not-dark:bg-clip-padding text-base text-foreground shadow-xs/5 ring-ring/24 transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] has-focus-visible:has-aria-invalid:border-destructive/64 has-focus-visible:has-aria-invalid:ring-destructive/16 has-aria-invalid:border-destructive/36 has-focus-visible:border-ring has-disabled:opacity-64 has-[:disabled,:focus-visible,[aria-invalid]]:shadow-none has-focus-visible:ring-[3px] not-has-disabled:has-not-focus-visible:not-has-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] sm:text-sm dark:bg-input/32 dark:has-aria-invalid:ring-destructive/24 dark:not-has-disabled:has-not-focus-visible:not-has-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "relative inline-flex w-full rounded-lg border border-transparent bg-secondary text-base text-foreground ring-ring/70 transition-shadow has-focus-visible:has-aria-invalid:ring-destructive/60 has-aria-invalid:ring-2 has-aria-invalid:ring-destructive/40 has-disabled:opacity-64 has-focus-visible:ring-2 sm:text-sm",
className,
) || undefined
}
diff --git a/apps/web/src/components/ui/toggle-group.test.tsx b/apps/web/src/components/ui/toggle-group.test.tsx
index c2403c9f1..85aff0a25 100644
--- a/apps/web/src/components/ui/toggle-group.test.tsx
+++ b/apps/web/src/components/ui/toggle-group.test.tsx
@@ -13,7 +13,7 @@ describe("toggle group segmented defaults", () => {
expect(html.match(/data-size="segmented"/g)).toHaveLength(2);
expect(html).toContain("h-6");
- expect(html).toContain("dark:hover:bg-input/32");
- expect(html).toContain("dark:data-pressed:bg-input/72");
+ expect(html).toContain("dark:hover:bg-accent/60");
+ expect(html).toContain("dark:data-pressed:bg-accent");
});
});
diff --git a/apps/web/src/components/ui/toggle.tsx b/apps/web/src/components/ui/toggle.tsx
index 9f74d4546..87db915ef 100644
--- a/apps/web/src/components/ui/toggle.tsx
+++ b/apps/web/src/components/ui/toggle.tsx
@@ -6,7 +6,7 @@ import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "~/lib/utils";
const toggleVariants = cva(
- "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer select-none items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-base text-foreground outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 data-pressed:bg-input/64 data-pressed:text-accent-foreground sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer select-none items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-base text-foreground outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 data-pressed:bg-accent data-pressed:text-accent-foreground sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
{
defaultVariants: {
size: "default",
@@ -27,10 +27,9 @@ const toggleVariants = cva(
default: "border-transparent",
ghost:
"border-transparent text-foreground shadow-none [:disabled,:active,[data-pressed]]:shadow-none before:shadow-none data-pressed:bg-accent data-pressed:text-accent-foreground disabled:opacity-100 disabled:text-muted-foreground disabled:[&_svg]:opacity-100",
- outline:
- "border-input bg-background not-dark:bg-clip-padding shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:data-pressed:bg-input dark:hover:bg-input/64 dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] dark:not-disabled:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/2%)] [:disabled,:active,[data-pressed]]:shadow-none",
+ outline: "border-transparent bg-secondary data-pressed:bg-accent hover:bg-accent/80",
segmented:
- "border-transparent text-muted-foreground shadow-none transition-colors before:shadow-none hover:bg-background/55 hover:text-foreground data-pressed:bg-background data-pressed:text-foreground data-pressed:shadow-xs/10 dark:hover:bg-input/32 dark:data-pressed:bg-input/72",
+ "border-transparent text-muted-foreground shadow-none transition-colors before:shadow-none hover:bg-background/55 hover:text-foreground data-pressed:bg-background data-pressed:text-foreground dark:hover:bg-accent/60 dark:data-pressed:bg-accent",
},
},
},
diff --git a/apps/web/src/components/ui/tooltip.tsx b/apps/web/src/components/ui/tooltip.tsx
index 77b15a01e..c2ce7e108 100644
--- a/apps/web/src/components/ui/tooltip.tsx
+++ b/apps/web/src/components/ui/tooltip.tsx
@@ -40,10 +40,10 @@ function TooltipPopup({
>
<TooltipPrimitive.Popup
className={cn(
- "relative flex h-(--popup-height,auto) w-(--popup-width,auto) origin-(--transform-origin) text-balance rounded-md text-popover-foreground text-xs transition-[width,height,scale,opacity] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-md)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 data-instant:duration-0 dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
+ "relative flex h-(--popup-height,auto) w-(--popup-width,auto) origin-(--transform-origin) text-balance rounded-md text-popover-foreground text-xs transition-[width,height,scale,opacity] data-ending-style:scale-98 data-starting-style:scale-98 data-ending-style:opacity-0 data-starting-style:opacity-0 data-instant:duration-0",
variant === "glass"
- ? "dropdown-glass shadow-xl shadow-black/25 before:hidden"
- : "border bg-popover not-dark:bg-clip-padding shadow-md/5",
+ ? "dropdown-glass shadow-xl shadow-black/25"
+ : "dropdown-glass shadow-md/40",
className,
)}
data-slot="tooltip-popup"
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 98f83e5ef..e790ca1db 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -342,6 +342,25 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
border: 1px solid color-mix(in srgb, var(--contrast-foreground) 10%, transparent);
}
+/* Akeru Noir popovers read as elevated panels, Linear-style: a surface one
+ step above the canvas, a whisper of light at the edge, and rounder corners
+ than the classic chassis. */
+html[data-theme-id="akeru-noir"] :is([data-slot] .dropdown-glass, .dropdown-glass) {
+ background: var(--popover);
+ border-color: color-mix(in srgb, var(--contrast-foreground) 7%, transparent);
+ border-radius: 0.75rem;
+}
+
+/* Noir dialogs are solid elevated panels: the surface itself carries the
+ elevation, so the edge light and inset highlight go away. */
+html[data-theme-id="akeru-noir"] .dialog-glass {
+ background: var(--card);
+ border-color: color-mix(in srgb, var(--contrast-foreground) 6%, transparent);
+ box-shadow: 0 32px 80px -24px rgb(0 0 0 / 80%);
+ backdrop-filter: none;
+ -webkit-backdrop-filter: none;
+}
+
@utility topbar-scroll-fade {
--topbar-scroll-fade-height: 2.5rem;
-webkit-mask-image:
@@ -559,6 +578,15 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
}
}
+/* Akeru Noir is a chassis, not just a palette: fully rounded pill controls
+ and rounder cards on neutral near-black surfaces. Scoped to the theme id
+ so the classic geometry stays untouched for every other theme. Lives
+ outside @layer so it wins over the unlayered :root defaults. */
+html[data-theme-id="akeru-noir"] {
+ --control-radius: 999px;
+ --radius: 0.875rem;
+}
+
@layer components {
/* Each maintainer palette gives the same line art its own material: rose
vellum, forest drafting paper, marine cyanotype, copper, and violet ink.
diff --git a/apps/web/src/themePalette.test.ts b/apps/web/src/themePalette.test.ts
index 33f3fa1f9..ba0ec9fae 100644
--- a/apps/web/src/themePalette.test.ts
+++ b/apps/web/src/themePalette.test.ts
@@ -527,17 +527,48 @@ describe("theme files", () => {
expect(themeAllowsSidebarArtwork("my-custom-theme")).toBe(false);
});
- it("reserves the Akeru Paper id for the built-in theme", () => {
- expect(isKnownThemePreference(AKERU_PAPER_THEME.id)).toBe(true);
+ it.each(BUILT_IN_THEME_IDS)("reserves %s for the built-in theme", (id) => {
+ expect(isKnownThemePreference(id)).toBe(true);
expect(() =>
parseThemeFile({
version: THEME_FILE_VERSION,
- id: AKERU_PAPER_THEME.id,
- name: "Akeru Paper copy",
+ id,
+ name: "Built-in theme copy",
appearance: "light",
colors: {},
}),
- ).toThrow('The theme id "akeru-paper" is reserved.');
+ ).toThrow(`The theme id "${id}" is reserved.`);
+ });
+
+ it("filters persisted built-in ID collisions without deleting stored palettes", () => {
+ const customTheme = {
+ id: "my-custom-theme",
+ label: "My custom theme",
+ appearance: "light",
+ colors: { canvas: "#f8fbff" },
+ };
+ const storedThemes = JSON.stringify([
+ ...BUILT_IN_THEME_IDS.map((id) => ({ ...customTheme, id })),
+ customTheme,
+ ]);
+ const setItem = vi.fn();
+ vi.stubGlobal("window", {
+ localStorage: {
+ getItem: (key: string) => (key === CUSTOM_THEMES_STORAGE_KEY ? storedThemes : null),
+ setItem,
+ },
+ });
+ invalidateCustomThemes();
+ try {
+ expect(getCustomThemes().map((theme) => theme.id)).toEqual([customTheme.id]);
+ for (const theme of BUILT_IN_THEMES) {
+ expect(getThemeDefinition(theme.id)).toEqual(theme);
+ }
+ expect(setItem).not.toHaveBeenCalled();
+ } finally {
+ invalidateCustomThemes();
+ vi.unstubAllGlobals();
+ }
});
it("rejects a variant that repeats the base appearance", () => {
diff --git a/apps/web/src/themePalette.ts b/apps/web/src/themePalette.ts
index 9e82d68a7..c4e49a93e 100644
--- a/apps/web/src/themePalette.ts
+++ b/apps/web/src/themePalette.ts
@@ -3,6 +3,7 @@ import "culori/css";
import { converter, parse } from "culori/fn";
import {
AKERU_PAPER_THEME,
+ BUILT_IN_THEME_IDS,
BUILT_IN_THEMES,
EMBER_THEME,
GROVE_THEME,
@@ -72,12 +73,7 @@ const RESERVED_THEME_IDS = new Set([
"system",
"light",
"dark",
- AKERU_PAPER_THEME_ID,
- T3_CHAT_THEME_ID,
- GROVE_THEME_ID,
- OCEAN_THEME_ID,
- EMBER_THEME_ID,
- IRIS_THEME_ID,
+ ...BUILT_IN_THEME_IDS,
LEGACY_T3_CHAT_DARK_THEME_ID,
"t3-grove",
"t3-ocean",
diff --git a/packages/shared/src/themePalettes.ts b/packages/shared/src/themePalettes.ts
index fa7e3b093..bddb97ffb 100644
--- a/packages/shared/src/themePalettes.ts
+++ b/packages/shared/src/themePalettes.ts
@@ -1,4 +1,5 @@
export const BUILT_IN_THEME_IDS = [
+ "akeru-noir",
"akeru-paper",
"t3-chat",
"grove",
@@ -860,7 +861,137 @@ export const AKERU_PAPER_THEME: ThemeDefinition = {
},
};
+/**
+ * The Grok Bot-inspired flagship chassis: neutral near-black surfaces with
+ * pill-shaped controls and the Akeru purple reserved for actions and focus.
+ */
+export const AKERU_NOIR_THEME: ThemeDefinition = {
+ id: "akeru-noir",
+ label: "Akeru Noir",
+ appearance: "light",
+ colors: {
+ canvas: "oklch(0.99 0.001 286.375)",
+ chrome: "oklch(0.975 0.0015 286.375)",
+ toolbar: "oklch(0.99 0.001 286.375)",
+ toolbarForeground: "oklch(0.21 0.006 285.885)",
+ toolbarBorder: "oklch(0.92 0.003 286.32)",
+ toolbarControl: "oklch(1 0 0)",
+ toolbarControlForeground: "oklch(0.21 0.006 285.885)",
+ toolbarControlHover: "oklch(0.945 0.003 286.32)",
+ surface: "oklch(0.985 0.0012 286.375)",
+ surfaceRaised: "oklch(1 0 0)",
+ surfaceOverlay: "oklch(1 0 0)",
+ text: "oklch(0.21 0.006 285.885)",
+ textMuted: "oklch(0.55 0.012 285.938)",
+ border: "oklch(0.92 0.004 286.32)",
+ input: "oklch(0.87 0.005 286.32)",
+ focus: "oklch(0.607447 0.134946 296.512)",
+ accent: "oklch(0.607447 0.134946 296.512)",
+ accentForeground: "oklch(0.139671 0.024718 296.562)",
+ secondary: "oklch(0.945 0.003 286.32)",
+ secondaryForeground: "oklch(0.21 0.006 285.885)",
+ muted: "oklch(0.955 0.0025 286.32)",
+ mutedForeground: "oklch(0.5 0.012 285.938)",
+ placeholder: "oklch(0.55 0.012 285.938)",
+ secondaryLabel: "oklch(0.5 0.012 285.938)",
+ iconMuted: "oklch(0.52 0.012 285.938)",
+ error: "oklch(0.542323 0.154141 26.861)",
+ errorForeground: "oklch(0.443931 0.131056 26.805)",
+ errorSurface: "oklch(0.931623 0.019109 29.549)",
+ warning: "oklch(0.566615 0.126823 65.303)",
+ warningForeground: "oklch(0.442827 0.097381 67.7)",
+ warningSurface: "oklch(0.943016 0.035404 85.408)",
+ update: "oklch(0.607447 0.134946 296.512)",
+ updateForeground: "oklch(0.449304 0.145439 295.863)",
+ updateSurface: "oklch(0.940347 0.022271 302.929)",
+ accentSurface: "oklch(0.945 0.003 286.32)",
+ accentSurfaceForeground: "oklch(0.21 0.006 285.885)",
+ messageSurface: "oklch(0.94 0.004 286.32)",
+ messageForeground: "oklch(0.21 0.006 285.885)",
+ messageAction: "oklch(0.607447 0.134946 296.512)",
+ messageActionForeground: "oklch(0.139671 0.024718 296.562)",
+ messageActionHover: "oklch(0.656453 0.13742 297.344)",
+ codeBackground: "oklch(0.965 0.002 286.32)",
+ codeForeground: "oklch(0.21 0.006 285.885)",
+ sidebar: "oklch(0.975 0.0015 286.375)",
+ sidebarForeground: "oklch(0.21 0.006 285.885)",
+ sidebarMutedForeground: "oklch(0.5 0.012 285.938)",
+ sidebarControlSurface: "oklch(0.95 0.003 286.32)",
+ sidebarRowHover: "oklch(0.95 0.003 286.32)",
+ sidebarRowActive: "oklch(1 0 0)",
+ sidebarRowSelected: "oklch(1 0 0)",
+ sidebarBorder: "oklch(0.92 0.003 286.32)",
+ terminalBackground: "oklch(0.99 0.001 286.375)",
+ terminalForeground: "oklch(0.21 0.006 285.885)",
+ terminalCursor: "oklch(0.607447 0.134946 296.512)",
+ terminalSelection: "oklch(0.912658 0.033973 304.531)",
+ terminalScrollbar: "oklch(0.83 0.004 286.32)",
+ terminalScrollbarHover: "oklch(0.75 0.005 286.32)",
+ },
+ variants: {
+ dark: {
+ canvas: "oklch(0.105 0 0)",
+ chrome: "oklch(0.135 0 0)",
+ toolbar: "oklch(0.105 0 0)",
+ toolbarForeground: "oklch(0.97 0.0013 286.375)",
+ toolbarBorder: "oklch(0.225 0 0)",
+ toolbarControl: "oklch(0.19 0 0)",
+ toolbarControlForeground: "oklch(0.97 0.0013 286.375)",
+ toolbarControlHover: "oklch(0.24 0 0)",
+ surface: "oklch(0.16 0 0)",
+ surfaceRaised: "oklch(0.225 0 0)",
+ surfaceOverlay: "oklch(0.175 0 0)",
+ text: "oklch(0.97 0.0013 286.375)",
+ textMuted: "oklch(0.594 0.008 286.067)",
+ border: "oklch(0.235 0 0)",
+ input: "oklch(0.3 0 0)",
+ focus: "oklch(0.607447 0.134946 296.512)",
+ accent: "oklch(0.607447 0.134946 296.512)",
+ accentForeground: "oklch(0.14 0.0247 296.562)",
+ secondary: "oklch(0.225 0 0)",
+ secondaryForeground: "oklch(0.97 0.0013 286.375)",
+ muted: "oklch(0.19 0 0)",
+ mutedForeground: "oklch(0.68 0.008 286.067)",
+ placeholder: "oklch(0.63 0.008 286.067)",
+ secondaryLabel: "oklch(0.68 0.008 286.067)",
+ iconMuted: "oklch(0.65 0.008 286.067)",
+ error: "oklch(0.665241 0.148078 26.77)",
+ errorForeground: "oklch(0.772758 0.103326 25.58)",
+ errorSurface: "oklch(0.289862 0.032452 25.297)",
+ warning: "oklch(0.758152 0.10943 78.772)",
+ warningForeground: "oklch(0.855925 0.082896 82.001)",
+ warningSurface: "oklch(0.309837 0.024833 79.663)",
+ update: "oklch(0.607447 0.134946 296.512)",
+ updateForeground: "oklch(0.80327 0.077482 299.92)",
+ updateSurface: "oklch(0.269917 0.050751 301.875)",
+ accentSurface: "oklch(0.235 0 0)",
+ accentSurfaceForeground: "oklch(0.97 0.0013 286.375)",
+ messageSurface: "oklch(0.25 0 0)",
+ messageForeground: "oklch(0.97 0.0013 286.375)",
+ messageAction: "oklch(0.607447 0.134946 296.512)",
+ messageActionForeground: "oklch(0.139671 0.024718 296.562)",
+ messageActionHover: "oklch(0.656453 0.13742 297.344)",
+ codeBackground: "oklch(0.145 0 0)",
+ codeForeground: "oklch(0.97 0.0013 286.375)",
+ sidebar: "oklch(0.135 0 0)",
+ sidebarForeground: "oklch(0.97 0.0013 286.375)",
+ sidebarMutedForeground: "oklch(0.7 0.008 286.067)",
+ sidebarControlSurface: "oklch(0.185 0 0)",
+ sidebarRowHover: "oklch(0.185 0 0)",
+ sidebarRowActive: "oklch(0.215 0 0)",
+ sidebarRowSelected: "oklch(0.235 0 0)",
+ sidebarBorder: "oklch(0.215 0 0)",
+ terminalBackground: "oklch(0.105 0 0)",
+ terminalForeground: "oklch(0.97 0.0013 286.375)",
+ terminalCursor: "oklch(0.607447 0.134946 296.512)",
+ terminalSelection: "oklch(0.358238 0.073841 303.758)",
+ terminalScrollbar: "oklch(0.27 0 0)",
+ terminalScrollbarHover: "oklch(0.4 0 0)",
+ },
+ },
+};
export const BUILT_IN_THEMES: ReadonlyArray<ThemeDefinition> = [
+ AKERU_NOIR_THEME,
AKERU_PAPER_THEME,
T3_CHAT_THEME,
GROVE_THEME,