Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chg(ui): refactor button variants and unify badge/pill styling (#5938)
Seamus6e6dbf77ce13
diff --git a/apps/web/src/components/app/FatalError.tsx b/apps/web/src/components/app/FatalError.tsxindex b9f06b101c..25c926a676 100644--- a/apps/web/src/components/app/FatalError.tsx+++ b/apps/web/src/components/app/FatalError.tsx@@ -41,14 +41,14 @@ export function FatalError(props: FatalErrorProps) {<div class="flex flex-row gap-3 justify-center"><Button- variant="active"+ variant="accent"onClick={() => {window.location.href = window.location.origin + '/app';}}><HomeIcon class="size-4" /> Home</Button>- <Button variant="base" onClick={props.reset}>+ <Button variant="outline" onClick={props.reset}><ResetIcon class="size-4" /> Try Again</Button></div>diff --git a/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsx b/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsxindex d5dd9d1358..0aee1203c3 100644--- a/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsx+++ b/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsx@@ -148,7 +148,7 @@ function EventSummary(props: {<XIcon class="size-4" /></Button><Button- variant="base"+ variant="outline"size="sm"depth={4}class="rounded-lg bg-surface px-2"diff --git a/apps/web/src/components/app/mobile/ConfirmDrawer.tsx b/apps/web/src/components/app/mobile/ConfirmDrawer.tsxindex 7d034b567c..0e92128966 100644--- a/apps/web/src/components/app/mobile/ConfirmDrawer.tsx+++ b/apps/web/src/components/app/mobile/ConfirmDrawer.tsx@@ -3,7 +3,7 @@ import { createSignal, Show } from 'solid-js';import { MobileDrawer } from './MobileDrawer';const TONE_VARIANT = {- default: 'active',+ default: 'accent',danger: 'danger',success: 'success',} as const;@@ -64,7 +64,7 @@ export function ConfirmDrawer(props: ConfirmDialogProps) {<MobileDrawer.Closeas={Button}type="button"- variant="base"+ variant="ghost"size="lg"class="w-full rounded-lg">diff --git a/apps/web/src/components/app/side-panel/SidePanel.tsx b/apps/web/src/components/app/side-panel/SidePanel.tsxindex d38323d996..c49e44583b 100644--- a/apps/web/src/components/app/side-panel/SidePanel.tsx+++ b/apps/web/src/components/app/side-panel/SidePanel.tsx@@ -256,7 +256,7 @@ function SidePanelHeaderToggle() {const ToggleButton = () => (<Buttondepth={2}- variant="base"+ variant="outline"size="icon-sm"class={cn(!isTouchDevice() && 'bg-surface',diff --git a/apps/web/src/components/app/split-layout/components/PreviewButton.tsx b/apps/web/src/components/app/split-layout/components/PreviewButton.tsxindex 0f90bc731a..35b4c3077a 100644--- a/apps/web/src/components/app/split-layout/components/PreviewButton.tsx+++ b/apps/web/src/components/app/split-layout/components/PreviewButton.tsx@@ -64,7 +64,7 @@ export function PreviewButton(><ButtononClick={togglePreview}- variant="base"+ variant="outline"size="sm"depth={2}class="bg-surface"diff --git a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx b/apps/web/src/components/app/split-layout/components/SplitHeader.tsxindex 32e4b9fbc9..bd29c6a67d 100644--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx@@ -94,6 +94,8 @@ function SplitBackButton() {if (!context) return null;return (<Button+ square+ size="sm"class="p-1 rounded-lg touch:active:bg-transparent"label="Go Back"hotkey={TOKENS.split.go.back}@@ -103,7 +105,7 @@ function SplitBackButton() {context.handle.goBack();}}>- <CaretLeft class="h-4" />+ <CaretLeft /></Button>);}@@ -113,13 +115,15 @@ function SplitForwardButton() {if (!context) return '';return (<Button+ square+ size="sm"+ class="p-1 rounded-lg touch:active:bg-transparent"label="Go Forward"hotkey={TOKENS.split.go.forward}disabled={!context.handle.canGoForward()}onClick={context.handle.goForward}- class={cn('p-1 rounded-lg')}>- <CaretRight class="h-4" />+ <CaretRight /></Button>);}@@ -145,7 +149,9 @@ function SidebarExpandButton() {aria-hidden={!visible()}><Button- class="p-1 rounded-lg"+ class="rounded-lg"+ square+ size="sm"label="Expand Sidebar"hotkey={TOKENS.global.toggleSidebar}disabled={!visible()}@@ -215,12 +221,14 @@ function SplitCloseButton() {return (<Show when={hasMultipleSplits() && !isPreviewViewer()}><Button- class="p-1 rounded-lg"+ square+ size="sm"+ class="rounded-lg"label={label()}hotkey={TOKENS.split.close}onClick={context.handle.close}>- <CloseIcon class="size-4" />+ <CloseIcon /></Button></Show>);diff --git a/apps/web/src/components/ui/components/Badge.test.tsx b/apps/web/src/components/ui/components/Badge.test.tsxnew file mode 100644index 0000000000..5342540b83--- /dev/null+++ b/apps/web/src/components/ui/components/Badge.test.tsx@@ -0,0 +1,80 @@+import { cleanup, render, screen } from '@solidjs/testing-library';+import { afterEach, describe, expect, it } from 'vitest';+import { Badge, badgeClasses, badgeTriggerClasses } from './Badge';+import { buttonClasses } from './Button';++describe('badgeClasses', () => {+ it('provides ghost and outline variants', () => {+ expect(badgeClasses({ variant: 'ghost' })).toContain('bg-transparent');+ expect(badgeClasses({ variant: 'outline' })).toContain('border-edge-muted');+ });++ it.each(['sm', 'md', 'lg'] as const)(+ 'mirrors the %s Button size classes',+ (size) => {+ const badge = badgeClasses({ size }).split(' ');+ const button = buttonClasses({ size, noTouchResize: true }).split(' ');++ for (const sizeClass of badge) {+ if (+ sizeClass.startsWith('h-') ||+ sizeClass.startsWith('px-') ||+ sizeClass.startsWith('gap-') ||+ sizeClass.startsWith('text-') ||+ sizeClass.startsWith('[&>svg')+ ) {+ expect(button).toContain(sizeClass);+ }+ }+ }+ );++ it('merges caller overrides without allowing a non-pill shape', () => {+ const classes = badgeClasses({ size: 'md', class: 'h-5 rounded-md' });++ expect(classes).toContain('h-5');+ expect(classes).not.toContain('h-8');+ expect(classes).toContain('rounded-full');+ expect(classes).not.toContain('rounded-md');+ });++ it.each(['sm', 'md', 'lg'] as const)('is rounded-full at size %s', (size) => {+ expect(badgeClasses({ size })).toContain('rounded-full');+ });+});++describe('Badge', () => {+ afterEach(cleanup);++ it('renders a span with resolved variant and size metadata', () => {+ render(() => (+ <Badge variant="outline" size="sm" title="Status">+ Ready+ </Badge>+ ));++ const badge = screen.getByText('Ready');+ expect(badge.tagName).toBe('SPAN');+ expect(badge.getAttribute('title')).toBe('Status');+ expect(badge.dataset.slot).toBe('badge');+ expect(badge.dataset.variant).toBe('outline');+ expect(badge.dataset.size).toBe('sm');+ });+});++describe('badgeTriggerClasses', () => {+ it('adds Button interaction states without changing the pill shape', () => {+ const passive = badgeClasses({ variant: 'outline', size: 'sm' });+ const interactive = badgeTriggerClasses({+ variant: 'outline',+ size: 'sm',+ });++ expect(passive).not.toContain('not-disabled:hover:bg-hover');+ expect(interactive).toContain('not-disabled:hover:bg-hover');+ expect(interactive).toContain('not-disabled:active:bg-active');+ expect(interactive).toContain('focus-visible:ring-2');+ expect(interactive).toContain('rounded-full');+ expect(interactive).toContain('h-6');+ });+});diff --git a/apps/web/src/components/ui/components/Badge.tsx b/apps/web/src/components/ui/components/Badge.tsxnew file mode 100644index 0000000000..dac9f5f035--- /dev/null+++ b/apps/web/src/components/ui/components/Badge.tsx@@ -0,0 +1,78 @@+import { type ComponentProps, splitProps } from 'solid-js';+import { cn } from '../utils/classname';+import { CONTROL_SIZE_VARIANTS } from '../utils/controlSizes';+import { createVariants, type VariantProps } from '../utils/variants';+import { buttonClasses } from './Button';++/** Canonical variant classes for badges and badge-like elements. */+export const badgeVariants = createVariants(+ cn(+ 'inline-flex shrink-0 items-center justify-center whitespace-nowrap',+ 'rounded-full border border-transparent font-medium',+ '[&_svg]:pointer-events-none [&_svg]:shrink-0'+ ),+ {+ variant: {+ ghost: 'bg-transparent text-ink-muted',+ outline: 'bg-transparent text-ink-muted border-edge-muted',+ },+ size: CONTROL_SIZE_VARIANTS,+ },+ {+ variant: 'ghost',+ size: 'md',+ }+);++/** Variant props inferred from the canonical badge variant definition. */+export type BadgeVariantProps = VariantProps<typeof badgeVariants>;+export type BadgeVariant = NonNullable<BadgeVariantProps['variant']>;+export type BadgeSize = NonNullable<BadgeVariantProps['size']>;++export type BadgeClassOptions = BadgeVariantProps & {+ class?: string;+};++export type BadgeProps = ComponentProps<'span'> & BadgeVariantProps;++/** Returns the canonical classes for a badge-like element. */+export function badgeClasses(options: BadgeClassOptions = {}): string {+ const { variant, size, class: className } = options;+ return cn(badgeVariants({ variant, size }), className, 'rounded-full');+}++/** Returns Button interaction styles with Badge variants, sizes, and shape. */+export function badgeTriggerClasses(options: BadgeClassOptions = {}): string {+ const { variant = 'ghost', size = 'md', class: className } = options;+ return cn(+ buttonClasses({+ variant,+ size,+ noTouchResize: true,+ class: className,+ }),+ 'focus-visible:ring-2 focus-visible:ring-accent/20',+ 'rounded-full'+ );+}++/** A non-interactive label with Button-aligned sizing. */+export function Badge(props: BadgeProps) {+ const [local, others] = splitProps(props, ['variant', 'size', 'class']);+ const variant = () => local.variant ?? 'ghost';+ const size = () => local.size ?? 'md';++ return (+ <span+ data-slot="badge"+ data-variant={variant()}+ data-size={size()}+ class={badgeClasses({+ variant: variant(),+ size: size(),+ class: local.class,+ })}+ {...others}+ />+ );+}diff --git a/apps/web/src/components/ui/components/Button.test.tsx b/apps/web/src/components/ui/components/Button.test.tsxnew file mode 100644index 0000000000..46018c2294--- /dev/null+++ b/apps/web/src/components/ui/components/Button.test.tsx@@ -0,0 +1,146 @@+import { cleanup, render, screen } from '@solidjs/testing-library';+import { afterEach, describe, expect, it } from 'vitest';+import { Button, buttonClasses, buttonVariants } from './Button';+import { ButtonGroup } from './ButtonGroup';++describe('buttonClasses', () => {+ it('exposes the underlying variant helper', () => {+ const classes = buttonVariants({ variant: 'outline', size: 'sm' });++ expect(classes).toContain('border-edge-muted');+ expect(classes).toContain('h-6');+ });++ it('returns reusable variant and size classes with caller overrides', () => {+ const classes = buttonClasses({+ variant: 'outline',+ size: 'icon-sm',+ noTouchResize: true,+ class: 'size-8 rounded-full',+ });++ expect(classes).toContain('border-edge-muted');+ expect(classes).toContain('size-8');+ expect(classes).not.toContain('size-6');+ expect(classes).toContain('rounded-full');+ expect(classes).not.toContain('touch:min-h-9');+ });++ it('includes the complete CTA contrast treatment', () => {+ const classes = buttonClasses({ variant: 'cta' });++ expect(classes).toContain('text-accent-contrast');+ expect(classes).toContain(+ '[--color-edge:var(--color-accent-contrast-muted)]'+ );+ });++ it('includes the inverted strong treatment', () => {+ const classes = buttonClasses({ variant: 'strong' });++ expect(classes).toContain('bg-ink');+ expect(classes).toContain('text-surface-4');+ expect(classes).toContain('focus-visible:ring-surface-4/70');+ });++ it.each([+ ['sm', 'h-6', 'px-2', 'text-xs', 'size-3'],+ ['md', 'h-8', 'px-2', 'text-sm', 'size-3.5'],+ ['lg', 'h-9', 'px-3', 'text-base', 'size-[1em]'],+ ] as const)(+ 'gives %s buttons the intended height, padding, text size, and icon size',+ (size, heightClass, paddingClass, textClass, iconClass) => {+ const classes = buttonClasses({ size });++ expect(classes).toContain(heightClass);+ expect(classes).toContain(paddingClass);+ expect(classes).toContain(textClass);+ expect(classes).toContain(`[&>svg:not([class*='size-'])]:${iconClass}`);+ expect(classes).not.toContain('aspect-square');+ expect(classes).not.toContain('p-0');+ }+ );++ it('applies icon-only geometry explicitly without changing the size', () => {+ const classes = buttonClasses({ size: 'md', square: true });++ expect(classes).toContain('h-8');+ expect(classes).toContain('aspect-square');+ expect(classes).toContain('p-0');+ expect(classes).not.toContain('px-2');+ });++ it('keeps large-button horizontal padding restrained', () => {+ const classes = buttonClasses({ size: 'lg' });++ expect(classes).toContain('px-3');+ expect(classes).not.toContain('px-6');+ });+});++describe('Button', () => {+ afterEach(cleanup);++ it('uses label as its accessible name and default tooltip content', () => {+ render(() => (+ <Button size="icon-sm" label="Close">+ <svg aria-hidden="true" />+ </Button>+ ));++ expect(screen.getByRole('button', { name: 'Close' })).toBeTruthy();+ });++ it('uses an icon button tooltip as an accessible-name fallback', () => {+ render(() => (+ <Button size="icon-sm" tooltip="Search">+ <svg aria-hidden="true" />+ </Button>+ ));++ expect(screen.getByRole('button', { name: 'Search' })).toBeTruthy();+ });++ it('uses a square button tooltip as an accessible-name fallback', () => {+ render(() => (+ <Button size="sm" square tooltip="Search">+ <svg aria-hidden="true" />+ </Button>+ ));++ expect(screen.getByRole('button', { name: 'Search' })).toBeTruthy();+ });++ it('does not replace visible text with tooltip content', () => {+ render(() => <Button tooltip="Save the current draft">Save</Button>);++ expect(screen.getByRole('button', { name: 'Save' })).toBeTruthy();+ });++ it('does not leak custom props and preserves CTA inline styles', () => {+ render(() => (+ <Button variant="cta" noTouchResize style={{ color: 'rgb(1, 2, 3)' }}>+ Continue+ </Button>+ ));++ const button = screen.getByRole('button', { name: 'Continue' });+ expect(button.hasAttribute('notouchresize')).toBe(false);+ expect(button.style.color).toBe('rgb(1, 2, 3)');+ });++ it('exposes its resolved variant and size as data attributes', () => {+ render(() => (+ <ButtonGroup variant="accent" size="icon-xs">+ <Button label="Pinned">+ <svg aria-hidden="true" />+ </Button>+ </ButtonGroup>+ ));++ const button = screen.getByRole('button', { name: 'Pinned' });+ expect(button.dataset.slot).toBe('button');+ expect(button.dataset.variant).toBe('accent');+ expect(button.dataset.size).toBe('icon-xs');+ });+});diff --git a/apps/web/src/components/ui/components/Button.tsx b/apps/web/src/components/ui/components/Button.tsxindex 2f2bf6d51e..f2e5e77954 100644--- a/apps/web/src/components/ui/components/Button.tsx+++ b/apps/web/src/components/ui/components/Button.tsx@@ -4,13 +4,79 @@ import {type ButtonRootProps,Button as KobalteButton,} from '@kobalte/core/button';-import { themeReactive } from '@theme/signals/themeReactive';import { type ComponentProps, type JSX, Show, splitProps } from 'solid-js';import { cn } from '../utils/classname';+import { CONTROL_SIZE_VARIANTS } from '../utils/controlSizes';+import { createVariants, type VariantProps } from '../utils/variants';import { useButtonGroupContext } from './ButtonGroup';import { Layer } from './Layer';import { Tooltip } from './Tooltip';+const BUTTON_TOUCH_STYLES =+ "touch:min-h-9 touch:min-w-9 touch:[&>svg:not([class*='size-'])]:size-6";++// Hover/press feedback is painted as a translucent scrim *on top of* each+// variant's base background-color (via the `overlay-*` background-image utility)+// rather than replacing/thinning the base color, so buttons keep their full+// color on hover. The `cta`/`contrast` variants use a surface scrim so their+// solid backgrounds lighten toward the text color instead of washing out.+/** Canonical variant classes for buttons and button-like elements. */+export const buttonVariants = createVariants(+ cn(+ 'relative inline-flex shrink-0 items-center justify-center whitespace-nowrap text-sm',+ 'rounded-md border border-transparent font-medium outline-none select-none transition-colors',+ 'data-disabled:cursor-not-allowed data-disabled:opacity-30',+ '[&_svg]:pointer-events-none [&_svg]:shrink-0'+ ),+ {+ variant: {+ danger:+ 'bg-failure-bg text-failure dark:bg-failure-bg not-disabled:hover:bg-failure/25 not-disabled:active:bg-failure/30',+ outline:+ 'bg-transparent text-ink-muted border-edge-muted not-disabled:hover:bg-hover not-disabled:hover:text-ink not-disabled:active:bg-active',+ accent: 'bg-accent-bg not-disabled:hover:overlay-accent-bg text-accent',+ success:+ 'bg-success-bg not-disabled:hover:overlay-success-bg text-success',+ ghost:+ 'bg-transparent text-ink-muted not-disabled:hover:overlay-hover not-disabled:hover:text-ink not-disabled:active:overlay-active',+ strong:+ 'bg-ink text-surface-4 focus-visible:ring-surface-4/70 not-disabled:hover:overlay-[color-mix(in_oklch,var(--color-surface-4)_12%,transparent)] not-disabled:active:overlay-[color-mix(in_oklch,var(--color-surface-4)_22%,transparent)]',+ cta: 'bg-accent text-accent-contrast focus-visible:ring-accent-contrast/70 [--color-edge:var(--color-accent-contrast-muted)] [--color-edge-muted:var(--color-accent-contrast-muted)] not-disabled:hover:overlay-[color-mix(in_oklch,var(--color-surface)_12%,transparent)] not-disabled:active:overlay-[color-mix(in_oklch,var(--color-surface)_22%,transparent)]',+ },+ size: {+ xs: "h-5 gap-1 px-1 text-xs [&>svg:not([class*='size-'])]:size-3",+ 'icon-xs': "size-5 p-0.5 [&>svg:not([class*='size-'])]:size-4",+ sm: CONTROL_SIZE_VARIANTS.sm,+ md: CONTROL_SIZE_VARIANTS.md,+ lg: `${CONTROL_SIZE_VARIANTS.lg} rounded-lg`,+ 'icon-lg':+ "size-11 aspect-square p-2 [&>svg:not([class*='size-'])]:size-7",+ 'icon-md':+ "size-9 aspect-square p-1.5 [&>svg:not([class*='size-'])]:size-6",+ 'icon-sm':+ "size-6 aspect-square p-0.5 [&>svg:not([class*='size-'])]:size-5",+ },+ },+ {+ variant: 'ghost',+ size: 'md',+ }+);++/** Variant props inferred from the canonical button variant definition. */+export type ButtonVariantProps = VariantProps<typeof buttonVariants>;+export type ButtonVariant = NonNullable<ButtonVariantProps['variant']>;+export type ButtonSize = NonNullable<ButtonVariantProps['size']>;++export type ButtonClassOptions = {+ variant?: ButtonVariant;+ size?: ButtonSize;+ fullWidth?: boolean;+ noTouchResize?: boolean;+ square?: boolean;+ class?: string;+};+export type ButtonProps = ButtonRootProps<'button'> &ComponentProps<'button'> & {depth?: 0 | 1 | 2 | 3 | 4;@@ -22,10 +88,19 @@ export type ButtonProps = ButtonRootProps<'button'> &*/fullWidth?: boolean;noTouchResize?: boolean;+ square?: boolean;variant?: ButtonVariant;children?: JSX.Element;- tooltip?: string;+ /**+ * Accessible name for the button. Also used as the tooltip unless+ * `tooltip` provides different content.+ */label?: string;+ /**+ * Tooltip content. For icon buttons, this is also used as a backwards-+ * compatible accessible-name fallback when no label is provided.+ */+ tooltip?: string;hotkey?: HotkeyToken | HotkeyToken[];/*** Raw shortcut string(s) shown in the tooltip when no `hotkey` token is available.@@ -36,56 +111,29 @@ export type ButtonProps = ButtonRootProps<'button'> &tooltipDisabled?: boolean;};-export type ButtonSize =- | 'xs'- | 'icon-xs'- | 'sm'- | 'icon-sm'- | 'md'- | 'icon-md'- | 'lg'- | 'icon-lg';--export type ButtonVariant =- | 'ghost'- | 'base'- | 'active'- | 'success'- | 'danger'- | 'contrast'- | 'cta';+/** Returns the canonical classes for a button-like element. */+export function buttonClasses(options: ButtonClassOptions = {}): string {+ const {+ variant,+ size,+ fullWidth = false,+ noTouchResize = false,+ square = false,+ class: className,+ } = options;-// Hover/press feedback is painted as a translucent scrim *on top of* each-// variant's base background-color (via the `overlay-*` background-image utility)-// rather than replacing/thinning the base color, so buttons keep their full-// color on hover. The `cta`/`contrast` variants use a surface scrim so their-// solid backgrounds lighten toward the text color instead of washing out.-const variantStyles: Record<ButtonVariant, string> = {- danger:- 'bg-failure/10 text-failure dark:bg-failure/15 focus-visible:bg-failure/25 focus-visible:border focus-visible:border-failure/50 not-disabled:hover:bg-failure/25 not-disabled:active:bg-failure/30 disabled:opacity-30 ',- base: 'bg-transparent text-ink-muted border border-edge-muted not-disabled:hover:bg-hover not-disabled:hover:text-ink active:bg-active disabled:opacity-30 ',- active:- 'bg-accent-bg not-disabled:hover:overlay-accent-bg text-accent disabled:opacity-30 ',- success:- 'bg-success-bg not-disabled:hover:overlay-success-bg text-success disabled:opacity-30 ',- ghost:- 'bg-transparent text-ink-muted not-disabled:hover:overlay-hover not-disabled:hover:text-ink active:overlay-active disabled:opacity-30 ',- contrast:- 'bg-ink text-surface border border-transparent not-disabled:hover:overlay-[color-mix(in_oklch,var(--color-surface)_12%,transparent)] active:overlay-[color-mix(in_oklch,var(--color-surface)_22%,transparent)] disabled:opacity-30 focus-visible:bg-ink/90',- cta: 'bg-accent text-surface border border-transparent not-disabled:hover:overlay-[color-mix(in_oklch,var(--color-surface)_12%,transparent)] active:overlay-[color-mix(in_oklch,var(--color-surface)_22%,transparent)] disabled:opacity-30 focus-visible:bg-accent/90',-};+ return cn(+ buttonVariants({ variant, size }),+ fullWidth && 'w-full',+ !noTouchResize && BUTTON_TOUCH_STYLES,+ square && 'aspect-square p-0',+ className+ );+}-const sizeStyles: Record<ButtonSize, string> = {- xs: ' p-1 [&_:where(svg)]:size-3 gap-1 text-xs',- 'icon-xs': 'size-5 p-0.5 [&_:where(svg)]:size-4 ',- lg: ' p-2.5 [&_:where(svg)]:size-5 gap-2 text-base',- md: ' p-2 gap-1.5 text-sm ' /* scuffed */,- sm: 'h-6 px-2 [&_:where(svg)]:size-4 gap-1 text-xs ',- 'icon-lg':- 'size-11 p-2 [&_:where(svg)]:size-7 ' /* unused */,- 'icon-md': 'size-9 p-1.5 [&_:where(svg)]:size-6 ',- 'icon-sm': 'size-6 p-0.5 [&_:where(svg)]:size-5 ',-};+function isIconSize(size: ButtonSize): boolean {+ return size.startsWith('icon-');+}export const Button = (props: ButtonProps) => {const [local, others] = splitProps(props, [@@ -100,49 +148,49 @@ export const Button = (props: ButtonProps) => {'label','size','fullWidth',+ 'noTouchResize',+ 'square','tooltipDisabled',+ 'aria-label',]);const group = useButtonGroupContext();+ const variant = () => local.variant ?? group?.variant ?? 'ghost';+ const size = () => local.size ?? group?.size ?? 'md';+const cls = () =>- cn(- 'relative inline-flex items-center justify-center font-medium leading-none border border-transparent rounded-sm whitespace-nowrap',- local.fullWidth && 'w-full',- {- 'touch:min-h-9 touch:min-w-9 touch:[&_svg]:size-6':- !props.noTouchResize,- },- 'outline-none focus-visible:bg-active',- 'data-disabled:cursor-not-allowed',- variantStyles[local.variant ?? group?.variant ?? 'ghost'],- sizeStyles[local.size ?? group?.size ?? 'md'],- local.class- );+ buttonClasses({+ variant: variant(),+ size: size(),+ fullWidth: local.fullWidth,+ noTouchResize: local.noTouchResize,+ square: local.square,+ class: local.class,+ });const placement = () => local.tooltipPlacement ?? 'bottom';- const variantStyle = (): JSX.CSSProperties | string | undefined => {- const variant = local.variant ?? group?.variant;- if (variant === 'cta') {- // TODO (seamus): this is scuffed but better than what we had.- const textL = themeReactive.a0.l[0]() < 0.72 ? 0.97 : 0.2;- return {- color: `oklch(${textL} var(--c0c) var(--c0h))`,- '--color-edge': `oklch(${textL} var(--c0c) var(--c0h) / 0.7)`,- '--color-edge-muted': `oklch(${textL} var(--c0c) var(--c0h) / 0.7)`,- };- }- return others.style;- };+ const accessibleLabel = () =>+ local['aria-label'] ??+ local.label ??+ (isIconSize(size()) || local.square ? local.tooltip : undefined);const button = () => (- <KobalteButton data-button class={cls()} {...others} style={variantStyle()}>+ <KobalteButton+ data-button+ data-slot="button"+ data-variant={variant()}+ data-size={size()}+ class={cls()}+ aria-label={accessibleLabel()}+ {...others}+ >{local.children}</KobalteButton>);- const tooltipLabel = () => local.label ?? local.tooltip;+ const tooltipLabel = () => local.tooltip ?? local.label;// Skip Layer when inside a ButtonGroup (the group already provides one)// unless the button has its own explicit depthdiff --git a/apps/web/src/components/ui/components/ButtonGroup.tsx b/apps/web/src/components/ui/components/ButtonGroup.tsxindex 0ded81a96d..9bb740911b 100644--- a/apps/web/src/components/ui/components/ButtonGroup.tsx+++ b/apps/web/src/components/ui/components/ButtonGroup.tsx@@ -6,7 +6,6 @@ import { Layer } from './Layer';type ButtonGroupOrientation = 'horizontal' | 'vertical';type ButtonGroupContextValue = {- depth?: 0 | 1 | 2 | 3 | 4;variant?: ButtonVariant;size?: ButtonSize;orientation: ButtonGroupOrientation;@@ -29,21 +28,21 @@ type ButtonGroupProps = {const groupVariantStyles: Record<ButtonVariant, string> = {danger: 'border border-failure/50 ',- base: 'border border-edge-muted ',- active: 'border border-accent ',+ outline: 'border border-edge-muted ',+ accent: 'border border-accent ',success: 'border border-success ',ghost: ' ',- contrast: 'border border-transparent',+ strong: 'border border-transparent',cta: 'border border-transparent ',};const dividerVariantStyles: Record<ButtonVariant, string> = {danger: 'bg-failure/50',- base: 'bg-edge-muted',- active: 'bg-accent',+ outline: 'bg-edge-muted',+ accent: 'bg-accent',success: 'bg-success',ghost: 'bg-edge-muted',- contrast: 'bg-surface/50',+ strong: 'bg-surface-4/50',cta: 'bg-surface/50',};@@ -82,9 +81,6 @@ export const ButtonGroup = (props: ButtonGroupProps) => {};const ctx: ButtonGroupContextValue = {- get depth() {- return props.depth;- },get variant() {return props.variant;},@@ -100,6 +96,7 @@ export const ButtonGroup = (props: ButtonGroupProps) => {<ButtonGroupContext.Provider value={ctx}><Layer depth={props.depth ?? 0}><div+ data-slot="button-group"data-orientation={orientation()}class={cn('data-[orientation=horizontal]:flex-row items-center',@@ -126,7 +123,7 @@ type DividerProps = { class?: string };const Divider = (props: DividerProps) => {const group = useButtonGroupContext();const orientation = () => group?.orientation ?? 'horizontal';- const variant = () => group?.variant ?? 'base';+ const variant = () => group?.variant ?? 'outline';return (<divrole="separator"diff --git a/apps/web/src/components/ui/components/Calendar.tsx b/apps/web/src/components/ui/components/Calendar.tsxindex 4802803610..8068024fc1 100644--- a/apps/web/src/components/ui/components/Calendar.tsx+++ b/apps/web/src/components/ui/components/Calendar.tsx@@ -457,7 +457,7 @@ export function CalendarMonthMenu(props: CalendarMonthMenuProps) {<div class="flex pt-3"><ButtonfullWidth- variant="base"+ variant="outline"size="sm"depth={3}class="rounded-full bg-surface px-3 text-ink shadow-menu"diff --git a/apps/web/src/components/ui/components/ConfirmDialog.tsx b/apps/web/src/components/ui/components/ConfirmDialog.tsxindex 0da9d5270e..9486d789a1 100644--- a/apps/web/src/components/ui/components/ConfirmDialog.tsx+++ b/apps/web/src/components/ui/components/ConfirmDialog.tsx@@ -29,7 +29,7 @@ export type ConfirmDialogDisplayProps = {};const TONE_VARIANT = {- default: 'active',+ default: 'accent',danger: 'danger',success: 'success',} as const;diff --git a/apps/web/src/components/ui/components/Dropdown.tsx b/apps/web/src/components/ui/components/Dropdown.tsxindex cca8dc3f24..92dbeaa96c 100644--- a/apps/web/src/components/ui/components/Dropdown.tsx+++ b/apps/web/src/components/ui/components/Dropdown.tsx@@ -348,7 +348,7 @@ function DropdownItem(props: DropdownItemProps) {function DropdownTrigger(props: DropdownTriggerProps) {return (<KobalteDropdownMenu.Trigger- variant="base"+ variant="outline"as={Button}size="sm"{...props}diff --git a/apps/web/src/components/ui/components/Hotkey.tsx b/apps/web/src/components/ui/components/Hotkey.tsxindex 8e7376563e..4bfbec5bea 100644--- a/apps/web/src/components/ui/components/Hotkey.tsx+++ b/apps/web/src/components/ui/components/Hotkey.tsx@@ -2,8 +2,8 @@ import type { Theme } from '@core/component/Themes';import { IS_MAC } from '@core/constant/isMac';import type { HotkeyToken } from '@core/hotkey/tokens';import { getPrettyHotkeyStringByToken } from '@core/hotkey/utils';-import { cn } from '@ui';import { createMemo, For, type JSX, Show, splitProps } from 'solid-js';+import { cn } from '../utils/classname';const modifierMap = {shift: IS_MAC ? '⇧' : 'Shift',diff --git a/apps/web/src/components/ui/components/PillButton.tsx b/apps/web/src/components/ui/components/PillButton.tsxindex 410fc6f477..75914e6adb 100644--- a/apps/web/src/components/ui/components/PillButton.tsx+++ b/apps/web/src/components/ui/components/PillButton.tsx@@ -24,7 +24,7 @@ export function PillButton(props: PillButtonProps) {const subtle = () => props.tone === 'subtle';return (<Button- variant={subtle() ? 'base' : 'cta'}+ variant={subtle() ? 'outline' : 'cta'}size="md"class={cn('rounded-full py-1',diff --git a/apps/web/src/components/ui/components/Tooltip.tsx b/apps/web/src/components/ui/components/Tooltip.tsxindex b5175c3ac9..cfa2c0e440 100644--- a/apps/web/src/components/ui/components/Tooltip.tsx+++ b/apps/web/src/components/ui/components/Tooltip.tsx@@ -1,12 +1,12 @@import type { HotkeyToken } from '@core/hotkey/tokens';import type { Placement } from '@floating-ui/dom';import { Tooltip as KobalteTooltip } from '@kobalte/core/tooltip';-import { Surface } from '@ui';import type { ParentProps } from 'solid-js';import { createEffect, createSignal, For, on, onCleanup, Show } from 'solid-js';import { Hotkey } from '../../ui/components/Hotkey';import { tooltipsEnabled } from '../signals/signals';import { cn } from '../utils/classname';+import { Surface } from './Surface';type TooltipProps = ParentProps<{hotkey?: HotkeyToken | HotkeyToken[];diff --git a/apps/web/src/components/ui/index.ts b/apps/web/src/components/ui/index.tsindex 6354d89aef..3a92c33fa9 100644--- a/apps/web/src/components/ui/index.ts+++ b/apps/web/src/components/ui/index.ts@@ -5,8 +5,27 @@ export type {AvatarSize,} from './components/Avatar';export { Avatar, AvatarGroup } from './components/Avatar';-export type { ButtonProps } from './components/Button';-export { Button } from './components/Button';+export type {+ BadgeClassOptions,+ BadgeProps,+ BadgeSize,+ BadgeVariant,+ BadgeVariantProps,+} from './components/Badge';+export {+ Badge,+ badgeClasses,+ badgeTriggerClasses,+ badgeVariants,+} from './components/Badge';+export type {+ ButtonClassOptions,+ ButtonProps,+ ButtonSize,+ ButtonVariant,+ ButtonVariantProps,+} from './components/Button';+export { Button, buttonClasses, buttonVariants } from './components/Button';export { ButtonGroup } from './components/ButtonGroup';export type {CalendarMonthMenuProps,@@ -110,3 +129,5 @@ export {highlightFirstMenuItemOnOpen,wrapIndex,} from './utils/menuKeyboardNavigation';+export type { VariantProps } from './utils/variants';+export { createVariants } from './utils/variants';diff --git a/apps/web/src/components/ui/utils/controlSizes.ts b/apps/web/src/components/ui/utils/controlSizes.tsnew file mode 100644index 0000000000..405e452bd0--- /dev/null+++ b/apps/web/src/components/ui/utils/controlSizes.ts@@ -0,0 +1,6 @@+/** Shared size classes for controls with text and optional icons. */+export const CONTROL_SIZE_VARIANTS = {+ sm: "h-6 gap-1 px-2 text-xs [&>svg:not([class*='size-'])]:size-3",+ md: "h-8 gap-2 px-2 text-sm [&>svg:not([class*='size-'])]:size-3.5",+ lg: "h-9 gap-2 px-3 text-base [&>svg:not([class*='size-'])]:size-[1em]",+} as const;diff --git a/apps/web/src/components/ui/utils/variants.test.ts b/apps/web/src/components/ui/utils/variants.test.tsnew file mode 100644index 0000000000..d22373923e--- /dev/null+++ b/apps/web/src/components/ui/utils/variants.test.ts@@ -0,0 +1,64 @@+import { describe, expect, expectTypeOf, it } from 'vitest';+import { createVariants, type VariantProps } from './variants';++const badgeVariants = createVariants(+ 'inline-flex rounded px-2',+ {+ tone: {+ neutral: 'bg-surface text-ink',+ positive: 'bg-success-bg text-success',+ },+ size: {+ sm: 'h-5 px-1 text-xs',+ md: 'h-7 px-3 text-sm',+ },+ },+ {+ tone: 'neutral',+ size: 'md',+ }+);++describe('createVariants', () => {+ it('combines the base with selected variant classes', () => {+ const classes = badgeVariants({ tone: 'positive', size: 'sm' });++ expect(classes).toContain('inline-flex');+ expect(classes).toContain('bg-success-bg');+ expect(classes).toContain('h-5');+ });++ it('uses defaults for omitted selections', () => {+ const classes = badgeVariants({ tone: 'positive' });++ expect(classes).toContain('bg-success-bg');+ expect(classes).toContain('h-7');+ });++ it('omits a group with no selection or default', () => {+ const withoutDefaults = createVariants('base', {+ emphasis: {+ quiet: 'opacity-60',+ },+ });++ expect(withoutDefaults()).toBe('base');+ });++ it('merges conflicting Tailwind classes in variant order', () => {+ const classes = badgeVariants({ size: 'sm' });++ expect(classes).toContain('px-1');+ expect(classes).not.toContain('px-2');+ expect(classes).not.toContain('px-3');+ });++ it('infers group names and their allowed string values', () => {+ type BadgeVariantProps = VariantProps<typeof badgeVariants>;++ expectTypeOf<BadgeVariantProps>().toEqualTypeOf<{+ tone?: 'neutral' | 'positive';+ size?: 'sm' | 'md';+ }>();+ });+});diff --git a/apps/web/src/components/ui/utils/variants.ts b/apps/web/src/components/ui/utils/variants.tsnew file mode 100644index 0000000000..162b23695d--- /dev/null+++ b/apps/web/src/components/ui/utils/variants.ts@@ -0,0 +1,39 @@+import { cn } from './classname';++type VariantGroups = Record<string, Record<string, string>>;++type VariantSelection<Groups extends VariantGroups> = {+ -readonly [Group in keyof Groups]?: Extract<keyof Groups[Group], string>;+};++/** Extracts the inferred variant selections accepted by a variant helper. */+export type VariantProps<VariantHelper> = VariantHelper extends (+ selection?: infer Selection+) => string+ ? NonNullable<Selection>+ : never;++/**+ * Creates a class helper from a base class and string-keyed variant groups.+ *+ * Variant names and values are inferred from `groups`. Classes are merged with+ * `cn`, so selected variants can override conflicting classes from the base.+ */+export function createVariants<const Groups extends VariantGroups>(+ base: string,+ groups: Groups,+ defaults: VariantSelection<Groups> = {}+): (selection?: VariantSelection<Groups>) => string {+ return (selection = {}) => {+ const selected = selection as Record<string, string | undefined>;+ const fallback = defaults as Record<string, string | undefined>;++ return cn(+ base,+ Object.entries(groups).map(([group, values]) => {+ const value = selected[group] ?? fallback[group];+ return value === undefined ? undefined : values[value];+ })+ );+ };+}diff --git a/apps/web/src/features/auth/Login.tsx b/apps/web/src/features/auth/Login.tsxindex 9c9f82620c..c267d8e073 100644--- a/apps/web/src/features/auth/Login.tsx+++ b/apps/web/src/features/auth/Login.tsx@@ -133,7 +133,7 @@ function LoginPicker(props: {<Show when={showApple}><Button- variant="base"+ variant="outline"class="bg-surface"onClick={() => startSsoLogin('Apple')}>@@ -142,7 +142,7 @@ function LoginPicker(props: {</Button></Show>- <Button variant="base" class="bg-surface" onClick={continueWithEmail}>+ <Button variant="outline" class="bg-surface" onClick={continueWithEmail}>Continue with email</Button></div>@@ -268,7 +268,7 @@ function EmailFormNew(props: {Continue<ArrowRight class="size-4" /></Button>- <Button variant="base" class="bg-surface" onClick={props.onBack}>+ <Button variant="outline" class="bg-surface" onClick={props.onBack}><ArrowLeft class="size-4" />Back to sign in</Button>@@ -443,7 +443,7 @@ function VerifyFormNew(props: {Verify<ArrowRight class="size-4" /></Button>- <Button variant="base" class="bg-surface" onClick={props.onBack}>+ <Button variant="outline" class="bg-surface" onClick={props.onBack}><ArrowLeft class="size-4" />Change email</Button>diff --git a/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx b/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsxindex 3f002b3f47..b60eae8d90 100644--- a/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx@@ -42,7 +42,7 @@ export function MobileAuthWelcome() {</div><div class="flex flex-col gap-3 px-8 pb-8"><Button- variant="contrast"+ variant="strong"size="lg"onClick={() => navigate('/onboarding')}>diff --git a/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsx b/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsxindex b02ca047ba..9469983ecb 100644--- a/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsx@@ -106,7 +106,7 @@ export function MobileOnboarding() {<Show when={step() > CREATE_ACCOUNT_STEP}><div class="mx-auto w-full max-w-md shrink-0 px-6 pt-6 pb-6"><Button- variant="contrast"+ variant="strong"size="lg"class="w-full"onClick={onContinue}diff --git a/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx b/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsxindex 80c8c57429..a603d3b3ae 100644--- a/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx@@ -109,7 +109,7 @@ export function OnboardingConnectAccounts() {<div><div class="flex flex-col gap-2"><Button- variant="contrast"+ variant="strong"size="lg"class="border border-edge-muted"disabled={!isAuthenticated()}@@ -127,7 +127,7 @@ export function OnboardingConnectAccounts() {<div class="flex flex-col gap-2"><Button- variant="contrast"+ variant="strong"size="lg"class="border border-edge-muted"disabled={diff --git a/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsx b/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsxindex 9f5ccfc841..2fda3cd5b4 100644--- a/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsx@@ -32,7 +32,7 @@ export function OnboardingCreateAccount() {<div class="flex flex-col gap-2 pt-2"><Button- variant="contrast"+ variant="strong"size="lg"onClick={() => startSsoLogin(GOOGLE_GMAIL_IDP)}>diff --git a/apps/web/src/features/block-automation/component/Automation.tsx b/apps/web/src/features/block-automation/component/Automation.tsxindex f054a6181e..22232571bd 100644--- a/apps/web/src/features/block-automation/component/Automation.tsx+++ b/apps/web/src/features/block-automation/component/Automation.tsx@@ -364,7 +364,7 @@ export function Automation() {<div class="flex shrink-0 flex-col gap-3 p-3"><div class="flex items-center gap-2"><Button- variant="active"+ variant="accent"size="sm"class="cursor-default"disabled={runNowMutation.isPending || isRunning()}@@ -373,7 +373,7 @@ export function Automation() {Run Now</Button><Button- variant="base"+ variant="outline"size="sm"class="cursor-default"onClick={() =>diff --git a/apps/web/src/features/block-automation/component/AutomationComposer.tsx b/apps/web/src/features/block-automation/component/AutomationComposer.tsxindex 03253f7727..30c23e6b86 100644--- a/apps/web/src/features/block-automation/component/AutomationComposer.tsx+++ b/apps/web/src/features/block-automation/component/AutomationComposer.tsx@@ -303,7 +303,7 @@ export function AutomationComposer() {<div class="flex items-center justify-end gap-2 border-t border-edge-muted px-3 py-2"><Button- variant="base"+ variant="outline"size="sm"class="cursor-default"onClick={() => setAutomationComposerOpen(false, false)}@@ -311,7 +311,7 @@ export function AutomationComposer() {Cancel</Button><Button- variant="active"+ variant="accent"size="sm"class="cursor-default"disabled={createMutation.isPending}diff --git a/apps/web/src/features/block-calendar/components/EventRsvpSection.tsx b/apps/web/src/features/block-calendar/components/EventRsvpSection.tsxindex 323d4c1de0..8980a694a2 100644--- a/apps/web/src/features/block-calendar/components/EventRsvpSection.tsx+++ b/apps/web/src/features/block-calendar/components/EventRsvpSection.tsx@@ -103,8 +103,8 @@ export function EventRsvpSection(props: {<Buttonvariant={selfAttendee()?.responseStatus === option.response- ? 'active'- : 'base'+ ? 'accent'+ : 'outline'}size={props.buttonSize ?? 'sm'}depth={3}@@ -154,7 +154,7 @@ export function EventRsvpSection(props: {>Cancel</Button>- <Button variant="active" class="rounded-lg" onClick={confirm}>+ <Button variant="accent" class="rounded-lg" onClick={confirm}>OK</Button></div>diff --git a/apps/web/src/features/block-calendar/components/Header.tsx b/apps/web/src/features/block-calendar/components/Header.tsxindex 8175a8c199..7cb9917981 100644--- a/apps/web/src/features/block-calendar/components/Header.tsx+++ b/apps/web/src/features/block-calendar/components/Header.tsx@@ -125,7 +125,7 @@ export function Header() {fallback={<Show when={!isTodayVisible()}><Button- variant="active"+ variant="accent"size="sm"class="rounded-lg px-3"depth={2}diff --git a/apps/web/src/features/block-calendar/components/Page.tsx b/apps/web/src/features/block-calendar/components/Page.tsxindex 7299416619..57eb502276 100644--- a/apps/web/src/features/block-calendar/components/Page.tsx+++ b/apps/web/src/features/block-calendar/components/Page.tsx@@ -161,7 +161,7 @@ function CalendarPageDataStatus(props: { data: CalendarOccurrenceData }) {We couldn’t load your calendar events. Try again.</p><Button- variant="active"+ variant="accent"size="sm"label="Retry loading calendar"onClick={() => void props.data.occurrencesQuery.refetch()}diff --git a/apps/web/src/features/block-calendar/components/SetupStatus.tsx b/apps/web/src/features/block-calendar/components/SetupStatus.tsxindex 6c3b88e36d..2f6d3c59ec 100644--- a/apps/web/src/features/block-calendar/components/SetupStatus.tsx+++ b/apps/web/src/features/block-calendar/components/SetupStatus.tsx@@ -99,7 +99,7 @@ export function SetupStatus() {fallback={<div class="absolute right-2 bottom-2 z-20 flex items-center gap-2 rounded-full border border-edge-muted bg-surface py-1 pr-1 pl-2.5 text-xs text-ink-muted shadow-menu"><span>{setupMessage().title}</span>- <Button variant="active" size="sm" onClick={startSetup}>+ <Button variant="accent" size="sm" onClick={startSetup}>{setupMessage().action}</Button></div>@@ -114,7 +114,7 @@ export function SetupStatus() {{setupMessage().title}</div><p class="text-xs text-ink-muted">{setupMessage().description}</p>- <Button variant="active" size="sm" onClick={startSetup}>+ <Button variant="accent" size="sm" onClick={startSetup}>{setupMessage().action}</Button></div>diff --git a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsxindex 267c4ed623..fba082a43d 100644--- a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx+++ b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx@@ -140,7 +140,7 @@ export function CallRecordingSplitHeader(props: {<HeaderIsland><Buttondepth={2}- variant="base"+ variant="outline"size="icon-xs"class="bg-surface"tooltip="Call Again"diff --git a/apps/web/src/features/block-canvas/component/ToolBar.tsx b/apps/web/src/features/block-canvas/component/ToolBar.tsxindex bd799d19dd..0222b2f64c 100644--- a/apps/web/src/features/block-canvas/component/ToolBar.tsx+++ b/apps/web/src/features/block-canvas/component/ToolBar.tsx@@ -189,7 +189,7 @@ export function ToolBar() {)}><Button- variant={activeTool() === Tools.Grab ? 'active' : 'ghost'}+ variant={activeTool() === Tools.Grab ? 'accent' : 'ghost'}size="icon-md"label="Hand tool"hotkey={TOKENS.canvas.handTool}@@ -204,7 +204,7 @@ export function ToolBar() {<Buttonvariant={activeTool() === Tools.ZoomIn || activeTool() === Tools.ZoomOut- ? 'active'+ ? 'accent': 'ghost'}size="icon-md"@@ -227,7 +227,7 @@ export function ToolBar() {activeTool() === Tools.Select ||activeTool() === Tools.Resize ||activeTool() === Tools.Move- ? 'active'+ ? 'accent': 'ghost'}size="icon-md"@@ -244,7 +244,7 @@ export function ToolBar() {<Show when={canEdit()}><div class="flex flex-row px-2 items-center space-x-2"><Button- variant={activeTool() === Tools.Shape ? 'active' : 'ghost'}+ variant={activeTool() === Tools.Shape ? 'accent' : 'ghost'}size="icon-md"label="Rectangle"hotkey={TOKENS.canvas.shapeTool}@@ -256,7 +256,7 @@ export function ToolBar() {</Button><Button- variant={activeTool() === Tools.Pencil ? 'active' : 'ghost'}+ variant={activeTool() === Tools.Pencil ? 'accent' : 'ghost'}size="icon-md"label="Pencil"hotkey={TOKENS.canvas.pencilTool}@@ -268,7 +268,7 @@ export function ToolBar() {</Button><Button- variant={activeTool() === Tools.Line ? 'active' : 'ghost'}+ variant={activeTool() === Tools.Line ? 'accent' : 'ghost'}size="icon-md"label="Connector"hotkey={TOKENS.canvas.lineTool}@@ -284,7 +284,7 @@ export function ToolBar() {<Buttonvariant={activeTool() === Tools.Text || activeTool() === Tools.Typing- ? 'active'+ ? 'accent': 'ghost'}size="icon-md"diff --git a/apps/web/src/features/block-email/component/BaseInput.tsx b/apps/web/src/features/block-email/component/BaseInput.tsxindex 4af3580275..d5e89f0814 100644--- a/apps/web/src/features/block-email/component/BaseInput.tsx+++ b/apps/web/src/features/block-email/component/BaseInput.tsx@@ -1659,7 +1659,7 @@ export function BaseInput(props: {);const AttachButton = (buttonProps?: {- variant?: 'ghost' | 'base';+ variant?: 'ghost' | 'outline';class?: string;}) => (<Buttondiff --git a/apps/web/src/features/block-email/component/BottomReplyButtons.tsx b/apps/web/src/features/block-email/component/BottomReplyButtons.tsxindex 1778c6b8cc..d8c26f005a 100644--- a/apps/web/src/features/block-email/component/BottomReplyButtons.tsx+++ b/apps/web/src/features/block-email/component/BottomReplyButtons.tsx@@ -29,7 +29,7 @@ function ReplyActionButton(props: {// matches the dock buttons. (The region host's Layer can't help —// Button's own Layer would reset it.)depth={isTouchDevice() ? 3 : undefined}- variant="base"+ variant="outline"aria-label={props.ariaLabel}class={cn(// Island pills when floating in the mobile/tablet accessory region.diff --git a/apps/web/src/features/block-email/component/compose/ComposeToolbar.tsx b/apps/web/src/features/block-email/component/compose/ComposeToolbar.tsxindex f1673cd372..f4b9437d14 100644--- a/apps/web/src/features/block-email/component/compose/ComposeToolbar.tsx+++ b/apps/web/src/features/block-email/component/compose/ComposeToolbar.tsx@@ -133,7 +133,7 @@ export function EmailComposeToolbar(props: {ctx.isSending() || ctx.isSavingDraft?.() || ctx.disabled()}onClick={() => void ctx.onSaveDraft?.()}- variant="base"+ variant="outline"size="sm">{ctx.isSavingDraft?.() ? 'Saving…' : 'Save Draft'}@@ -195,7 +195,7 @@ function MobileToolbar(props: {</Show><Show when={ctx.onSaveDraft}><Button- variant="base"+ variant="outline"size="sm"disabled={ctx.isSending() || ctx.isSavingDraft?.() || ctx.disabled()diff --git a/apps/web/src/features/block-md/component/CollabStatus.tsx b/apps/web/src/features/block-md/component/CollabStatus.tsxindex 973472e040..7a03156d0c 100644--- a/apps/web/src/features/block-md/component/CollabStatus.tsx+++ b/apps/web/src/features/block-md/component/CollabStatus.tsx@@ -25,7 +25,7 @@ export function CollabStatus() {<Switch><Match when={status() === SyncSourceStatus.Disconnected}><Button- variant="base"+ variant="outline"size="icon-sm"aria-label="Offline"tooltip="You're offline. Changes will sync when you reconnect."diff --git a/apps/web/src/features/block-md/component/ComposeSkill.tsx b/apps/web/src/features/block-md/component/ComposeSkill.tsxindex 78519108c2..0d6b668ce1 100644--- a/apps/web/src/features/block-md/component/ComposeSkill.tsx+++ b/apps/web/src/features/block-md/component/ComposeSkill.tsx@@ -430,7 +430,7 @@ export function ComposeSkill(props: ComposeSkillProps) {<ButtononClick={handleCreateSkill}disabled={title().trim().length === 0 || isCreating()}- variant={title().trim().length === 0 ? 'ghost' : 'active'}+ variant={title().trim().length === 0 ? 'ghost' : 'accent'}depth={3}class="gap-3 rounded-lg border-0">diff --git a/apps/web/src/features/block-md/component/ComposeTask.tsx b/apps/web/src/features/block-md/component/ComposeTask.tsxindex 1db1f9c674..e175822c87 100644--- a/apps/web/src/features/block-md/component/ComposeTask.tsx+++ b/apps/web/src/features/block-md/component/ComposeTask.tsx@@ -810,7 +810,7 @@ export function ComposeTask(props: ComposeTaskProps) {tabIndex={-1}tooltip="Clear Draft"size="sm"- variant="base"+ variant="outline"depth={3}class="bg-surface px-3">@@ -972,7 +972,7 @@ export function ComposeTask(props: ComposeTaskProps) {<ButtononClick={handleCreateTask}disabled={title().trim().length === 0 || isCreating()}- variant={title().trim().length === 0 ? 'ghost' : 'active'}+ variant={title().trim().length === 0 ? 'ghost' : 'accent'}depth={3}class="gap-3 rounded-lg border-0">diff --git a/apps/web/src/features/block-md/component/FormatTools.tsx b/apps/web/src/features/block-md/component/FormatTools.tsxindex 715cceffad..0970d5e00b 100644--- a/apps/web/src/features/block-md/component/FormatTools.tsx+++ b/apps/web/src/features/block-md/component/FormatTools.tsx@@ -226,7 +226,7 @@ const InlineFormatButton = (props: {label={InlineLabels[props.format]}shortcut={InlineShortcuts[props.format]}size="icon-sm"- variant={isActive() ? 'active' : 'ghost'}+ variant={isActive() ? 'accent' : 'ghost'}class="rounded-md"depth={3}onClick={(e: MouseEvent | KeyboardEvent) =>@@ -283,7 +283,7 @@ export const ElementFormatButton = (props: {depth={3}variant={isElementFormatActive(props.selection(), props.format)- ? 'active'+ ? 'accent': 'ghost'}onClick={(e: MouseEvent | KeyboardEvent) =>@@ -514,7 +514,7 @@ export function FormatTools(props: { withinPopup?: boolean }) {return (<Dropdown open={menuOpen()} onOpenChange={setMenuOpen}><Dropdown.Trigger- variant={isActive() ? 'active' : 'ghost'}+ variant={isActive() ? 'accent' : 'ghost'}size="icon-sm"class="rounded-md"depth={3}@@ -578,7 +578,7 @@ export function FormatTools(props: { withinPopup?: boolean }) {return (<Dropdown open={menuOpen()} onOpenChange={setMenuOpen}><Dropdown.Trigger- variant={isActive() ? 'active' : 'ghost'}+ variant={isActive() ? 'accent' : 'ghost'}size="icon-sm"class="rounded-md"depth={3}@@ -635,7 +635,7 @@ export function FormatTools(props: { withinPopup?: boolean }) {(format) => !props.excludes?.includes(format)))- ? 'active'+ ? 'accent': 'ghost'}size="icon-sm"@@ -684,7 +684,7 @@ export function FormatTools(props: { withinPopup?: boolean }) {<Dropdown.Triggervariant={hasActiveElementFormat(selection(), props.elements)- ? 'active'+ ? 'accent': 'ghost'}size="icon-sm"diff --git a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx b/apps/web/src/features/block-md/component/InlinePropertyValue.tsxindex a6d62391c6..cfc9994f84 100644--- a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx+++ b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx@@ -2,9 +2,8 @@ import { useMaybeBlockId } from '@core/block';import { Property } from '@property';import { usePropertiesContext } from '@property/context/PropertiesContext';import type { Property as PropertyT } from '@property/types';-import { getEntityValues, hasValue } from '@property/utils';+import { getEntityValues } from '@property/utils';import { Layer } from '@ui';-import { cn } from '@ui/utils/classname';import { type Component, type JSX, Match, Switch } from 'solid-js';type InlinePropertyValueProps = {@@ -16,7 +15,7 @@ type InlinePropertyValueProps = {/*** Inline property pill shown beneath a task title when the side panel is* closed. Built from @property primitives — same visual surface as before,- * but routes through Property.Root / Tooltip / EditTrigger so any property+ * but routes through Property.Root / Tooltip / Pill so any property* type renders correctly without bespoke per-type components.*/export const InlinePropertyValue: Component<InlinePropertyValueProps> = (@@ -25,9 +24,6 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (const ctx = usePropertiesContext();const blockId = useMaybeBlockId();- const isReadOnly = () => !ctx.canEdit || props.property.isMetadata;- const isEmpty = () => !hasValue(props.property);-const isUserEntity = () =>props.property.valueType === 'ENTITY' &&props.property.specificEntityType === 'USER';@@ -44,18 +40,7 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (><Property.Tooltip property={props.property}><Layer depth={2}>- <Property.EditTrigger- class={cn(- 'inline-flex items-center gap-1.5 min-w-0 border border-edge-muted',- 'px-2 py-1 leading-tight text-left rounded-full',- 'bg-surface',- 'focus-visible:bg-active focus-visible:ring-accent/10',- {- 'hover:bg-hover': !isReadOnly(),- 'text-ink-extra-muted': isEmpty(),- }- )}- >+ <Property.Pill><Switchfallback={<Property.Icon@@ -80,7 +65,7 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (}/><Property.Caret />- </Property.EditTrigger>+ </Property.Pill></Layer></Property.Tooltip><Property.PopoverEditordiff --git a/apps/web/src/features/block-md/component/TableInsert.tsx b/apps/web/src/features/block-md/component/TableInsert.tsxindex 6904914ce8..0eb754c336 100644--- a/apps/web/src/features/block-md/component/TableInsert.tsx+++ b/apps/web/src/features/block-md/component/TableInsert.tsx@@ -162,7 +162,7 @@ export function TableInsert(/></div><Button- variant="base"+ variant="outline"disabled={!rows() || !cols()}onClick={() => handleInsertTable(rows() ?? 0, cols() ?? 0)}>diff --git a/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsx b/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsxindex e3bd0edeb8..42a73e8eeb 100644--- a/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsx+++ b/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsx@@ -181,7 +181,7 @@ function DismissDuplicateButton(props: { onDismiss: () => void }) {return (<Buttondepth={2}- variant="base"+ variant="outline"size="sm"class="h-6 shrink-0 px-2 text-xs"onClick={props.onDismiss}@@ -195,7 +195,7 @@ function DismissAllButton(props: { onDismissAll: () => void }) {return (<Buttondepth={2}- variant="base"+ variant="outline"size="sm"class="mt-1 w-fit text-xs"onClick={props.onDismissAll}diff --git a/apps/web/src/features/block-md/history/OldOverlay.tsx b/apps/web/src/features/block-md/history/OldOverlay.tsxindex d58caa0342..6034d0f60d 100644--- a/apps/web/src/features/block-md/history/OldOverlay.tsx+++ b/apps/web/src/features/block-md/history/OldOverlay.tsx@@ -49,12 +49,12 @@ export function OldOverlay() {You are viewing history. Press{' '}<Hotkey shortcut="escape" theme="current" /> to exit.</span>- <Button variant="base" size="sm" onClick={history.exit}>+ <Button variant="outline" size="sm" onClick={history.exit}><XIcon />Exit</Button><Button- variant="active"+ variant="accent"size="sm"onClick={handleFork}disabled={diff --git a/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx b/apps/web/src/features/block-project/component/ProjectCreateMenu.tsxindex 202c814447..1611fdc8a1 100644--- a/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx+++ b/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx@@ -324,7 +324,7 @@ export function ProjectCreateMenu(props: { id: string }) {<Dropdown open={open()} onOpenChange={setOpen}><div class="flex items-center"><Dropdown.Trigger- variant="base"+ variant="outline"size="sm"class="bg-surface py-3"depth={2}diff --git a/apps/web/src/features/block-unknown/component/Block.tsx b/apps/web/src/features/block-unknown/component/Block.tsxindex e59514980b..73c6bedbaa 100644--- a/apps/web/src/features/block-unknown/component/Block.tsx+++ b/apps/web/src/features/block-unknown/component/Block.tsx@@ -62,11 +62,11 @@ const Unknown = () => {</div><div class="flex flex-row gap-2 items-center">- <Button variant="active" onClick={shareCtx.open}>+ <Button variant="accent" onClick={shareCtx.open}><ShareFat class="size-4" /> Share</Button>- <Button variant="active" onClick={downloadDocument}>+ <Button variant="accent" onClick={downloadDocument}><DownloadSimple class="size-4" /> Download</Button></div>diff --git a/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsx b/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsxindex 9b21efc7c9..4ef887fdcd 100644--- a/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsx+++ b/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsx@@ -56,7 +56,7 @@ export function TurnOffCalendarDialog(props: {calendar back on means granting access again.</Dialog.Description><div class="pt-3 justify-end items-center gap-3 inline-flex">- <Button variant="base" depth={3} onClick={props.onClose}>+ <Button variant="outline" depth={3} onClick={props.onClose}>Cancel</Button><Button variant="danger" depth={3} onClick={confirm}>diff --git a/apps/web/src/features/calendar/components/composer/EventForm.tsx b/apps/web/src/features/calendar/components/composer/EventForm.tsxindex 0c85166083..50be77b886 100644--- a/apps/web/src/features/calendar/components/composer/EventForm.tsx+++ b/apps/web/src/features/calendar/components/composer/EventForm.tsx@@ -240,7 +240,7 @@ export function EventForm(props: EventFormProps) {</Button><Buttontype="submit"- variant={controller.canSave() ? 'active' : 'ghost'}+ variant={controller.canSave() ? 'accent' : 'ghost'}depth={3}class="rounded-lg border-0"disabled={!controller.canSave() || formIsDisabled()}diff --git a/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsx b/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsxindex 2758e3911e..c3869fd281 100644--- a/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsx+++ b/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsx@@ -137,7 +137,7 @@ export function RecurrenceBuilder(props: RecurrenceBuilderProps) {<Buttontype="button"variant={- props.value.byDay.includes(code) ? 'active' : 'ghost'+ props.value.byDay.includes(code) ? 'accent' : 'ghost'}size="icon-sm"class="rounded-full text-xxs"diff --git a/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsx b/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsxindex 64cd3af95b..dea96637a7 100644--- a/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsx+++ b/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsx@@ -104,7 +104,7 @@ function InvalidInviteLink() {This channel invitation is invalid or no longer available.</p><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={() => navigate('/')}@@ -123,7 +123,7 @@ function UnauthenticatedView(props: { onLogin: () => void }) {Sign in or create an account to accept this channel invitation.</p><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={props.onLogin}@@ -147,7 +147,7 @@ function JoinConfirmation(props: { onJoin: () => void }) {</p></div><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={props.onJoin}@@ -166,7 +166,7 @@ function ServerError(props: { onRetry: () => void }) {Something went wrong while joining the channel. Please try again.</p><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={props.onRetry}diff --git a/apps/web/src/features/channel/Attachments/SectionHeader.tsx b/apps/web/src/features/channel/Attachments/SectionHeader.tsxindex 8c3fbfaa35..d5c525184b 100644--- a/apps/web/src/features/channel/Attachments/SectionHeader.tsx+++ b/apps/web/src/features/channel/Attachments/SectionHeader.tsx@@ -40,7 +40,7 @@ export function LoadMoreButton(props: {}) {return (<Button- variant="base"+ variant="outline"size="sm"depth={4}class="justify-self-center mt-2 bg-surface"diff --git a/apps/web/src/features/channel/Bots/BotProfileFields.tsx b/apps/web/src/features/channel/Bots/BotProfileFields.tsxindex c2a00d2fb9..2e87dfb57b 100644--- a/apps/web/src/features/channel/Bots/BotProfileFields.tsx+++ b/apps/web/src/features/channel/Bots/BotProfileFields.tsx@@ -40,7 +40,7 @@ export function BotProfileFields(props: {</div><Buttontype="button"- variant="base"+ variant="outline"size="sm"disabled={props.uploadingAvatar}onClick={props.onUploadAvatar}diff --git a/apps/web/src/features/channel/Bots/BotWebhooksSection.tsx b/apps/web/src/features/channel/Bots/BotWebhooksSection.tsxindex e88d082f08..1d6f717fab 100644--- a/apps/web/src/features/channel/Bots/BotWebhooksSection.tsx+++ b/apps/web/src/features/channel/Bots/BotWebhooksSection.tsx@@ -23,7 +23,7 @@ export function BotWebhooksSection(props: BotWebhooksSectionProps) {action={<Buttontype="button"- variant="base"+ variant="outline"size="sm"onClick={props.onNewToken}>diff --git a/apps/web/src/features/channel/Call/ChannelCallButton.tsx b/apps/web/src/features/channel/Call/ChannelCallButton.tsxindex b74c49a9a4..928c498265 100644--- a/apps/web/src/features/channel/Call/ChannelCallButton.tsx+++ b/apps/web/src/features/channel/Call/ChannelCallButton.tsx@@ -34,7 +34,7 @@ export function ChannelCallButton(props: { channelId: string }) {const variant = () => {if (isTouchDevice()) return 'ghost';if (isCallInProgress()) return 'success';- return 'base';+ return 'outline';};const confirmTitle = () => {diff --git a/apps/web/src/features/channel/CreateChannelModal.tsx b/apps/web/src/features/channel/CreateChannelModal.tsxindex 1039a94bb6..31f4e24013 100644--- a/apps/web/src/features/channel/CreateChannelModal.tsx+++ b/apps/web/src/features/channel/CreateChannelModal.tsx@@ -290,7 +290,7 @@ export function CreateChannelModal() {</Show><Buttontype="submit"- variant={canSubmit() ? 'active' : 'ghost'}+ variant={canSubmit() ? 'accent' : 'ghost'}depth={3}class="rounded-lg border-0"disabled={!canSubmit()}diff --git a/apps/web/src/features/channel/Input/ActionButton.tsx b/apps/web/src/features/channel/Input/ActionButton.tsxindex 352c3ada89..17fa978868 100644--- a/apps/web/src/features/channel/Input/ActionButton.tsx+++ b/apps/web/src/features/channel/Input/ActionButton.tsx@@ -12,7 +12,7 @@ export function InputActionButton(props: {title={props.label}aria-label={props.label}label={props.label}- variant={props.active ? 'active' : 'ghost'}+ variant={props.active ? 'accent' : 'ghost'}size="icon-sm"onPointerDown={(event: PointerEvent) => event.preventDefault()}onClick={(event) => props.onClick?.(event)}diff --git a/apps/web/src/features/channel/Message/ReactionChip.tsx b/apps/web/src/features/channel/Message/ReactionChip.tsxindex fbbbf4b215..ca465054af 100644--- a/apps/web/src/features/channel/Message/ReactionChip.tsx+++ b/apps/web/src/features/channel/Message/ReactionChip.tsx@@ -88,7 +88,7 @@ export function ReactionChip(props: ReactionChipProps) {}))}size="sm"- variant="base"+ variant="outline"class={cn('flex flex-row items-center h-7 min-w-7 gap-1 rounded-full',{diff --git a/apps/web/src/features/channel/Message/Reactions.tsx b/apps/web/src/features/channel/Message/Reactions.tsxindex 5369c19085..87c89e3dc1 100644--- a/apps/web/src/features/channel/Message/Reactions.tsx+++ b/apps/web/src/features/channel/Message/Reactions.tsx@@ -69,7 +69,7 @@ export function Reactions(props: ReactionsProps) {triggerProps={{size: 'icon-sm',tooltip: 'Add reaction',- variant: 'base',+ variant: 'outline',class: 'rounded-full h-7 min-w-7 border-rail','aria-label': 'Add reaction',onClick: (e: MouseEvent) => e.stopPropagation(),diff --git a/apps/web/src/features/channel/Participants/ChannelBotRow.tsx b/apps/web/src/features/channel/Participants/ChannelBotRow.tsxindex bad6ed9f71..2aee137372 100644--- a/apps/web/src/features/channel/Participants/ChannelBotRow.tsx+++ b/apps/web/src/features/channel/Participants/ChannelBotRow.tsx@@ -41,7 +41,7 @@ export function ChannelBotRow(props: {</div><Buttonclass="relative z-1"- variant="base"+ variant="outline"size="sm"label="Copy webhook URL"onClick={props.onCopyWebhook}diff --git a/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsx b/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsxindex fa049cd4b3..4c530cd642 100644--- a/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsx+++ b/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsx@@ -71,7 +71,7 @@ export function ChannelJoinLinkButton(props: { channelId: string }) {return (<Button- variant="base"+ variant="outline"size="sm"class="rounded-xs"disabled={getJoinLinkMutation.isPending}diff --git a/apps/web/src/features/chat/ChatWithAgentButton.tsx b/apps/web/src/features/chat/ChatWithAgentButton.tsxindex 530dee0ad3..5047ae4316 100644--- a/apps/web/src/features/chat/ChatWithAgentButton.tsx+++ b/apps/web/src/features/chat/ChatWithAgentButton.tsx@@ -134,7 +134,7 @@ export function ChatWithAgentButton(props: { entity: ChatWithAgentEntity }) {return (<Buttontooltip="Chat with Agent"- variant="base"+ variant="outline"size="sm"onMouseEnter={() => setHovering(true)}onMouseLeave={() => setHovering(false)}diff --git a/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx b/apps/web/src/features/command/sidebar/sidebar-create-menu.tsxindex 5eb2eae522..38de0f67f8 100644--- a/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx+++ b/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx@@ -106,7 +106,7 @@ export const SidebarCreateMenu = (props: {><Dropdown.Triggeras={Button}- variant="base"+ variant="outline"size="icon-sm"depth={1}class="size-[26px] rounded-full bg-surface shadow-md shadow-drop-shadow [&_svg]:size-4!"diff --git a/apps/web/src/features/companies/CreateCompanyModal.tsx b/apps/web/src/features/companies/CreateCompanyModal.tsxindex b06525cd49..3ea59450e2 100644--- a/apps/web/src/features/companies/CreateCompanyModal.tsx+++ b/apps/web/src/features/companies/CreateCompanyModal.tsx@@ -179,7 +179,7 @@ export function CreateCompanyModal() {<div class="flex shrink-0 items-end justify-end gap-2"><Buttontype="submit"- variant={canSubmit() ? 'active' : 'ghost'}+ variant={canSubmit() ? 'accent' : 'ghost'}depth={3}class="rounded-lg border-0"disabled={!canSubmit()}diff --git a/apps/web/src/features/companies/CreateContactModal.tsx b/apps/web/src/features/companies/CreateContactModal.tsxindex 317c516ebf..2b498f8421 100644--- a/apps/web/src/features/companies/CreateContactModal.tsx+++ b/apps/web/src/features/companies/CreateContactModal.tsx@@ -204,7 +204,7 @@ export function CreateContactModal() {<div class="flex shrink-0 items-end justify-end gap-2"><Buttontype="submit"- variant={canSubmit() ? 'active' : 'ghost'}+ variant={canSubmit() ? 'accent' : 'ghost'}depth={3}class="rounded-lg border-0"disabled={!canSubmit()}diff --git a/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx b/apps/web/src/features/devtools/debug/ProjectionPlayground.tsxindex 5a7ad63280..258e2a3484 100644--- a/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx+++ b/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx@@ -227,7 +227,7 @@ export default function ProjectionPlayground() {<section class="flex gap-2"><Button- variant="base"+ variant="outline"size="sm"disabled={projection.query.isFetching}onClick={() => projection.query.refetch()}diff --git a/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx b/apps/web/src/features/entity/EntitySelectionToolbarModal.tsxindex 11e391f527..6a02664492 100644--- a/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx+++ b/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx@@ -31,7 +31,7 @@ export const EntitySelectionToolbarModal = (</span><ButtononClick={props.onAction}- variant="base"+ variant="outline"class="p-1 pl-2 rounded-md bg-surface"depth={3}>@@ -40,7 +40,7 @@ export const EntitySelectionToolbarModal = (</Button><ButtononClick={props.onClose}- variant="base"+ variant="outline"class="p-1 pl-2 rounded-md bg-surface"depth={3}>diff --git a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsxindex 9927febc89..462a26a7d0 100644--- a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx+++ b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx@@ -615,7 +615,7 @@ export const BulkMoveToProjectView = (props: {/><Buttonsize="sm"- variant="base"+ variant="outline"class="rounded-xs shrink-0"disabled={!newFolderName().trim() || isSavingFolder()}onClick={submitNewFolder}@@ -642,7 +642,7 @@ export const BulkMoveToProjectView = (props: {</Button><Buttontype="button"- variant="base"+ variant="outline"class="rounded-xs"onClick={finishEditing}disabled={!selectedProject()}diff --git a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsxindex d437ba65c5..06e15d52f4 100644--- a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx+++ b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx@@ -200,7 +200,7 @@ export const BulkRenameEntitiesView = (props: {</Button><Buttontype="button"- variant="base"+ variant="outline"class="rounded-xs"onClick={finishEditing}>diff --git a/apps/web/src/features/entity/composed/list-entity/channel.tsx b/apps/web/src/features/entity/composed/list-entity/channel.tsxindex 8e216143c0..eab1d7bc63 100644--- a/apps/web/src/features/entity/composed/list-entity/channel.tsx+++ b/apps/web/src/features/entity/composed/list-entity/channel.tsx@@ -31,7 +31,7 @@ export function ChannelJoinButton(props: {return (<Buttontype="button"- variant="active"+ variant="accent"size="sm"class={props.class ?? 'shrink-0'}disabled={joinMutation.isPending}diff --git a/apps/web/src/features/home/home-section-boundary.tsx b/apps/web/src/features/home/home-section-boundary.tsxindex af8693179b..772ee6df6c 100644--- a/apps/web/src/features/home/home-section-boundary.tsx+++ b/apps/web/src/features/home/home-section-boundary.tsx@@ -50,7 +50,7 @@ function HomeSectionError(props: HomeSectionErrorProps) {<div class="mt-2 flex gap-2"><Button- variant="base"+ variant="outline"size="sm"depth={2}class="w-fit bg-surface"diff --git a/apps/web/src/features/inbox/AddInboxDialog.tsx b/apps/web/src/features/inbox/AddInboxDialog.tsxindex cbec1c40dd..3f3734a728 100644--- a/apps/web/src/features/inbox/AddInboxDialog.tsx+++ b/apps/web/src/features/inbox/AddInboxDialog.tsx@@ -60,7 +60,7 @@ export function AddInboxDialog() {</Dialog.Description><div class="pt-3 justify-end items-center gap-3 inline-flex"><Button- variant="base"+ variant="outline"depth={3}disabled={pending()}onClick={() => setIsOpen(false)}@@ -68,7 +68,7 @@ export function AddInboxDialog() {Cancel</Button><Button- variant="active"+ variant="accent"depth={3}disabled={pending()}onClick={handleConfirm}diff --git a/apps/web/src/features/inbox/ShareInboxConflictDialog.tsx b/apps/web/src/features/inbox/ShareInboxConflictDialog.tsxindex 5a3e6b6919..d9ba867d34 100644--- a/apps/web/src/features/inbox/ShareInboxConflictDialog.tsx+++ b/apps/web/src/features/inbox/ShareInboxConflictDialog.tsx@@ -38,10 +38,14 @@ export function ShareInboxConflictDialog(props: {it so you both manage one inbox instead of syncing a duplicate copy.</Dialog.Description><div class="pt-3 justify-end items-center gap-3 inline-flex">- <Button variant="base" depth={3} onClick={() => props.onCancel()}>+ <Button+ variant="outline"+ depth={3}+ onClick={() => props.onCancel()}+ >Cancel</Button>- <Button variant="active" depth={3} onClick={() => props.onShare()}>+ <Button variant="accent" depth={3} onClick={() => props.onShare()}>Share inbox</Button></div>diff --git a/apps/web/src/features/integrations/import-linear/ImportLinear.tsx b/apps/web/src/features/integrations/import-linear/ImportLinear.tsxindex 15c015afb9..371f9aa74a 100644--- a/apps/web/src/features/integrations/import-linear/ImportLinear.tsx+++ b/apps/web/src/features/integrations/import-linear/ImportLinear.tsx@@ -202,7 +202,7 @@ export default function ImportLinear() {<div class="flex items-center justify-between"><div class="text-lg font-medium text-ink">Import Linear CSV</div><Button- variant="base"+ variant="outline"onClick={() => {setFileName('');setParseError('');diff --git a/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx b/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsxindex 8a866adca7..b88aeed19b 100644--- a/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx+++ b/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx@@ -501,7 +501,7 @@ export default function DocumentWherePlayground() {<For each={EXAMPLES}>{(example) => (<Button- variant="base"+ variant="outline"size="sm"class="h-auto justify-start py-1.5"onClick={() => applyExample(example)}@@ -592,7 +592,7 @@ export default function DocumentWherePlayground() {</section><section class="flex gap-2">- <Button variant="base" size="sm" onClick={loadJsonFromControls}>+ <Button variant="outline" size="sm" onClick={loadJsonFromControls}>Edit JSON</Button><Button@@ -652,7 +652,7 @@ export default function DocumentWherePlayground() {</div><Show when={nextCursor()}><Button- variant="base"+ variant="outline"size="sm"disabled={loading()}onClick={() => run(nextCursor())}diff --git a/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx b/apps/web/src/features/next-soup/soup-view/NewCallButton.tsxindex b220e83295..fc862ecac6 100644--- a/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx+++ b/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx@@ -79,7 +79,7 @@ export function NewCallButton() {return (<><Button- variant="active"+ variant="accent"class="border-0 rounded-full px-3 py-2 pl-1 font-semibold"size="sm"onClick={() => setIsOpen(true)}@@ -118,7 +118,7 @@ export function NewCallButton() {/><div class="flex justify-end"><Button- variant="base"+ variant="outline"size="sm"disabled={isSubmitting()}onClick={handleStartCall}diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsxindex 92a1136ffc..72dc5499c0 100644--- a/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsx+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/inbox-selector.tsx@@ -67,7 +67,7 @@ export function InboxSelector() {><Combobox.Triggeras={Button}- variant="base"+ variant="outline"size="sm"depth={2}aria-label={selectorProps.hideLabel ? label() : undefined}@@ -87,7 +87,7 @@ export function InboxSelector() {const ConnectAnotherEmail = (buttonProps: { hideLabel?: boolean }) => (<Button- variant="base"+ variant="outline"size="sm"depth={2}aria-label={buttonProps.hideLabel ? 'Connect another email' : undefined}diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsxindex e1ad7d85d1..0bc1605c9d 100644--- a/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsx+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/mobile-filter-drawer.tsx@@ -801,7 +801,7 @@ export const MobileFilterDrawer = (props: {</For><ButtononClick={() => resetToTabDefaults()}- variant="base"+ variant="outline"size="sm"class="min-h-10 rounded-lg bg-active!">diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/search/mobile-search-filter-drawer.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/search/mobile-search-filter-drawer.tsxindex ee1201dd01..de9a923de1 100644--- a/apps/web/src/features/next-soup/soup-view/filters-bar/search/mobile-search-filter-drawer.tsx+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/search/mobile-search-filter-drawer.tsx@@ -306,7 +306,7 @@ export const MobileSearchFilterDrawer = (props: { class?: string }) => {<div class="shrink-0 border-t border-edge-muted p-2"><ButtononClick={resetAll}- variant="base"+ variant="outline"size="sm"class="min-h-10 rounded-lg bg-active!">diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-active-filters-bar.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-active-filters-bar.tsxindex 020a8b2188..b800e49339 100644--- a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-active-filters-bar.tsx+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-active-filters-bar.tsx@@ -52,7 +52,7 @@ export function SoupActiveFiltersBar(props: SoupActiveFiltersBarProps) {<div class="flex items-center shrink-0"><ButtononClick={() => props.onClearAll()}- variant="base"+ variant="outline"size="sm"class="h-7 rounded-md"tooltip="Clear active filters"diff --git a/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsx b/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsxindex 78da0d17c3..307febaaca 100644--- a/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsx+++ b/apps/web/src/features/next-soup/soup-view/soup-view-create-button.tsx@@ -177,7 +177,7 @@ export const SoupViewCreateButton = () => {const SingleOptionButton = (props: { hideLabel?: boolean }) => (<Button- variant="active"+ variant="accent"class={cn('border-0 rounded-full px-3 py-2 pl-1 font-semibold',props.hideLabel && 'pr-1'@@ -195,7 +195,7 @@ export const SoupViewCreateButton = () => {const MultiOptionButton = (props: { hideLabel?: boolean }) => (<Dropdown placement="bottom-start"><Dropdown.Trigger- variant="active"+ variant="accent"class={cn('border-0 rounded-full px-3 py-2 pl-1 font-semibold',props.hideLabel && 'pr-1'diff --git a/apps/web/src/features/next-soup/soup-view/soup-view.tsx b/apps/web/src/features/next-soup/soup-view/soup-view.tsxindex f4f57f2c71..e29712a11b 100644--- a/apps/web/src/features/next-soup/soup-view/soup-view.tsx+++ b/apps/web/src/features/next-soup/soup-view/soup-view.tsx@@ -665,7 +665,7 @@ export const SoupView = (props: SoupViewProps) => {fallback={<Tooltip label="Search" hotkey={TOKENS.soup.openSearch}><Button- variant="base"+ variant="outline"class="p-1 size-7 rounded-lg ml-2 bg-surface"onClick={() => setNarrowSearchExpanded(true)}depth={2}@@ -1429,7 +1429,7 @@ const SoupViewListContent = (props: SoupViewListProps) => {}fallback={<Button- variant="base"+ variant="outline"size="sm"depth={2}class={cn({@@ -1445,7 +1445,7 @@ const SoupViewListContent = (props: SoupViewListProps) => {}><Button- variant="base"+ variant="outline"size="sm"depth={2}class={cn({diff --git a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsxindex f3f0577b3f..87f8df01fa 100644--- a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx+++ b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyViewsMenu.tsx@@ -299,7 +299,7 @@ export function CompanyViewsMenu(props: { hideLabel?: boolean } = {}) {]}/><Button- variant="base"+ variant="outline"size="sm"disabled={!saveName().trim()}onClick={saveCurrentView}diff --git a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsxindex 1f83d4108d..dd0b2d776e 100644--- a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx+++ b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx@@ -5,6 +5,7 @@ import StatusInProgress from '@icon/square-task-in-progress-circle.svg';import PriorityHigh from '@icon/wide-priority-high.svg';import ArrowDownIcon from '@phosphor/arrow-down.svg';import UsersIcon from '@phosphor/users.svg';+import { Tooltip } from '@ui';import { cn } from '@ui/utils/classname';import { createMemo, For, type JSX, Show } from 'solid-js';import {@@ -13,12 +14,10 @@ import {TASK_GRID_TEMPLATE_COLUMNS_WIDE,} from './task-grid-template';import './list-property-value.css';-import { Tooltip } from '@ui';-// `size-3` at wide/medium (shown beside the label), upsizing to `size-4` on-// narrow containers to match the row's collapsed status/priority icons-// (`@max-[840px]/u-list:size-4` in list-property-value.tsx).-const HEADER_ICON_CLASS = 'size-3 @max-[840px]/u-list:size-4 text-ink-muted';+// Property icons stay at the sm Badge icon size in both labeled and collapsed+// modes, so the narrow header matches each row's 24px property button.+const HEADER_ICON_CLASS = 'size-3 text-ink-muted';/** Map column IDs to their icons for narrow mode */const COLUMN_ICONS: Record<string, () => JSX.Element> = {diff --git a/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.css b/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.cssindex 5739b2bc22..8856833d04 100644--- a/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.css+++ b/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.css@@ -16,9 +16,9 @@/* Narrow containers: collapse property columns to icons */@container u-list (max-width: 840px) {.task-grid-row {- --task-col-status: 2rem;- --task-col-priority: 2rem;- --task-col-assignees: 3rem;+ --task-col-status: 1.5rem;+ --task-col-priority: 1.5rem;+ --task-col-assignees: 2.25rem;--task-col-created-by: 0rem;--task-col-timestamp: 5rem;}diff --git a/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.tsx b/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.tsxindex 8539d7c830..4127716141 100644--- a/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.tsx+++ b/apps/web/src/features/next-soup/soup-view/views/tasks/list-property-value.tsx@@ -4,9 +4,9 @@ import { Property } from '@property';import { usePropertiesContext } from '@property/context/PropertiesContext';import type { Property as PropertyT } from '@property/types';import { getEntityValues, hasValue } from '@property/utils';+import { cn, Layer } from '@ui';import { type Component, Match, Show, Switch } from 'solid-js';import './list-property-value.css';-import { Layer } from '@ui';type ListPropertyValueProps = {property: PropertyT;@@ -71,12 +71,20 @@ export const ListPropertyValue: Component<ListPropertyValueProps> = (props) => {><Property.Tooltip property={props.property}><Layer depth={2}>- <Property.EditTrigger class="list-property-cell w-full max-w-full min-w-0 overflow-hidden rounded-full hover:bg-surface/50 inline-flex items-center gap-1 px-2 py-1.5 leading-tight text-left @max-[840px]/u-list:px-1">+ <Property.Pill+ class={cn(+ 'list-property-cell w-full min-w-0 overflow-hidden',+ '@max-[840px]/u-list:justify-center',+ userCount() > 1+ ? '@max-[840px]/u-list:px-1'+ : '@max-[840px]/u-list:w-6 @max-[840px]/u-list:p-0'+ )}+ ><Showwhen={!isEmpty()}fallback={<>- <CircleDashedEmpty class="size-3 shrink-0 opacity-50 @max-[840px]/u-list:size-4" />+ <CircleDashedEmpty class="size-3 shrink-0 opacity-50" /><span class="truncate flex-1 opacity-50 @max-[840px]/u-list:hidden">{props.property.displayName}</span>@@ -87,7 +95,7 @@ export const ListPropertyValue: Component<ListPropertyValueProps> = (props) => {fallback={<Property.Iconproperty={props.property}- class="size-3 shrink-0 @max-[840px]/u-list:size-4"+ class="size-3 shrink-0"/>}>@@ -103,14 +111,14 @@ export const ListPropertyValue: Component<ListPropertyValueProps> = (props) => {<Property.UserStackproperty={props.property}maxUsers={1}- avatarClass="@max-[840px]/u-list:size-5"+ avatarClass="@max-[840px]/u-list:size-4"/></div></Match><Match when={isUserEntity()}><Property.Iconproperty={props.property}- class="@max-[840px]/u-list:size-5"+ class="@max-[840px]/u-list:size-4"/></Match></Switch>@@ -120,7 +128,7 @@ export const ListPropertyValue: Component<ListPropertyValueProps> = (props) => {/></Show><Property.Caret class="@max-[840px]/u-list:hidden" />- </Property.EditTrigger>+ </Property.Pill></Layer></Property.Tooltip><Property.PopoverEditordiff --git a/apps/web/src/features/next-soup/soup-view/views/tasks/task-grid-layout.tsx b/apps/web/src/features/next-soup/soup-view/views/tasks/task-grid-layout.tsxindex b69f5d641e..c1cb6a9322 100644--- a/apps/web/src/features/next-soup/soup-view/views/tasks/task-grid-layout.tsx+++ b/apps/web/src/features/next-soup/soup-view/views/tasks/task-grid-layout.tsx@@ -27,6 +27,7 @@ import { useUserId } from '@queries/auth';import { useBulkSaveEntityPropertiesMutation } from '@queries/properties/entity';import { EntityType } from '@service-properties/generated/schemas/entityType';import type { SoupProperty } from '@service-storage/generated/schemas/soupProperty';+import { Badge } from '@ui';import { cn } from '@ui/utils/classname';import { createMemo, For, Show, Suspense } from 'solid-js';import { ListPropertyValue } from './list-property-value';@@ -219,10 +220,12 @@ export function TaskGridLayout(props: LayoutProps) {{/* Created By column - only shown on wide containers (>1220px) */}<Entity.Slotplacement="createdBy"- class="hidden @min-[1221px]/u-list:flex items-center gap-1.5 min-w-0 overflow-hidden text-xs ph-no-capture"+ class="hidden @min-[1221px]/u-list:flex min-w-0 overflow-hidden ph-no-capture">- <UserIcon id={props.entity.ownerId} size="sm" showTooltip={true} />- <span class="truncate text-ink-muted">{ownerDisplayName()}</span>+ <Badge variant="ghost" size="sm" class="max-w-full gap-1.5">+ <UserIcon id={props.entity.ownerId} size="sm" showTooltip={true} />+ <span class="truncate">{ownerDisplayName()}</span>+ </Badge></Entity.Slot><Entity.Slotdiff --git a/apps/web/src/features/notifications/components/Playground.tsx b/apps/web/src/features/notifications/components/Playground.tsxindex e6390f5662..cc494a6ba7 100644--- a/apps/web/src/features/notifications/components/Playground.tsx+++ b/apps/web/src/features/notifications/components/Playground.tsx@@ -235,7 +235,7 @@ function PermissionButton(props: { platformNotif: any }) {when={props.platformNotif.permission() === 'granted'}fallback={<Button- variant="active"+ variant="accent"onClick={() => props.platformNotif.requestPermission()}>Enable Browser Notifications@@ -286,7 +286,7 @@ function CustomBuilder(props: {<div class="pt-4 border-t border-edge-muted"><Button- variant="active"+ variant="accent"onClick={() => props.onTest(props.customNotification)}>🔔 Test Browser Notification@@ -363,7 +363,7 @@ function NotificationDetail(props: {</p></div><Button- variant="active"+ variant="accent"onClick={() => props.onTest(props.notification)}>🔔 Test Notificationdiff --git a/apps/web/src/features/paywall/PaywallComponent.tsx b/apps/web/src/features/paywall/PaywallComponent.tsxindex 6faa488438..fd01137b0c 100644--- a/apps/web/src/features/paywall/PaywallComponent.tsx+++ b/apps/web/src/features/paywall/PaywallComponent.tsx@@ -169,7 +169,7 @@ const PaywallComponent = (props: PaywallProps) => {when={upgradeDisabled()}fallback={<Button- variant={hasPaid() ? 'base' : 'cta'}+ variant={hasPaid() ? 'outline' : 'cta'}class="rounded-full sm:w-auto px-3 py-1.5"onClick={handleContinue}>@@ -183,7 +183,7 @@ const PaywallComponent = (props: PaywallProps) => {><span><Button- variant={hasPaid() ? 'base' : 'cta'}+ variant={hasPaid() ? 'outline' : 'cta'}class="rounded-full sm:w-auto px-3 py-1.5"disabled>diff --git a/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx b/apps/web/src/features/property/component/modal/CreatePropertyModal.tsxindex 131f085ad2..1380a2a7bf 100644--- a/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx+++ b/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx@@ -766,7 +766,7 @@ export const CreatePropertyModal: Component<CreatePropertyModalProps> = (Cancel</Button><Button- variant={canSubmit() ? 'active' : 'ghost'}+ variant={canSubmit() ? 'accent' : 'ghost'}depth={3}class={cn('gap-3 rounded-lg border-0', pending() && 'gap-1.5')}onClick={handleCreateProperty}diff --git a/apps/web/src/features/property/debug/PropertyDebug.tsx b/apps/web/src/features/property/debug/PropertyDebug.tsxindex 08ec173a8e..60161ba1cf 100644--- a/apps/web/src/features/property/debug/PropertyDebug.tsx+++ b/apps/web/src/features/property/debug/PropertyDebug.tsx@@ -1,7 +1,6 @@import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';import { StaticSplitLabel } from '@components/app/split-layout/components/SplitLabel';import { seedMockDisplayNames } from '@core/user';-import { cn } from '@ui';import { type Component, createSignal, For, type JSX, Show } from 'solid-js';import {PROPERTIES_EMPTY,@@ -62,11 +61,6 @@ const Grid: Component<{</div>);-const buttonClass = cn(- 'inline-flex items-center gap-1 min-w-0',- 'px-2 py-1 leading-tight text-left rounded-sm hover:bg-hover'-);-/*** Debug surface for the @property primitives. Mirrors the entity debug view:* exhaustively renders each extractor and composed assembly against mock@@ -193,7 +187,7 @@ const PropertyDebug: Component = () => {<Section title="Compositions — inline pill (like InlinePropertyValue)"><Grid- title="Tooltip + EditTrigger + Icon + Text + Caret"+ title="Tooltip + Pill + Icon + Text + Caret"properties={PROPERTIES_FILLED}>{(p) => (@@ -204,14 +198,14 @@ const PropertyDebug: Component = () => {onEdit={onEdit}><Property.Tooltip property={get(p)}>- <Property.EditTrigger class={buttonClass}>+ <Property.Pill><Property.Icon property={get(p)} class="size-3 shrink-0" /><Property.Textproperty={get(p)}fallback={<Property.Empty label="None" />}/><Property.Caret />- </Property.EditTrigger>+ </Property.Pill></Property.Tooltip></Property.Root>)}@@ -366,14 +360,14 @@ const EditorRow: Component<{ initial: PropertyT }> = (props) => {when={isInline()}fallback={<>- <Property.EditTrigger class={buttonClass}>+ <Property.Pill><Property.Icon property={property()} class="size-3 shrink-0" /><Property.Textproperty={property()}fallback={<Property.Empty label="None" />}/><Property.Caret />- </Property.EditTrigger>+ </Property.Pill><Property.PopoverEditor /></>}diff --git a/apps/web/src/features/property/extractors/PropertyAddButton.tsx b/apps/web/src/features/property/extractors/PropertyAddButton.tsxindex e036d780c2..389ef6bb07 100644--- a/apps/web/src/features/property/extractors/PropertyAddButton.tsx+++ b/apps/web/src/features/property/extractors/PropertyAddButton.tsx@@ -1,4 +1,4 @@-import { cn } from '@ui';+import { badgeTriggerClasses, cn } from '@ui';import { useProperty } from '../core/context';type Props = {@@ -34,10 +34,12 @@ export function PropertyAddButton(props: Props) {type="button"onClick={handleClick}disabled={isReadOnly()}- class={cn(- 'text-ink-muted hover:text-ink hover:bg-hover px-2 py-0.5 inline-block shrink-0 rounded-sm cursor-default',- props.class- )}+ class={badgeTriggerClasses({+ variant: 'ghost',+ size: 'sm',+ class: cn('size-6 p-0', props.class),+ })}+ aria-label={`Add ${ctx.property().displayName}`}>+</button>diff --git a/apps/web/src/features/property/extractors/PropertyChips.tsx b/apps/web/src/features/property/extractors/PropertyChips.tsxindex 7bca313a0a..2cec123679 100644--- a/apps/web/src/features/property/extractors/PropertyChips.tsx+++ b/apps/web/src/features/property/extractors/PropertyChips.tsx@@ -1,4 +1,4 @@-import { cn } from '@ui';+import { Badge, cn } from '@ui';import { type Component, For, type JSX, Show } from 'solid-js';import type { Property } from '../types';import {@@ -58,12 +58,12 @@ export const PropertyChips: Component<Props> = (props) => {const renderChip =props.renderChip ??((chip: ChipInfo) => (- <span class="inline-flex items-center gap-1 px-2 py-0.5 text-xs rounded-sm bg-hover">+ <Badge variant="ghost" size="sm" class="max-w-full"><Show when={isSelectProperty(props.property)}><PropertyIcon property={props.property} class="size-3 shrink-0" /></Show><span class="truncate">{chip.label}</span>- </span>+ </Badge>));return (diff --git a/apps/web/src/features/property/extractors/PropertyEditTrigger.tsx b/apps/web/src/features/property/extractors/PropertyEditTrigger.tsxindex 862550ff0b..381704768c 100644--- a/apps/web/src/features/property/extractors/PropertyEditTrigger.tsx+++ b/apps/web/src/features/property/extractors/PropertyEditTrigger.tsx@@ -4,7 +4,7 @@ import { useProperty } from '../core/context';type ButtonClickHandler = JSX.EventHandler<HTMLButtonElement, MouseEvent>;-type Props = Omit<+export type PropertyEditTriggerProps = Omit<JSX.ButtonHTMLAttributes<HTMLButtonElement>,'type' | 'disabled' | 'onClick'> & {@@ -20,7 +20,7 @@ type Props = Omit<** Must be inside <Property.Root>.*/-export function PropertyEditTrigger(props: Props) {+export function PropertyEditTrigger(props: PropertyEditTriggerProps) {const ctx = useProperty();const [local, rest] = splitProps(props, ['class',diff --git a/apps/web/src/features/property/extractors/PropertyPill.test.tsx b/apps/web/src/features/property/extractors/PropertyPill.test.tsxnew file mode 100644index 0000000000..b8bcbd2bb9--- /dev/null+++ b/apps/web/src/features/property/extractors/PropertyPill.test.tsx@@ -0,0 +1,96 @@+/**+ * @vitest-environment jsdom+ */++import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';+import { afterEach, describe, expect, it, vi } from 'vitest';+import {+ PropertyRootContext,+ type PropertyRootContextValue,+} from '../core/context';+import type { Property } from '../types';+import { PropertyPill } from './PropertyPill';++vi.mock('@ui', async () => {+ const badge = await import('../../../components/ui/components/Badge');+ const { cn } = await import('../../../components/ui/utils/classname');+ return { ...badge, cn };+});++const property: Property = {+ propertyId: 'status-property',+ propertyDefinitionId: 'status-definition',+ displayName: 'Status',+ isMultiSelect: false,+ owner: { scope: 'system' },+ createdAt: new Date(0),+ updatedAt: new Date(0),+ valueType: 'SELECT_STRING',+ value: ['in-progress'],+};++function context(+ canEdit: boolean,+ value: Property,+ onEdit = vi.fn()+): PropertyRootContextValue {+ return {+ property: () => value,+ canEdit: () => canEdit,+ onEdit,+ editorOpen: () => false,+ openEditor: vi.fn(),+ closeEditor: vi.fn(),+ };+}++afterEach(cleanup);++describe('PropertyPill', () => {+ it('uses the interactive ghost/sm contract when editable', async () => {+ const onEdit = vi.fn();++ render(() => (+ <PropertyRootContext.Provider value={context(true, property, onEdit)}>+ <PropertyPill>Status</PropertyPill>+ </PropertyRootContext.Provider>+ ));++ const pill = screen.getByRole('button', { name: 'Status' });+ expect(pill.classList).toContain('h-6');+ expect(pill.classList).toContain('border-transparent');+ expect(pill.classList).toContain('bg-transparent');+ expect(pill.classList).toContain('rounded-full');+ expect(pill.classList).toContain('not-disabled:hover:overlay-hover');++ await fireEvent.click(pill);+ expect(onEdit).toHaveBeenCalledOnce();+ });++ it('remains passive when the property is read-only', () => {+ render(() => (+ <PropertyRootContext.Provider value={context(false, property)}>+ <PropertyPill>Status</PropertyPill>+ </PropertyRootContext.Provider>+ ));++ const pill = screen.getByRole('button', { name: 'Status' });+ expect(pill.classList).not.toContain('not-disabled:hover:overlay-hover');+ expect(pill.getAttribute('aria-disabled')).toBe('true');+ expect(pill.dataset.readonly).toBe('');+ });++ it('mutes an empty property', () => {+ render(() => (+ <PropertyRootContext.Provider+ value={context(true, { ...property, value: null })}+ >+ <PropertyPill>Set status</PropertyPill>+ </PropertyRootContext.Provider>+ ));++ expect(screen.getByRole('button').classList).toContain(+ 'text-ink-extra-muted'+ );+ });+});diff --git a/apps/web/src/features/property/extractors/PropertyPill.tsx b/apps/web/src/features/property/extractors/PropertyPill.tsxnew file mode 100644index 0000000000..b18f4114a0--- /dev/null+++ b/apps/web/src/features/property/extractors/PropertyPill.tsx@@ -0,0 +1,55 @@+import {+ type BadgeSize,+ type BadgeVariant,+ badgeClasses,+ badgeTriggerClasses,+ cn,+} from '@ui';+import { splitProps } from 'solid-js';+import { useProperty } from '../core/context';+import { hasValue } from '../utils/typeGuards';+import {+ PropertyEditTrigger,+ type PropertyEditTriggerProps,+} from './PropertyEditTrigger';++export type PropertyPillProps = PropertyEditTriggerProps & {+ variant?: BadgeVariant;+ size?: BadgeSize;+};++/**+ * Canonical property-editor pill. It owns editability-aware interaction+ * styles while leaving property-specific icon, text, and caret composition to+ * its caller.+ */+export function PropertyPill(props: PropertyPillProps) {+ const ctx = useProperty();+ const [local, rest] = splitProps(props, ['variant', 'size', 'class']);+ const isReadOnly = () => !ctx.canEdit() || ctx.property().isMetadata;+ const isEmpty = () => !hasValue(ctx.property());++ const classes = () => {+ const options = {+ variant: local.variant ?? 'ghost',+ size: local.size ?? 'sm',+ class: cn(+ 'max-w-full text-left',+ isEmpty() && 'text-ink-extra-muted',+ local.class+ ),+ } as const;++ return isReadOnly() ? badgeClasses(options) : badgeTriggerClasses(options);+ };++ return (+ <PropertyEditTrigger+ data-slot="property-pill"+ data-readonly={isReadOnly() ? '' : undefined}+ aria-disabled={isReadOnly()}+ class={classes()}+ {...rest}+ />+ );+}diff --git a/apps/web/src/features/property/extractors/index.ts b/apps/web/src/features/property/extractors/index.tsindex 96578b98e6..957dff64ac 100644--- a/apps/web/src/features/property/extractors/index.ts+++ b/apps/web/src/features/property/extractors/index.ts@@ -1,10 +1,14 @@export { PropertyAddButton } from './PropertyAddButton';export { PropertyCaret } from './PropertyCaret';export { PropertyChips } from './PropertyChips';-export { PropertyEditTrigger } from './PropertyEditTrigger';+export {+ PropertyEditTrigger,+ type PropertyEditTriggerProps,+} from './PropertyEditTrigger';export { PropertyEmpty } from './PropertyEmpty';export { PropertyIcon } from './PropertyIcon';export { PropertyLabel } from './PropertyLabel';+export { PropertyPill, type PropertyPillProps } from './PropertyPill';export { PropertyRemoveButton } from './PropertyRemoveButton';export { PropertyText } from './PropertyText';export { PropertyTooltip } from './PropertyTooltip';diff --git a/apps/web/src/features/property/property.ts b/apps/web/src/features/property/property.tsindex 7458c0d5f4..026dcdd3ad 100644--- a/apps/web/src/features/property/property.ts+++ b/apps/web/src/features/property/property.ts@@ -29,6 +29,7 @@ import {PropertyEmpty,PropertyIcon,PropertyLabel,+ PropertyPill,PropertyRemoveButton,PropertyText,PropertyTooltip,@@ -52,6 +53,7 @@ export const Property = {// Behavior extractors — read from <Property.Root> context.Caret: PropertyCaret,EditTrigger: PropertyEditTrigger,+ Pill: PropertyPill,RemoveButton: PropertyRemoveButton,AddButton: PropertyAddButton,diff --git a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsxindex ccb71bdac0..58684ccc96 100644--- a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx+++ b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx@@ -30,7 +30,7 @@ import { isAccessiblePreviewItem, useItemPreview } from '@queries/preview';import { useBulkSaveEntityPropertiesMutation } from '@queries/properties/entity';import { useTagsQuery } from '@queries/properties/tags';import type { EntityType } from '@service-properties/generated/schemas/entityType';-import { Button, Layer } from '@ui';+import { Badge, Button, Layer } from '@ui';import { cn } from '@ui/utils/classname';import {createEffect,@@ -369,18 +369,17 @@ export function EntityPropertiesSection(props: EntityPropertiesSectionProps) {function AddPinnedPropertyButton() {const { openPropertySelector } = usePropertiesContext();return (- <button+ <Buttontype="button"+ variant="ghost"+ size="sm"+ noTouchResizeonClick={openPropertySelector}- class={cn(- 'inline-flex items-center gap-1.5 m-px border border-edge-muted bg-surface',- 'px-2 py-1 leading-tight rounded-full text-ink-muted',- 'hover:bg-hover hover:text-ink transition-colors'- )}+ class="m-px rounded-full"><Plus class="size-3" /><span>Add property</span>- </button>+ </Button>);}@@ -612,8 +611,6 @@ function SinglePill(props: {getEmptyLabel?: (property: Property) => JSX.Element | undefined;property: Property;}) {- const ctx = usePropertiesContext();- const isReadOnly = () => !ctx.canEdit || props.property.isMetadata;const empty = () => !hasValue(props.property);const isNonUserEntity = () =>props.property.valueType === 'ENTITY' &&@@ -632,11 +629,7 @@ function SinglePill(props: {return (<PropertyNS.Tooltip property={props.property}>- <PropertyNS.EditTrigger- class={cn(SidePanel.pillClass, 'w-fit overflow-hidden', {- 'hover:bg-hover': !isReadOnly(),- })}- >+ <PropertyNS.Pill class="w-fit overflow-hidden"><Showwhen={!empty()}fallback={@@ -663,27 +656,19 @@ function SinglePill(props: {<span class="min-w-0 truncate">{entityDisplay.name()}</span></Show></Show>- <Show when={!isReadOnly()}>- <PropertyNS.Caret />- </Show>- </PropertyNS.EditTrigger>+ <PropertyNS.Caret />+ </PropertyNS.Pill></PropertyNS.Tooltip>);}function UserStackPill(props: { property: Property }) {- const ctx = usePropertiesContext();- const isReadOnly = () => !ctx.canEdit || props.property.isMetadata;const empty = () => !hasValue(props.property);return (<PropertyNS.Tooltip property={props.property}><Layer depth={2}>- <PropertyNS.EditTrigger- class={cn(SidePanel.pillClass, 'w-fit bg-surface', {- 'hover:bg-hover': !isReadOnly(),- })}- >+ <PropertyNS.Pill class="w-fit"><Show when={!empty()} fallback={<SidePanel.EmptyPill />}><PropertyNS.UserStack property={props.property} maxUsers={3} /><span class="min-w-0 truncate">@@ -691,7 +676,7 @@ function UserStackPill(props: { property: Property }) {</span></Show><PropertyNS.Caret />- </PropertyNS.EditTrigger>+ </PropertyNS.Pill></Layer></PropertyNS.Tooltip>);@@ -719,31 +704,23 @@ function MultiValue(props: { property: Property }) {property={props.property}renderChip={(chip) => (<Layer depth={2}>- <span- class={cn(- SidePanel.pillClass,- 'text-xs max-w-35 bg-surface'- )}- >+ <Badge variant="ghost" size="sm" class="max-w-35"><PropertyValueIconoptionId={chip.key}class="size-3 shrink-0"/><span class="truncate">{chip.label}</span>- </span>+ </Badge></Layer>)}/><Show when={!isReadOnly()}>- <PropertyNS.EditTrigger- class={cn(- 'inline-flex items-center justify-center size-5 rounded-full',- 'text-ink-muted hover:bg-hover hover:text-ink transition-colors'- )}+ <PropertyNS.Pill+ class="size-6 p-0"aria-label={`Add ${props.property.displayName}`}><Plus class="size-3" />- </PropertyNS.EditTrigger>+ </PropertyNS.Pill></Show></div></Show>@@ -791,7 +768,9 @@ function NonUserEntityValue(props: { property: Property }) {when={!isReadOnly()}fallback={<Show when={entities().length === 0}>- <SidePanel.EmptyPill />+ <Badge variant="ghost" size="sm">+ <SidePanel.EmptyPill />+ </Badge></Show>}>@@ -801,7 +780,7 @@ function NonUserEntityValue(props: { property: Property }) {variant="ghost"depth={0}size="icon-sm"- class="size-5 rounded-full bg-surface"+ class="rounded-full"aria-label={`Add ${props.property.displayName}`}onClick={(event) => {event.stopPropagation();diff --git a/apps/web/src/features/property/tags/EntityRowTags.tsx b/apps/web/src/features/property/tags/EntityRowTags.tsxindex 3ed232f6e6..fce0bf1f76 100644--- a/apps/web/src/features/property/tags/EntityRowTags.tsx+++ b/apps/web/src/features/property/tags/EntityRowTags.tsx@@ -5,11 +5,12 @@ import PencilIcon from '@phosphor/pencil-simple.svg';import { useInFlightEntityPropertyOptions } from '@queries/properties/in-flight-options';import { EntityType } from '@service-properties/generated/schemas/entityType';import type { SoupProperty } from '@service-storage/generated/schemas/soupProperty';-import { Button, cn, HoverCard, Layer } from '@ui';+import { Button, badgeTriggerClasses, cn, HoverCard, Layer } from '@ui';import { createSignal, For, Match, Show, Switch } from 'solid-js';import { TagDot } from './TagDot';import { type EditableTag, TagEditorDialog } from './TagEditorDialog';import { TagPicker } from './TagPicker';+import { TagPill } from './TagPill';import { useDocTags, useSoupDocTags } from './useDocTags';import { type ResolvedTag, useSoupResolvedTags } from './useSoupResolvedTags';@@ -19,11 +20,6 @@ type CreateDocTags = () => DocTags;const DEFAULT_MAX_VISIBLE = 3;const MAX_OVERFLOW_DOTS = 3;-const chipClass = cn(- 'inline-flex items-center gap-1 shrink-0 max-w-[14ch]',- 'px-1.5 py-0.5 leading-tight rounded-full bg-surface text-ink-muted text-xs',- 'hover:text-ink'-);const hoverMenuLabelClass = 'min-w-0 max-w-[30ch] truncate';const hoverMenuIconButtonClass ='size-5 shrink-0 p-0.5 text-ink-extra-muted [&_:where(svg)]:size-3.5';@@ -199,16 +195,14 @@ function TagChip(props: {/>}>- <TagPicker+ <TagPill+ tag={props.tag}createDocTags={props.createDocTags}- triggerClass={chipClass}- triggerLabel={`Change or select tag ${props.tag.label}`}+ class="max-w-[14ch]"+ dotClass="size-2"onOpenChange={setPickerOpen}withClickBlock={props.withClickBlock}- >- <TagDot color={props.tag.color} class="size-2" />- <span class="min-w-0 truncate">{props.tag.label}</span>- </TagPicker>+ /></HoverCard></Layer>);@@ -247,7 +241,11 @@ function TagOverflow(props: {><TagPickercreateDocTags={props.createDocTags}- triggerClass={cn(chipClass, 'gap-1.5')}+ triggerClass={badgeTriggerClasses({+ variant: 'outline',+ size: 'sm',+ class: 'max-w-[14ch] gap-1.5',+ })}triggerLabel="Edit tags"onOpenChange={setPickerOpen}withClickBlock={props.withClickBlock}@@ -351,13 +349,15 @@ export function InlineTagsPill(props: {<Layer depth={2}><TagPickerdocTags={props.docTags}- triggerClass={cn(- 'inline-flex items-center gap-1.5 min-w-0 border border-edge-muted',- 'px-2 py-1 leading-tight text-left rounded-full bg-surface',- 'hover:bg-hover text-ink-muted focus-visible:bg-active focus-visible:ring-accent/10',- tags().length === 0 && 'text-ink-extra-muted',- props.class- )}+ triggerClass={badgeTriggerClasses({+ variant: 'outline',+ size: 'sm',+ class: cn(+ 'min-w-0 gap-1.5 text-left',+ tags().length === 0 && 'text-ink-extra-muted',+ props.class+ ),+ })}triggerLabel="Change or select tags"><Switch>diff --git a/apps/web/src/features/property/tags/TagEditorDialog.tsx b/apps/web/src/features/property/tags/TagEditorDialog.tsxindex de45fbfe16..cb3d7b944b 100644--- a/apps/web/src/features/property/tags/TagEditorDialog.tsx+++ b/apps/web/src/features/property/tags/TagEditorDialog.tsx@@ -289,7 +289,7 @@ export function TagEditorDialog(props: {Cancel</Button><Button- variant={canSubmit() ? 'active' : 'ghost'}+ variant={canSubmit() ? 'accent' : 'ghost'}depth={3}class="gap-3 rounded-lg border-0"disabled={!canSubmit() || pending()}diff --git a/apps/web/src/features/property/tags/TagPicker.tsx b/apps/web/src/features/property/tags/TagPicker.tsxindex ff53241d9f..6a2ae14fc7 100644--- a/apps/web/src/features/property/tags/TagPicker.tsx+++ b/apps/web/src/features/property/tags/TagPicker.tsx@@ -68,7 +68,11 @@ const MAX_LIST_HEIGHT = 192;const tagActionButtonClass ='size-5 shrink-0 p-0.5 text-ink-extra-muted opacity-0 group-hover:opacity-100 focus-visible:opacity-100 [&_:where(svg)]:size-3.5';-type TagPickerProps = {+export type TagPickerSourceProps =+ | { docTags: DocTags; createDocTags?: never }+ | { docTags?: never; createDocTags: () => DocTags };++export type TagPickerProps = {replaceTag?: ResolvedTag;triggerClass?: string;triggerLabel: string;@@ -79,10 +83,7 @@ type TagPickerProps = {* behind it. This matches inline property editors rendered in soup rows.*/withClickBlock?: boolean;-} & (- | { docTags: DocTags; createDocTags?: never }- | { docTags?: never; createDocTags: () => DocTags }-);+} & TagPickerSourceProps;export function TagPicker(props: TagPickerProps) {const [open, setOpen] = createSignal(false);diff --git a/apps/web/src/features/property/tags/TagPill.test.ts b/apps/web/src/features/property/tags/TagPill.test.tsnew file mode 100644index 0000000000..7a23155151--- /dev/null+++ b/apps/web/src/features/property/tags/TagPill.test.ts@@ -0,0 +1,24 @@+import { describe, expect, it, vi } from 'vitest';+import { tagPillClasses } from './TagPill';++vi.mock('./TagDot', () => ({ TagDot: () => null }));+vi.mock('./TagPicker', () => ({ TagPicker: () => null }));++describe('tagPillClasses', () => {+ it('uses the outline small Badge contract', () => {+ const classes = tagPillClasses().split(' ');++ expect(classes).toContain('h-6');+ expect(classes).toContain('text-xs');+ expect(classes).toContain('border-edge-muted');+ expect(classes).toContain('rounded-full');+ });++ it('merges layout constraints supplied by a tag owner', () => {+ const classes = tagPillClasses('m-px max-w-[14ch] gap-1.5');++ expect(classes).toContain('m-px');+ expect(classes).toContain('max-w-[14ch]');+ expect(classes).toContain('gap-1.5');+ });+});diff --git a/apps/web/src/features/property/tags/TagPill.tsx b/apps/web/src/features/property/tags/TagPill.tsxnew file mode 100644index 0000000000..abc54eb905--- /dev/null+++ b/apps/web/src/features/property/tags/TagPill.tsx@@ -0,0 +1,47 @@+import { badgeTriggerClasses, cn } from '@ui';+import { TagDot } from './TagDot';+import { TagPicker, type TagPickerSourceProps } from './TagPicker';+import type { ResolvedTag } from './useDocTags';++export type TagPillProps = TagPickerSourceProps & {+ tag: ResolvedTag;+ replaceTag?: ResolvedTag;+ class?: string;+ dotClass?: string;+ triggerLabel?: string;+ onOpenChange?: (open: boolean) => void;+ withClickBlock?: boolean;+};++/** Canonical classes for an interactive tag pill. */+export function tagPillClasses(className?: string): string {+ return badgeTriggerClasses({+ variant: 'outline',+ size: 'sm',+ class: cn('min-w-0 text-ink-muted transition-colors', className),+ });+}++/** A tag-owned picker trigger with the shared Badge visual contract. */+export function TagPill(props: TagPillProps) {+ const sourceProps = (): TagPickerSourceProps =>+ props.docTags+ ? { docTags: props.docTags }+ : { createDocTags: props.createDocTags };++ return (+ <TagPicker+ {...sourceProps()}+ replaceTag={props.replaceTag}+ triggerClass={tagPillClasses(props.class)}+ triggerLabel={+ props.triggerLabel ?? `Change or select tag ${props.tag.label}`+ }+ onOpenChange={props.onOpenChange}+ withClickBlock={props.withClickBlock}+ >+ <TagDot color={props.tag.color} class={props.dotClass} />+ <span class="min-w-0 truncate">{props.tag.label}</span>+ </TagPicker>+ );+}diff --git a/apps/web/src/features/property/tags/TagsRow.tsx b/apps/web/src/features/property/tags/TagsRow.tsxindex 90f59072b7..178fd9be26 100644--- a/apps/web/src/features/property/tags/TagsRow.tsx+++ b/apps/web/src/features/property/tags/TagsRow.tsx@@ -7,7 +7,7 @@ import PencilIcon from '@phosphor/pencil-simple.svg';import PlusIcon from '@phosphor/plus.svg';import XIcon from '@phosphor/x.svg';import type { EntityType } from '@service-properties/generated/schemas/entityType';-import { cn, Layer } from '@ui';+import { Badge, badgeTriggerClasses, Layer } from '@ui';import { createSignal, For, Match, Show, Switch } from 'solid-js';import { TagDot } from './TagDot';import {@@ -16,6 +16,7 @@ import {type TagEditorDialogMode,} from './TagEditorDialog';import { TagPicker } from './TagPicker';+import { TagPill } from './TagPill';import {buildTaggedItemsSplitContent,buildTaggedItemsSplitOptions,@@ -23,12 +24,6 @@ import {import type { ResolvedTag } from './useDocTags';import { useDocTags } from './useDocTags';-const chipClass = cn(- 'inline-flex items-center gap-1.5 m-px min-w-0 max-w-[30ch]',- 'px-2 py-1 leading-tight rounded-full border border-edge-muted bg-surface',- 'text-ink-muted transition-colors hover:bg-hover hover:text-ink'-);-function TagChip(props: {tag: ResolvedTag;docTags: ReturnType<typeof useDocTags>;@@ -56,21 +51,22 @@ function TagChip(props: {<Showwhen={props.canEdit}fallback={- <span class={cn(chipClass, 'cursor-default hover:bg-surface')}>+ <Badge+ variant="outline"+ size="sm"+ class="m-px min-w-0 max-w-[30ch] gap-1.5 cursor-default"+ ><TagDot color={props.tag.color} /><span class="min-w-0 truncate">{props.tag.label}</span>- </span>+ </Badge>}>- <TagPicker+ <TagPill+ tag={props.tag}docTags={props.docTags}replaceTag={props.tag}- triggerClass={chipClass}- triggerLabel={`Change or select tag ${props.tag.label}`}- >- <TagDot color={props.tag.color} />- <span class="min-w-0 truncate">{props.tag.label}</span>- </TagPicker>+ class="m-px max-w-[30ch] gap-1.5"+ /></Show></ContextMenu.Trigger><ContextMenu.Portal>@@ -155,11 +151,11 @@ export function TagsRow(props: {<Match when={triggerVariant() === 'pill' && !hasTags()}><TagPickerdocTags={docTags}- triggerClass={cn(- 'inline-flex items-center gap-1.5 m-px border border-edge-muted bg-surface',- 'px-2 py-1 leading-tight rounded-full text-ink-muted',- 'hover:bg-hover hover:text-ink transition-colors'- )}+ triggerClass={badgeTriggerClasses({+ variant: 'outline',+ size: 'sm',+ class: 'm-px gap-1.5',+ })}triggerLabel="Add tags"><PlusIcon class="size-3" />@@ -169,11 +165,11 @@ export function TagsRow(props: {<Match when={true}><TagPickerdocTags={docTags}- triggerClass={cn(- 'inline-flex items-center justify-center rounded-full px-1 py-1 leading-tight',- 'm-px border border-edge-muted bg-surface text-ink-muted',- 'transition-colors hover:bg-hover hover:text-ink'- )}+ triggerClass={badgeTriggerClasses({+ variant: 'outline',+ size: 'sm',+ class: 'm-px size-6 p-0',+ })}triggerLabel="Add tags"><PlusIcon class="size-3" />diff --git a/apps/web/src/features/property/tags/index.ts b/apps/web/src/features/property/tags/index.tsindex a219080936..917993232c 100644--- a/apps/web/src/features/property/tags/index.ts+++ b/apps/web/src/features/property/tags/index.ts@@ -9,7 +9,13 @@ export {isTaggableEntityType,tagEntityType,} from './entityTagging';-export { TagPicker, TagPickerPopover } from './TagPicker';+export {+ TagPicker,+ TagPickerPopover,+ type TagPickerProps,+ type TagPickerSourceProps,+} from './TagPicker';+export { TagPill, type TagPillProps, tagPillClasses } from './TagPill';export { TagsRow } from './TagsRow';export { DEFAULT_TAG_COLOR, TAG_COLORS } from './tagColors';export {diff --git a/apps/web/src/features/reminders/ReminderComposerModal.tsx b/apps/web/src/features/reminders/ReminderComposerModal.tsxindex 407ae89017..9c6bfd7e26 100644--- a/apps/web/src/features/reminders/ReminderComposerModal.tsx+++ b/apps/web/src/features/reminders/ReminderComposerModal.tsx@@ -612,7 +612,7 @@ function DescriptionStep(props: {label="Cancel"/><Button- variant="active"+ variant="accent"size="sm"depth={3}class="ml-auto gap-3 rounded-lg border-0"@@ -950,7 +950,7 @@ function RepeatStep(props: {<CommandMenuShell.Footer class="gap-3 py-3"><span class="text-xs text-ink-muted truncate">{summary()}</span><Button- variant="active"+ variant="accent"size="sm"depth={3}class="ml-auto gap-3 rounded-lg border-0"diff --git a/apps/web/src/features/settings/Account.tsx b/apps/web/src/features/settings/Account.tsxindex 81364912b6..dd89d1a33e 100644--- a/apps/web/src/features/settings/Account.tsx+++ b/apps/web/src/features/settings/Account.tsx@@ -287,7 +287,7 @@ function ProfilePictureRow(props: { userId: string }) {</Dialog.Description><div class="pt-3 justify-end items-center gap-3 inline-flex"><Button- variant="base"+ variant="outline"depth={3}disabled={isRemoving()}onClick={() => setShowRemoveConfirmModal(false)}@@ -474,7 +474,7 @@ export function Account() {<div class="px-6 py-3.5"><ButtonfullWidth- variant="active"+ variant="accent"depth={4}onClick={() => logout()}>@@ -577,7 +577,7 @@ export function Account() {</div><div class="pt-3 justify-end items-center gap-3 inline-flex"><Button- variant="base"+ variant="outline"depth={3}onClick={() => {setShowDeleteModal(false);@@ -622,7 +622,7 @@ export function Account() {</Dialog.Description><div class="pt-3 justify-end items-center gap-3 inline-flex"><Button- variant="base"+ variant="outline"depth={3}disabled={isDeleting()}onClick={() => {@@ -872,7 +872,7 @@ function BundleUpdateRow() {</span><Show when={action()}>{(a) => (- <Button variant="active" size="sm" depth={3} onClick={a().action}>+ <Button variant="accent" size="sm" depth={3} onClick={a().action}>{a().label}</Button>)}diff --git a/apps/web/src/features/settings/Admin.tsx b/apps/web/src/features/settings/Admin.tsxindex ce82e4aa41..fafa22b2e3 100644--- a/apps/web/src/features/settings/Admin.tsx+++ b/apps/web/src/features/settings/Admin.tsx@@ -48,7 +48,7 @@ export function Admin() {description="Local toggles for debugging — only visible to Macro staff."actions={<Button- variant="base"+ variant="outline"size="sm"depth={3}disabled={!hasActiveSettings()}diff --git a/apps/web/src/features/settings/Billing.tsx b/apps/web/src/features/settings/Billing.tsxindex d2941cc744..64a28cbe36 100644--- a/apps/web/src/features/settings/Billing.tsx+++ b/apps/web/src/features/settings/Billing.tsx@@ -154,7 +154,7 @@ export const Billing = () => {class="ml-auto rounded-full bg-active"size="sm"depth={2}- variant="base"+ variant="outline"onClick={handleManage}>Managediff --git a/apps/web/src/features/settings/Crm.tsx b/apps/web/src/features/settings/Crm.tsxindex b00941f265..aca2958177 100644--- a/apps/web/src/features/settings/Crm.tsx+++ b/apps/web/src/features/settings/Crm.tsx@@ -168,7 +168,12 @@ function CrmEnablementSection() {fallback={<Tooltip label="Only team admins can change CRM settings."><span>- <Button variant="base" size="sm" class="rounded-xs" disabled>+ <Button+ variant="outline"+ size="sm"+ class="rounded-xs"+ disabled+ >Admins only</Button></span>@@ -180,7 +185,7 @@ function CrmEnablementSection() {<SpinnerIcon class="size-4 animate-spin text-ink-muted" /></Show><Button- variant={crmEnabled() ? 'danger' : 'active'}+ variant={crmEnabled() ? 'danger' : 'accent'}size="sm"class="rounded-xs"disabled={patchCrmMutation.isPending}@@ -221,7 +226,7 @@ function CrmEnablementSection() {Cancel</Button><Button- variant="base"+ variant="outline"class="rounded-xs"disabled={patchCrmMutation.isPending}onClick={() => handleEnable(false)}@@ -236,7 +241,7 @@ function CrmEnablementSection() {</Show></Button><Button- variant="active"+ variant="accent"class="rounded-xs"disabled={patchCrmMutation.isPending}onClick={() => handleEnable(true)}diff --git a/apps/web/src/features/settings/Cursor.tsx b/apps/web/src/features/settings/Cursor.tsxindex d9f1c54027..a238e7beac 100644--- a/apps/web/src/features/settings/Cursor.tsx+++ b/apps/web/src/features/settings/Cursor.tsx@@ -122,7 +122,7 @@ export function CursorCard() {}}/><Button- variant="base"+ variant="outline"size="sm"depth={3}disabled={apiKey().length === 0 || saveKey.isPending}diff --git a/apps/web/src/features/settings/Email.tsx b/apps/web/src/features/settings/Email.tsxindex f3939ad9ad..44760f8ed5 100644--- a/apps/web/src/features/settings/Email.tsx+++ b/apps/web/src/features/settings/Email.tsx@@ -247,7 +247,7 @@ export function EmailCard() {><Tooltip label="Add inbox"><Button- variant="base"+ variant="outline"size="icon-sm"depth={3}aria-label="Add inbox"@@ -299,7 +299,7 @@ export function EmailCard() {</Dialog.Description><div class="pt-3 justify-end items-center gap-3 inline-flex"><Button- variant="base"+ variant="outline"depth={3}onClick={() => setRemoveTarget(null)}>@@ -399,7 +399,7 @@ function DisabledPrimaryRow(props: { email: string; onEnable: () => void }) {</div><span class="text-xs text-ink-muted">Sync disabled</span></div>- <Button variant="base" size="sm" depth={3} onClick={props.onEnable}>+ <Button variant="outline" size="sm" depth={3} onClick={props.onEnable}>Enable</Button></div>@@ -485,7 +485,7 @@ function InboxRow(props: {<Show when={emailSignaturesFlag().enabled && props.isOwn}><Tooltip label="Edit signature"><Button- variant="base"+ variant="outline"size="icon-sm"depth={3}onClick={() => toggleSignatureExpanded(props.link.id)}@@ -504,7 +504,7 @@ function InboxRow(props: {}><Button- variant="active"+ variant="accent"size="sm"depth={3}onClick={props.onReconnect}@@ -521,7 +521,7 @@ function InboxRow(props: {when={calendarUiEnabled() && props.link.needs_calendar_permission}><Button- variant="active"+ variant="accent"size="sm"depth={3}onClick={props.onEnableCalendar}@@ -545,7 +545,7 @@ function InboxRow(props: {><Tooltip label="Turn off calendar"><Button- variant="base"+ variant="outline"size="icon-sm"depth={3}onClick={props.onTurnOffCalendar}@@ -558,7 +558,7 @@ function InboxRow(props: {<Show when={ENABLE_INBOX_RESYNC}><Tooltip label="Force sync"><Button- variant="base"+ variant="outline"size="icon-sm"depth={3}disabled={@@ -575,7 +575,7 @@ function InboxRow(props: {</Show><Tooltip label="Remove inbox"><Button- variant="base"+ variant="outline"size="icon-sm"depth={3}onClick={props.onRemove}diff --git a/apps/web/src/features/settings/Integrations.tsx b/apps/web/src/features/settings/Integrations.tsxindex 5f5e989dda..79c6ad6c20 100644--- a/apps/web/src/features/settings/Integrations.tsx+++ b/apps/web/src/features/settings/Integrations.tsx@@ -134,7 +134,7 @@ function AddServerForm(props: {<div class="flex justify-end gap-2 pt-1"><Button- variant="base"+ variant="outline"size="sm"depth={3}onClick={() => {@@ -145,7 +145,7 @@ function AddServerForm(props: {Cancel</Button><Button- variant="active"+ variant="accent"size="sm"depth={3}disabled={@@ -281,7 +281,7 @@ function ServerRow(props: { server: ServerResponse }) {</span></Show><Button- variant="active"+ variant="accent"size="sm"depth={3}disabled={authMutation.isPending}@@ -320,7 +320,7 @@ function ServerRow(props: { server: ServerResponse }) {{deleteMutation.isPending ? 'Removing...' : 'Confirm'}</Button><Button- variant="base"+ variant="outline"size="sm"depth={3}onClick={() => setConfirmDelete(false)}@@ -331,7 +331,7 @@ function ServerRow(props: { server: ServerResponse }) {}><Button- variant="base"+ variant="outline"size="sm"depth={3}tooltip="Remove"@@ -413,7 +413,7 @@ export function IntegrationsSection() {description="Connect MCP servers to give Macro's agent access to the tools your team already uses."actions={<Button- variant="base"+ variant="outline"size="sm"depth={3}onClick={() => setShowAddDialog(true)}@@ -428,7 +428,7 @@ export function IntegrationsSection() {<div class="px-6 py-8 text-center text-sm text-ink-muted">Failed to load integrations.<Button- variant="base"+ variant="outline"size="sm"depth={3}onClick={() => serversQuery.refetch()}diff --git a/apps/web/src/features/settings/PipedreamIntegrations.tsx b/apps/web/src/features/settings/PipedreamIntegrations.tsxindex fe0922b532..c23c950e53 100644--- a/apps/web/src/features/settings/PipedreamIntegrations.tsx+++ b/apps/web/src/features/settings/PipedreamIntegrations.tsx@@ -88,7 +88,7 @@ function ServerRow(props: { server: PipedreamConnectionResponse }) {{deleteMutation.isPending ? 'Removing...' : 'Confirm'}</Button><Button- variant="base"+ variant="outline"size="sm"depth={3}onClick={() => setConfirmDelete(false)}@@ -99,7 +99,7 @@ function ServerRow(props: { server: PipedreamConnectionResponse }) {}><Button- variant="base"+ variant="outline"size="sm"depth={3}tooltip="Remove"@@ -170,7 +170,7 @@ export function PipedreamIntegrationsSection() {<div class="px-6 py-8 text-center text-sm text-ink-muted">Failed to load integrations.<Button- variant="base"+ variant="outline"size="sm"depth={3}onClick={() => serversQuery.refetch()}@@ -205,7 +205,7 @@ export function PipedreamIntegrationsSection() {<div class="px-6 py-6 text-center text-sm text-ink-muted">Couldn't load the connector catalog.<Button- variant="base"+ variant="outline"size="sm"depth={3}onClick={() => catalogQuery.refetch()}@@ -242,7 +242,7 @@ export function PipedreamIntegrationsSection() {<Show when={catalogQuery.hasNextPage}><div class="px-4 py-3 text-center"><Button- variant="base"+ variant="outline"size="sm"depth={3}disabled={catalogQuery.isFetchingNextPage}diff --git a/apps/web/src/features/settings/SignatureSection.tsx b/apps/web/src/features/settings/SignatureSection.tsxindex 758cf55418..320ab2be00 100644--- a/apps/web/src/features/settings/SignatureSection.tsx+++ b/apps/web/src/features/settings/SignatureSection.tsx@@ -204,7 +204,7 @@ export function SignatureSection(props: { link: EmailLink }) {/><div class="flex items-center justify-end gap-2"><Button- variant="base"+ variant="outline"size="sm"depth={3}disabled={!hasContent() || updateSettings.isPending}@@ -214,7 +214,7 @@ export function SignatureSection(props: { link: EmailLink }) {</Button><Show when={!isMobile()}><Button- variant="active"+ variant="accent"size="sm"depth={3}disabled={!isDirty() || updateSettings.isPending}diff --git a/apps/web/src/features/settings/Tags.tsx b/apps/web/src/features/settings/Tags.tsxindex 7a9e14fe4f..0c29677e6f 100644--- a/apps/web/src/features/settings/Tags.tsx+++ b/apps/web/src/features/settings/Tags.tsx@@ -84,7 +84,7 @@ function TagListSection(props: {description={props.description}actions={<Button- variant="base"+ variant="outline"size="sm"class="rounded-xs"onClick={() => props.onCreate(props.scope)}@@ -212,7 +212,7 @@ function ConfirmDialog(props: {Cancel</Button><Button- variant="active"+ variant="accent"class="rounded-xs"disabled={props.pending}onClick={props.onConfirm}diff --git a/apps/web/src/features/settings/Team.tsx b/apps/web/src/features/settings/Team.tsxindex 5c2d15184e..06fb58104b 100644--- a/apps/web/src/features/settings/Team.tsx+++ b/apps/web/src/features/settings/Team.tsx@@ -182,7 +182,7 @@ function InviteEntryRow(props: {<Show when={props.showRemove}><Tooltip label="Remove"><Button- variant="base"+ variant="outline"size="icon-sm"class="rounded-xs shrink-0 focus:border-accent"tabIndex={0}@@ -300,7 +300,7 @@ function InviteEmailsInput(props: {</div></Show><Button- variant="base"+ variant="outline"class="rounded-xs w-full justify-center focus:border-accent"tabIndex={0}disabled={!canAddRow()}@@ -495,7 +495,7 @@ function UserInviteRow(props: {</div><div class="flex items-center gap-2 shrink-0"><Button- variant="base"+ variant="outline"class="px-2 py-1 rounded-xs"disabled={props.isAccepting || props.isDeclining}onClick={props.onDecline}@@ -505,7 +505,7 @@ function UserInviteRow(props: {</Show></Button><Button- variant="active"+ variant="accent"class="px-2 py-1 rounded-xs"disabled={props.isAccepting || props.isDeclining}onClick={props.onAccept}@@ -700,7 +700,7 @@ function CreateTeamDialog(props: { open: boolean; onClose: () => void }) {Cancel</Button><Button- variant="active"+ variant="accent"class="rounded-xs"disabled={createTeamMutation.isPending ||@@ -737,7 +737,7 @@ function EmptyTeamState() {together.</p><Button- variant="active"+ variant="accent"class="rounded-xs"onClick={() => setShowCreateModal(true)}>@@ -790,7 +790,7 @@ function SaveCancelButtons(props: {<div class="flex items-center gap-1 shrink-0"><Tooltip label="Save"><Button- variant="active"+ variant="accent"size="icon-sm"class="rounded-xs"disabled={props.saveDisabled}@@ -1285,7 +1285,7 @@ function TeamManagement(props: {hideDescriptionOnMobile><Button- variant="base"+ variant="outline"size="sm"class="rounded-xs"onClick={handleCopyGithubAutolinkUrl}@@ -1389,7 +1389,7 @@ function TeamManagement(props: {// to admins; removals stay admin-only.<Show when={isAdminOrOwner() || allowNonAdminInvites()}><Button- variant="base"+ variant="outline"size="sm"class="rounded-xs"onClick={() => setShowInviteModal(true)}@@ -1677,7 +1677,7 @@ function TeamManagement(props: {Cancel</Button><Button- variant={hasValidInvites() ? 'active' : 'ghost'}+ variant={hasValidInvites() ? 'accent' : 'ghost'}class="rounded-xs"disabled={!hasValidInvites() || inviteToTeamMutation.isPending}onClick={handleInvite}diff --git a/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx b/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsxindex 52b4c58404..99d8bf6278 100644--- a/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx+++ b/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx@@ -165,7 +165,7 @@ function NoInviteId() {This invite link appears to be invalid or incomplete.</p><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={() => navigate('/')}@@ -187,7 +187,7 @@ function UnauthenticatedView(props: { onLogin: () => void }) {Sign in or create an account to view and accept this team invitation.</p><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={props.onLogin}@@ -212,7 +212,7 @@ function AlreadyOnTeam(props: { teamName: string }) {to do here.</p><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={() => navigate('/')}@@ -233,7 +233,7 @@ function InviteNotFound() {a different email address.</p><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={() => navigate('/')}@@ -277,7 +277,7 @@ function InviteDetails(props: {<div class="flex flex-col gap-2 w-full"><Button- variant="base"+ variant="outline"size="md"class="w-full rounded-xs"onClick={props.onAccept}diff --git a/apps/web/src/features/team-invitations/invite-modal.tsx b/apps/web/src/features/team-invitations/invite-modal.tsxindex 5886699a03..256a0f505d 100644--- a/apps/web/src/features/team-invitations/invite-modal.tsx+++ b/apps/web/src/features/team-invitations/invite-modal.tsx@@ -104,7 +104,7 @@ export const InviteModal = () => {<ButtononClick={handleSend}variant={- sending() || !parseEmails(value()).length ? 'ghost' : 'active'+ sending() || !parseEmails(value()).length ? 'ghost' : 'accent'}disabled={sending() || !parseEmails(value()).length}class="rounded-xs font-semibold"@@ -131,7 +131,7 @@ export const InviteModal = () => {type="button"onClick={handleCopy}size="md"- variant="base"+ variant="outline"class="font-medium rounded-xs border px-2"><ClipboardIcon class="size-3" />diff --git a/apps/web/src/features/theme/components/ThemeEdit3.tsx b/apps/web/src/features/theme/components/ThemeEdit3.tsxindex 214b998e9d..224885198a 100644--- a/apps/web/src/features/theme/components/ThemeEdit3.tsx+++ b/apps/web/src/features/theme/components/ThemeEdit3.tsx@@ -218,7 +218,7 @@ export default function ThemeEdit3() {class="h-9 min-w-48 flex-1 rounded-md border border-edge-muted bg-surface px-3 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"/>- <Button variant="base" size="md" onClick={copyTheme}>+ <Button variant="outline" size="md" onClick={copyTheme}><ClipboardIcon class="size-4" />Copy full theme JSON</Button>diff --git a/apps/web/src/features/theme/components/ThemeEditor.tsx b/apps/web/src/features/theme/components/ThemeEditor.tsxindex b2c8b57d03..27ba1c8b0c 100644--- a/apps/web/src/features/theme/components/ThemeEditor.tsx+++ b/apps/web/src/features/theme/components/ThemeEditor.tsx@@ -46,7 +46,7 @@ export function ThemeEditor(props: {<ThemeTokenEditor /></div><div class="flex justify-end">- <Button variant="base" size="sm" onClick={props.onSave}>+ <Button variant="outline" size="sm" onClick={props.onSave}>Save theme</Button></div>diff --git a/apps/web/src/features/theme/signals/themeReactive.ts b/apps/web/src/features/theme/signals/themeReactive.tsindex 2f322e478a..4e1fa07672 100644--- a/apps/web/src/features/theme/signals/themeReactive.ts+++ b/apps/web/src/features/theme/signals/themeReactive.ts@@ -186,10 +186,16 @@ createEffect(jamTransition();if (themeReactive.a0.l[0]() !== previousTheme.a0.l) {+ const accentContrastLightness =+ themeReactive.a0.l[0]() < 0.72 ? 0.97 : 0.2;document.documentElement.style.setProperty('--a0l',`${themeReactive.a0.l[0]()}`);+ document.documentElement.style.setProperty(+ '--accent-contrast-l',+ `${accentContrastLightness}`+ );previousTheme.a0.l = themeReactive.a0.l[0]();}if (themeReactive.a0.c[0]() !== previousTheme.a0.c) {diff --git a/apps/web/src/index.css b/apps/web/src/index.cssindex ee1837b5bc..ec6422bb2d 100644--- a/apps/web/src/index.css+++ b/apps/web/src/index.css@@ -53,6 +53,9 @@@property --c4c { syntax: "<number>"; inherits: true; initial-value: 0; }@property --c4h { syntax: "<angle>"; inherits: true; initial-value: 14deg; }+/* Foreground lightness selected for readable content on the active accent. */+@property --accent-contrast-l { syntax: "<number>"; inherits: true; initial-value: 0.2; }+@property --safe-bottom { syntax: "<length>"; inherits: true; initial-value: 0px; }@property --safe-right { syntax: "<length>"; inherits: true; initial-value: 0px; }@property --safe-left { syntax: "<length>"; inherits: true; initial-value: 0px; }@@ -217,6 +220,8 @@ body.tauri-ios {--color-edge: var(--color-surface-4);--color-edge-muted: var(--color-surface-3);--color-accent: var(--a0);+ --color-accent-contrast: oklch(var(--accent-contrast-l) var(--c0c) var(--c0h));+ --color-accent-contrast-muted: oklch(var(--accent-contrast-l) var(--c0c) var(--c0h) / 0.7);--color-red: oklch(63.7% 0.237 25.331);--color-orange: oklch(70.5% 0.213 47.604);--color-amber: oklch(76.9% 0.188 70.08);diff --git a/apps/web/src/lib/core/component/AI/component/AIChatEmptyState.tsx b/apps/web/src/lib/core/component/AI/component/AIChatEmptyState.tsxindex 29e4396d71..9bd981547c 100644--- a/apps/web/src/lib/core/component/AI/component/AIChatEmptyState.tsx+++ b/apps/web/src/lib/core/component/AI/component/AIChatEmptyState.tsx@@ -30,7 +30,7 @@ export function AiChatEmptyState() {<div class="flex items-center justify-between gap-3 border-b border-edge-muted px-4 py-2"><span class="text-sm text-ink-muted">{item.label}</span><Button- variant={copiedKey() === item.key ? 'base' : 'ghost'}+ variant={copiedKey() === item.key ? 'outline' : 'ghost'}size="sm"class="shrink-0"onClick={() => copy(item.key, item.command)}@@ -66,7 +66,7 @@ export function AiChatEmptyState() {Paste under `mcpServers`</span><Button- variant={copiedKey() === 'json' ? 'base' : 'ghost'}+ variant={copiedKey() === 'json' ? 'outline' : 'ghost'}size="sm"class="shrink-0"onClick={() => copy('json', MACRO_MCP_CONFIG)}diff --git a/apps/web/src/lib/core/component/AI/component/McpSetupCards.tsx b/apps/web/src/lib/core/component/AI/component/McpSetupCards.tsxindex 7c545d7253..5718030647 100644--- a/apps/web/src/lib/core/component/AI/component/McpSetupCards.tsx+++ b/apps/web/src/lib/core/component/AI/component/McpSetupCards.tsx@@ -51,7 +51,7 @@ function CollapsibleCard(props: {(borderless pill) once that refactor lands — deferred out of theempty-states styling PR to keep it focused. */}<Button- variant={isCopied() ? 'base' : 'ghost'}+ variant={isCopied() ? 'outline' : 'ghost'}size="sm"class="shrink-0"onClick={() => props.onCopy(props.copyKey, props.copyValue)}diff --git a/apps/web/src/lib/core/component/AI/component/debug/Attachment.tsx b/apps/web/src/lib/core/component/AI/component/debug/Attachment.tsxindex 0377d06a8b..d9d0de4f6e 100644--- a/apps/web/src/lib/core/component/AI/component/debug/Attachment.tsx+++ b/apps/web/src/lib/core/component/AI/component/debug/Attachment.tsx@@ -112,7 +112,7 @@ export default function DebugAttachments() {<div class="flex flex-1 justify-center w-full"><div class="w-4/5 grid grid-cols-2 border border-accent divide-accent divide-y divide-x"><Item>- <Button variant="active" onClick={sendAll}>+ <Button variant="accent" onClick={sendAll}>Send All</Button></Item>@@ -207,7 +207,7 @@ function RequestDebugger(props: {return (<Item label={props.label} col class="max-h-150 overflow-y-auto"><Button- variant="active"+ variant="accent"onClick={() => {makeRequest();}}diff --git a/apps/web/src/lib/core/component/AI/component/debug/Component.tsx b/apps/web/src/lib/core/component/AI/component/debug/Component.tsxindex 1831a2c037..80a1e69b2c 100644--- a/apps/web/src/lib/core/component/AI/component/debug/Component.tsx+++ b/apps/web/src/lib/core/component/AI/component/debug/Component.tsx@@ -101,10 +101,10 @@ function ChatInputBoxInner() {<Item label="Chat input - not connected to backend"><div class="size-full"><div class="flex gap-2 py-2">- <Button onClick={() => input.setIsGenerating(true)} variant="active">+ <Button onClick={() => input.setIsGenerating(true)} variant="accent">Generate</Button>- <Button onClick={() => input.setIsGenerating(false)} variant="active">+ <Button onClick={() => input.setIsGenerating(false)} variant="accent">Stop</Button></div>@@ -471,7 +471,7 @@ function ProviderFailureDemoBody(props: {if (e.key === 'Enter') send();}}/>- <Button variant="active" onClick={send}>+ <Button variant="accent" onClick={send}>Send</Button></div>@@ -678,10 +678,10 @@ function TableStreamInner() {return (<Item col label="Table stream with controls"><div class="flex gap-x-2 items-center">- <Button onClick={startStream} variant="active">+ <Button onClick={startStream} variant="accent">Stream</Button>- <Button onClick={() => setIsPaused((p) => !p)} variant="active">+ <Button onClick={() => setIsPaused((p) => !p)} variant="accent">{isPaused() ? 'Resume' : 'Pause'}</Button><label class="flex items-center gap-x-1 text-xs">@@ -701,7 +701,7 @@ function TableStreamInner() {Raw</label><Button- variant="active"+ variant="accent"onClick={() => {setStream(undefined);setRawText('');diff --git a/apps/web/src/lib/core/component/AI/component/debug/HttpStream.tsx b/apps/web/src/lib/core/component/AI/component/debug/HttpStream.tsxindex 7de24fdf93..308c4defa5 100644--- a/apps/web/src/lib/core/component/AI/component/debug/HttpStream.tsx+++ b/apps/web/src/lib/core/component/AI/component/debug/HttpStream.tsx@@ -166,7 +166,7 @@ export default function HttpStreamDebug() {<div class="flex gap-2"><ButtononClick={sendMessage}- variant="active"+ variant="accent"disabled={isStreaming()}>{isStreaming() ? 'Streaming...' : 'Send Message'}@@ -179,7 +179,7 @@ export default function HttpStreamDebug() {setError(null);setIsStreaming(false);}}- variant="base"+ variant="outline">Reset</Button>diff --git a/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsx b/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsxindex e6e4ffbb43..b4a3b3f167 100644--- a/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsx+++ b/apps/web/src/lib/core/component/AI/component/debug/StaticMarkdownStream.tsx@@ -200,7 +200,7 @@ export default function StaticMarkdownStreamDebug() {</div><div class="flex items-center gap-2"><Button- variant="active"+ variant="accent"size="sm"onClick={startStream}disabled={isStreaming()}@@ -209,7 +209,7 @@ export default function StaticMarkdownStreamDebug() {Stream</Button><Button- variant="base"+ variant="outline"size="sm"onClick={stopRun}disabled={!isStreaming()}diff --git a/apps/web/src/lib/core/component/AI/component/debug/stream/StreamDebugger.tsx b/apps/web/src/lib/core/component/AI/component/debug/stream/StreamDebugger.tsxindex 7ed7618b59..2c477928e0 100644--- a/apps/web/src/lib/core/component/AI/component/debug/stream/StreamDebugger.tsx+++ b/apps/web/src/lib/core/component/AI/component/debug/stream/StreamDebugger.tsx@@ -49,12 +49,12 @@ function StreamDebuggerWithControlsInner(props: {setStream(stream);chat.setStream(stream);}}- variant="active"+ variant="accent">Stream</Button><Button- variant="active"+ variant="accent"onClick={() => {setStream(undefined);chat.setMessages([]);diff --git a/apps/web/src/lib/core/component/AI/component/input/useAiDataConsent.tsx b/apps/web/src/lib/core/component/AI/component/input/useAiDataConsent.tsxindex 82cf5b432c..e34fd802d3 100644--- a/apps/web/src/lib/core/component/AI/component/input/useAiDataConsent.tsx+++ b/apps/web/src/lib/core/component/AI/component/input/useAiDataConsent.tsx@@ -56,10 +56,10 @@ export function useAiDataConsentGate() {data is not retained or used for training.</p><div class="flex justify-end mt-4 gap-2">- <Button variant="base" onClick={denyConsent}>+ <Button variant="outline" onClick={denyConsent}>Cancel</Button>- <Button variant="base" onClick={grantConsent}>+ <Button variant="outline" onClick={grantConsent}>Accept</Button></div>diff --git a/apps/web/src/lib/core/component/DocumentPreview.tsx b/apps/web/src/lib/core/component/DocumentPreview.tsxindex 6cebd8c270..23fbab54f6 100644--- a/apps/web/src/lib/core/component/DocumentPreview.tsx+++ b/apps/web/src/lib/core/component/DocumentPreview.tsx@@ -58,7 +58,7 @@ import { blockNameToItemType } from '@service-storage/client';import { fetchBinary } from '@service-storage/util/fetchBinary';import { createCallback } from '@solid-primitives/rootless';import { useNavigate } from '@solidjs/router';-import { cn, Layer, Surface, Tooltip } from '@ui';+import { Badge, cn, Layer, Surface, Tooltip } from '@ui';import type { Component, JSX } from 'solid-js';import {createEffect,@@ -433,11 +433,10 @@ function PreviewPropertyPill(props: {return (<Property.Root property={props.property}><Layer depth={2}>- <div- class={cn(- 'inline-flex items-center gap-1.5 min-w-0 max-w-full border border-edge-muted',- 'px-2 py-1 leading-tight text-left rounded-full bg-surface'- )}+ <Badge+ variant="ghost"+ size="sm"+ class="min-w-0 max-w-full gap-1.5 text-left"><Switchfallback={@@ -455,7 +454,7 @@ function PreviewPropertyPill(props: {</Match></Switch><Property.Text property={props.property} class="truncate" />- </div>+ </Badge></Layer></Property.Root>);diff --git a/apps/web/src/lib/core/component/EmailPermissionsBanner.tsx b/apps/web/src/lib/core/component/EmailPermissionsBanner.tsxindex a0c159955a..6bf9038c21 100644--- a/apps/web/src/lib/core/component/EmailPermissionsBanner.tsx+++ b/apps/web/src/lib/core/component/EmailPermissionsBanner.tsx@@ -13,7 +13,7 @@ export function EmailPermissionsBanner() {<div class="text-sm shrink-0">No email account connected.</div><span class="grow" /><Button- variant="active"+ variant="accent"size="sm"class="px-4"onClick={() => void startAddInbox()}diff --git a/apps/web/src/lib/core/component/ForwardToChannel.tsx b/apps/web/src/lib/core/component/ForwardToChannel.tsxindex 716a3b9ccf..db4de3ac5d 100644--- a/apps/web/src/lib/core/component/ForwardToChannel.tsx+++ b/apps/web/src/lib/core/component/ForwardToChannel.tsx@@ -597,7 +597,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {Cancel</Button><Button- variant={selectedOptions().length > 0 ? 'active' : 'ghost'}+ variant={selectedOptions().length > 0 ? 'accent' : 'ghost'}depth={3}class="rounded-lg border-0"disabled={selectedOptions().length === 0}diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsxindex 0daa93c827..4af21f414b 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingFormatMenu.tsx@@ -319,7 +319,7 @@ function ElementFormatButton(props: {size="icon-sm"class="rounded-md"depth={3}- variant={isActive() ? 'active' : 'ghost'}+ variant={isActive() ? 'accent' : 'ghost'}onPointerDown={(e: PointerEvent) => e.preventDefault()}onClick={(e: MouseEvent | KeyboardEvent) => {e.preventDefault();@@ -347,7 +347,7 @@ function ElementFormatMenu(props: {return (<Dropdown><Dropdown.Trigger- variant={isAnyActive() ? 'active' : 'ghost'}+ variant={isAnyActive() ? 'accent' : 'ghost'}size="icon-sm"class="rounded-md"depth={3}@@ -393,7 +393,7 @@ function InlineFormatMenu(props: {return (<Dropdown open={open()} onOpenChange={setOpen}><Dropdown.Trigger- variant={isAnyActive() ? 'active' : 'ghost'}+ variant={isAnyActive() ? 'accent' : 'ghost'}size="icon-sm"class="rounded-md"depth={3}@@ -412,7 +412,7 @@ function InlineFormatMenu(props: {shortcut={item.shortcut}size="icon-sm"variant={- props.selection()?.[item.format] ? 'active' : 'ghost'+ props.selection()?.[item.format] ? 'accent' : 'ghost'}class="rounded-md"depth={3}diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsxindex 65d563e6f0..24e10ef051 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsx+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/FloatingLinkMenu.tsx@@ -442,7 +442,7 @@ export function FloatingLinkMenu(props: {<ButtononClick={openInNewTab}class="p-1 hover:bg-hover hover-transition-bg"- variant="active"+ variant="accent"size="icon-sm"tooltip="Open in new tab">@@ -527,7 +527,7 @@ export function FloatingLinkMenu(props: {<ButtononClick={handleSubmit}class="focus:ring-failure focus:ring-2 focus:ring-offset-2"- variant="base"+ variant="outline"disabled={!pendingLinkInfo()?.url && !pendingLinkInfo()?.linkText}diff --git a/apps/web/src/lib/core/component/Toast/Toast.tsx b/apps/web/src/lib/core/component/Toast/Toast.tsxindex 8ebea58b11..fc4989ab06 100644--- a/apps/web/src/lib/core/component/Toast/Toast.tsx+++ b/apps/web/src/lib/core/component/Toast/Toast.tsx@@ -274,7 +274,7 @@ function ActionButtons(props: { actions: ToastAction[]; mobile?: boolean }) {<Buttonsize={props.mobile ? 'sm' : 'md'}onClick={action.onClick}- variant="base"+ variant="outline"class="px-2 py-1 bg-lift"depth={3}>diff --git a/apps/web/src/lib/core/component/TopBar/LoginButton.tsx b/apps/web/src/lib/core/component/TopBar/LoginButton.tsxindex e516072c5d..50e6656d3b 100644--- a/apps/web/src/lib/core/component/TopBar/LoginButton.tsx+++ b/apps/web/src/lib/core/component/TopBar/LoginButton.tsx@@ -16,7 +16,7 @@ export function LoginButton() {return (<div class="flex gap-2 justify-center w-max items-center"><Button- variant="base"+ variant="outline"size="sm"class="rounded-xs"onClick={() => navigate(`/login${window.location.search}`)}@@ -25,7 +25,7 @@ export function LoginButton() {</Button><span class="text-xs text-ink-muted italic">or</span><Button- variant="active"+ variant="accent"size="sm"class="rounded-xs"onClick={() => navigate(`/welcome${window.location.search}`)}diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsxindex 7256fcd8f7..afaa8f5f67 100644--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx@@ -321,7 +321,7 @@ function LinkSharingControls(props: LinkSharingControlsProps) {setPermissions={props.setLinkShareAccessLevel}/></div>- <Button variant="base" onClick={props.copyLink}>+ <Button variant="outline" onClick={props.copyLink}><CopyIcon class="size-4" /><span>Copy Link</span></Button>@@ -1238,7 +1238,7 @@ export function ShareTrigger(props: { copyLink?: () => void }) {});return (- <ButtonGroup variant="base" size="sm" class="bg-surface" depth={2}>+ <ButtonGroup variant="outline" size="sm" class="bg-surface" depth={2}><Tooltiplabel={shareStatus()?.tooltip ?? 'This item has been shared with you.'}>@@ -1376,7 +1376,7 @@ export function ShareOptions(props: {return (<Dropdown modal={false} open={isOpen()} onOpenChange={setIsOpen}><Dropdown.Trigger- variant="base"+ variant="outline"disabled={props.disabled}class={`min-w-16.75 py-1 pl-2 pr-1 rounded-md flex items-center gap-1 ${props.noBorder ? 'border-0 sm:border' : ''}`}on:keydown={(e: KeyboardEvent) => {diff --git a/apps/web/src/lib/core/internal/App.tsx b/apps/web/src/lib/core/internal/App.tsxindex 627d834d1e..245120eeb9 100644--- a/apps/web/src/lib/core/internal/App.tsx+++ b/apps/web/src/lib/core/internal/App.tsx@@ -80,7 +80,7 @@ const App: Component = () => {<div class="flex flex-row flex-wrap justify-center gap-4"><For each={Themes}>{() => (- <Button variant="base">+ <Button variant="outline"><Subtract /> Button Text <CaretDown /></Button>)}@@ -89,7 +89,7 @@ const App: Component = () => {<div class="flex flex-row flex-wrap justify-center gap-4"><Index each={ThemesWithSeparator}>{() => (- <Button variant="base">+ <Button variant="outline"><Subtract /> Button Text <CaretDown /></Button>)}@@ -98,7 +98,7 @@ const App: Component = () => {<div class="flex flex-row flex-wrap justify-center gap-4"><Index each={Themes}>{() => (- <Button variant="base" size="icon-md">+ <Button variant="outline" size="icon-md"><Acorn /></Button>)}@@ -107,7 +107,7 @@ const App: Component = () => {<div class="flex flex-row flex-wrap justify-center gap-4"><Index each={ThemesWithSeparator}>{() => (- <Button variant="base" size="icon-md">+ <Button variant="outline" size="icon-md"><Acorn /><CaretDown /></Button>@@ -117,7 +117,7 @@ const App: Component = () => {<div class="flex flex-row flex-wrap justify-center gap-4"><Index each={ThemesWithSeparator}>{() => (- <Button variant="base" size="icon-md">+ <Button variant="outline" size="icon-md"><Acorn /><CaretDown /></Button>@@ -136,7 +136,7 @@ const App: Component = () => {</div><div class="flex flex-row flex-wrap justify-center gap-4"><Dropdown>- <Dropdown.Trigger variant="base" tabIndex={-1}>+ <Dropdown.Trigger variant="outline" tabIndex={-1}>Open</Dropdown.Trigger><Dropdown.Content>diff --git a/apps/web/src/lib/core/internal/DataDebug.tsx b/apps/web/src/lib/core/internal/DataDebug.tsxindex 8a0afc9ac8..55030ebe3c 100644--- a/apps/web/src/lib/core/internal/DataDebug.tsx+++ b/apps/web/src/lib/core/internal/DataDebug.tsx@@ -88,7 +88,7 @@ const DataDebug: Component = () => {</div>}center={- <Button variant="base" onClick={handleRefresh}>+ <Button variant="outline" onClick={handleRefresh}><Refresh /> Refresh</Button>}diff --git a/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx b/apps/web/src/lib/core/internal/PixelArtIconDemo.tsxindex 2cc9766e19..6eb4ba861f 100644--- a/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx+++ b/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx@@ -431,7 +431,7 @@ function GlyphGrid(props: GlyphGridProps) {</button></div><Button- variant="base"+ variant="outline"onClick={() => {props.onNewGlyph();}}@@ -515,7 +515,7 @@ function GlyphGrid(props: GlyphGridProps) {<div class="absolute top-1 right-1 flex gap-0 opacity-0 bg-surface group-hover:opacity-100"><Button- variant="base"+ variant="outline"size="icon-md"label="Edit"onClick={(e) => {@@ -914,10 +914,10 @@ function GlyphEditor(props: GlyphEditorProps) {</div><div class="grid grid-cols-2 gap-2 mb-4">- <Button variant="base" onClick={clearAll}>+ <Button variant="outline" onClick={clearAll}><Erase /> Clear Grid</Button>- <Button variant="base" onClick={fillAll}>+ <Button variant="outline" onClick={fillAll}><Fill /> Fill Grid</Button></div>@@ -926,7 +926,7 @@ function GlyphEditor(props: GlyphEditorProps) {<h4 class="font-mono text-xs text-ink-muted">Transforms</h4><div class="flex gap-2"><Button- variant="base"+ variant="outline"size="icon-md"label="Mirror X"onClick={handleMirrorX}@@ -934,7 +934,7 @@ function GlyphEditor(props: GlyphEditorProps) {<MirrorX /></Button><Button- variant="base"+ variant="outline"size="icon-md"label="Mirror Y"onClick={handleMirrorY}@@ -942,7 +942,7 @@ function GlyphEditor(props: GlyphEditorProps) {<MirrorY /></Button><Button- variant="base"+ variant="outline"size="icon-md"label="Rotate 90 CCW"onClick={handleRotate90CC}@@ -955,10 +955,10 @@ function GlyphEditor(props: GlyphEditorProps) {<div class="pt-4 border-t border-edge"><div class="grid grid-cols-2 gap-2">- <Button variant="base" onClick={props.onClose}>+ <Button variant="outline" onClick={props.onClose}>Cancel</Button>- <Button variant="active" onClick={handleSave}>+ <Button variant="accent" onClick={handleSave}>Save</Button></div>@@ -1057,16 +1057,16 @@ function GlyphSidebar(props: GlyphSidebarProps) {<div class="mt-6 space-y-2"><h4 class="font-mono text-xs text-ink-muted">Batch Operations</h4><div class="grid grid-cols-1 gap-2">- <Button variant="base" onClick={props.onExportAll}>+ <Button variant="outline" onClick={props.onExportAll}><Copy /> Export to Clipboard</Button>- <Button variant="base" onClick={props.onImportAll}>+ <Button variant="outline" onClick={props.onImportAll}><Upload /> Import from Clipboard</Button>- <Button variant="base" onClick={props.onCopyAllSVGs}>+ <Button variant="outline" onClick={props.onCopyAllSVGs}><Copy /> Copy SVGs</Button>- <Button variant="base" onClick={props.onDownloadAllSVGs}>+ <Button variant="outline" onClick={props.onDownloadAllSVGs}><Download /> Download SVGs</Button></div>diff --git a/apps/web/src/lib/core/internal/ThemeDebug.tsx b/apps/web/src/lib/core/internal/ThemeDebug.tsxindex 17cd7844eb..130279b877 100644--- a/apps/web/src/lib/core/internal/ThemeDebug.tsx+++ b/apps/web/src/lib/core/internal/ThemeDebug.tsx@@ -1,4 +1,8 @@-import { Button, Panel } from '@ui';+import CaretDownIcon from '@phosphor-icons/core/regular/caret-down.svg?component-solid';+import CellSignalHighIcon from '@phosphor-icons/core/regular/cell-signal-high.svg?component-solid';+import CheckIcon from '@phosphor-icons/core/regular/check.svg?component-solid';+import PlusIcon from '@phosphor-icons/core/regular/plus.svg?component-solid';+import { Badge, Button, Panel } from '@ui';import { For } from 'solid-js';const LOREM_SHORT = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';@@ -22,8 +26,22 @@ const INK_VARIANTS = [{ name: 'text-ink-placeholder', class: 'text-ink-placeholder' },] as const;-const BUTTON_VARIANTS = ['ghost', 'base', 'active', 'danger'] as const;+const BUTTON_VARIANTS = [+ 'ghost',+ 'outline',+ 'accent',+ 'strong',+ 'danger',+ 'cta',+] as const;+const BUTTON_CONTENT_VARIANTS = ['outline', 'accent', 'strong', 'cta'] as const;const BUTTON_SIZES = ['sm', 'md', 'lg'] as const;+const BADGE_VARIANTS = ['ghost', 'outline'] as const;+const BUTTON_SIZE_LABELS = {+ sm: 'Small',+ md: 'Default',+ lg: 'Large',+} as const;function ThemeDebug() {return (@@ -201,7 +219,8 @@ function ThemeDebug() {<section class="flex flex-col gap-4"><h2 class="text-xl font-semibold text-ink">Button Variants</h2><p class="text-sm text-ink-muted">- All button variants: ghost, base, active, and danger.+ All button variants: ghost, outline, accent, strong, danger, and+ CTA.</p><Panel depth={1}>@@ -217,7 +236,7 @@ function ThemeDebug() {<For each={BUTTON_SIZES}>{(size) => (<Button variant={variant} size={size}>- {size.toUpperCase()} Button+ {BUTTON_SIZE_LABELS[size]}</Button>)}</For>@@ -233,62 +252,149 @@ function ThemeDebug() {</Panel></section>- {/* Button Sizes with Icons */}+ {/* Button content and size combinations */}<section class="flex flex-col gap-4">- <h2 class="text-xl font-semibold text-ink">Button Sizes</h2>+ <h2 class="text-xl font-semibold text-ink">+ Button Size × Content Matrix+ </h2><p class="text-sm text-ink-muted">- All button sizes including icon variants.+ Icon-only, text-only, and icon + text buttons use the same size prop+ and share a height within each row.</p><Panel depth={1}><Panel.Body class="p-4">- <div class="flex flex-col gap-4">- <div class="flex flex-wrap gap-2 items-center">- <Button variant="base" size="sm">- Small- </Button>- <Button variant="base" size="md">- Medium- </Button>- <Button variant="base" size="lg">- Large- </Button>- </div>- <div class="flex flex-wrap gap-2 items-center">- <Button variant="base" size="icon-sm">- <svg- class="size-4"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- stroke-width="2"- >- <path d="M12 4v16m-8-8h16" />- </svg>- </Button>- <Button variant="base" size="icon-md">- <svg- class="size-5"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- stroke-width="2"- >- <path d="M12 4v16m-8-8h16" />- </svg>- </Button>- <Button variant="base" size="icon-lg">- <svg- class="size-6"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- stroke-width="2"- >- <path d="M12 4v16m-8-8h16" />- </svg>- </Button>+ <div class="flex flex-col gap-6">+ <For each={BUTTON_SIZES}>+ {(size) => (+ <div class="flex flex-col items-start gap-2">+ <span class="text-xs text-ink-extra-muted font-mono">+ size="{size}"+ </span>+ <div class="flex flex-col items-start gap-3">+ <For each={BUTTON_CONTENT_VARIANTS}>+ {(variant) => (+ <div class="flex flex-col items-start gap-1.5">+ <span class="text-xs text-ink-extra-muted font-mono">+ variant="{variant}"+ </span>+ <div class="flex flex-wrap items-end gap-4">+ <div class="flex flex-col items-start gap-1.5">+ <span class="text-xs text-ink-extra-muted">+ Icon only+ </span>+ <Button+ variant={variant}+ size={size}+ square+ label={`Add (${variant}, ${size})`}+ >+ <PlusIcon />+ </Button>+ </div>+ <div class="flex flex-col items-start gap-1.5">+ <span class="text-xs text-ink-extra-muted">+ Text only+ </span>+ <Button variant={variant} size={size}>+ Button+ </Button>+ </div>+ <div class="flex flex-col items-start gap-1.5">+ <span class="text-xs text-ink-extra-muted">+ Icon + text+ </span>+ <Button variant={variant} size={size}>+ <PlusIcon />+ Button+ </Button>+ </div>+ </div>+ </div>+ )}+ </For>+ </div>+ </div>+ )}+ </For>+ </div>+ </Panel.Body>+ </Panel>+ </section>++ {/* Badge variants and sizes */}+ <section class="flex flex-col gap-4">+ <h2 class="text-xl font-semibold text-ink">Badge Variants</h2>+ <p class="text-sm text-ink-muted">+ Ghost and outline badges share the Button sm, md, and lg size+ definitions.+ </p>++ <Panel depth={1}>+ <Panel.Body class="p-4">+ <div class="flex flex-col gap-6">+ <div class="flex flex-col items-start gap-2">+ <span class="text-xs text-ink-extra-muted font-mono">+ Content samples · size="sm"+ </span>+ <div class="flex flex-wrap items-center gap-2">+ <Badge variant="outline" size="sm">+ <span+ aria-hidden="true"+ class="size-2 rounded-full bg-blue"+ />+ tags+ </Badge>+ <Badge variant="outline" size="sm">+ <span+ aria-hidden="true"+ class="size-2 rounded-full bg-pink"+ />+ tags-ux+ </Badge>+ <Badge variant="outline" size="sm">+ <span class="inline-flex size-[1em] items-center justify-center rounded-full bg-pink text-surface-4">+ <CheckIcon aria-hidden="true" class="size-[0.65em]" />+ </span>+ Completed+ <CaretDownIcon aria-hidden="true" />+ </Badge>+ <Badge variant="outline" size="sm">+ <CellSignalHighIcon aria-hidden="true" />+ High+ <CaretDownIcon aria-hidden="true" />+ </Badge>+ </div></div>+ <For each={BUTTON_SIZES}>+ {(size) => (+ <div class="flex flex-col items-start gap-2">+ <span class="text-xs text-ink-extra-muted font-mono">+ size="{size}"+ </span>+ <div class="flex flex-wrap items-end gap-4">+ <For each={BADGE_VARIANTS}>+ {(variant) => (+ <div class="flex flex-col items-start gap-1.5">+ <span class="text-xs text-ink-extra-muted font-mono">+ variant="{variant}"+ </span>+ <div class="flex flex-wrap items-center gap-2">+ <Badge variant={variant} size={size}>+ Badge+ </Badge>+ <Badge variant={variant} size={size}>+ <PlusIcon />+ Badge+ </Badge>+ </div>+ </div>+ )}+ </For>+ </div>+ </div>+ )}+ </For></div></Panel.Body></Panel>@@ -317,10 +423,10 @@ function ThemeDebug() {<Button variant="ghost" depth={depth}>Ghost</Button>- <Button variant="base" depth={depth}>+ <Button variant="outline" depth={depth}>Base</Button>- <Button variant="active" depth={depth}>+ <Button variant="accent" depth={depth}>Active</Button><Button variant="danger" depth={depth}>@@ -353,7 +459,7 @@ function ThemeDebug() {<Button variant="ghost" size="sm">Cancel</Button>- <Button variant="active" size="sm">+ <Button variant="accent" size="sm">Confirm</Button></Panel.Footer>diff --git a/apps/web/src/lib/core/mobile/IosPushNotificationModal.tsx b/apps/web/src/lib/core/mobile/IosPushNotificationModal.tsxindex 0eb9b3b349..cef5dedbf2 100644--- a/apps/web/src/lib/core/mobile/IosPushNotificationModal.tsx+++ b/apps/web/src/lib/core/mobile/IosPushNotificationModal.tsx@@ -41,7 +41,7 @@ export function IosPushNotificationModal() {Later</Dialog.CloseButton><Button- variant="active"+ variant="accent"size="sm"class="text-sm"onClick={async () => {diff --git a/apps/web/src/lib/core/mobile/IpadUnsupportedDialog.tsx b/apps/web/src/lib/core/mobile/IpadUnsupportedDialog.tsxindex bff864a537..04052f9091 100644--- a/apps/web/src/lib/core/mobile/IpadUnsupportedDialog.tsx+++ b/apps/web/src/lib/core/mobile/IpadUnsupportedDialog.tsx@@ -53,7 +53,7 @@ export function IpadUnsupportedDialog() {</Dialog.Description></div><div class="flex justify-end">- <Dialog.CloseButton as={Button} variant="active" size="sm">+ <Dialog.CloseButton as={Button} variant="accent" size="sm">Got it</Dialog.CloseButton></div>diff --git a/apps/web/src/lib/core/mobile/NativeAppUpdateRequiredDialog.tsx b/apps/web/src/lib/core/mobile/NativeAppUpdateRequiredDialog.tsxindex 11a4439d40..73be61eb3c 100644--- a/apps/web/src/lib/core/mobile/NativeAppUpdateRequiredDialog.tsx+++ b/apps/web/src/lib/core/mobile/NativeAppUpdateRequiredDialog.tsx@@ -28,7 +28,7 @@ export function NativeAppUpdateRequiredDialog(props: {</Dialog.Description></div><div class="flex justify-end">- <Dialog.CloseButton as={Button} variant="active" size="sm">+ <Dialog.CloseButton as={Button} variant="accent" size="sm">OK</Dialog.CloseButton></div>diff --git a/apps/web/src/routes/BasePath.tsx b/apps/web/src/routes/BasePath.tsxindex b3d5761f99..d430558084 100644--- a/apps/web/src/routes/BasePath.tsx+++ b/apps/web/src/routes/BasePath.tsx@@ -61,7 +61,7 @@ function SessionVerificationFallback(props: {class="mt-2"disabled={retrying()}onClick={handleRetry}- variant="base"+ variant="outline">{retrying() ? 'Retrying…' : 'Retry'}</Button>diff --git a/apps/web/src/routes/Root.tsx b/apps/web/src/routes/Root.tsxindex 6f0a25e785..6875bc671c 100644--- a/apps/web/src/routes/Root.tsx+++ b/apps/web/src/routes/Root.tsx@@ -311,7 +311,7 @@ const ROUTES: RouteDefinition[] = [<div class="h-full overflow-y-hidden"><div class="relative flex flex-row items-center pt-4 h-full"><Button- variant="base"+ variant="outline"onClick={() => {publishLoginSuccess();window.close();diff --git a/apps/web/src/routes/TaskRoute.tsx b/apps/web/src/routes/TaskRoute.tsxindex 22cc57d6b9..35dbd7424a 100644--- a/apps/web/src/routes/TaskRoute.tsx+++ b/apps/web/src/routes/TaskRoute.tsx@@ -82,12 +82,16 @@ function TaskRouteError(props: { notFound: boolean; onRetry?: () => void }) {: 'Something went wrong while resolving this task reference.'}</p><div class="flex items-center gap-2">- <Button variant="base" size="sm" onClick={() => navigate('/tasks')}>+ <Button+ variant="outline"+ size="sm"+ onClick={() => navigate('/tasks')}+ >Go to tasks</Button><Show when={!props.notFound && props.onRetry}>{(onRetry) => (- <Button variant="base" size="sm" onClick={onRetry()}>+ <Button variant="outline" size="sm" onClick={onRetry()}>Try again</Button>)}