Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(ui)!: redesign shared buttons and migrate app controls (#8859)

dev-rbae814dc52867
diff --git a/.agents/rules/web/design-system.md b/.agents/rules/web/design-system.md
index de61df8a3d..763eb2568f 100644
--- a/.agents/rules/web/design-system.md
+++ b/.agents/rules/web/design-system.md
@@ -34,25 +34,35 @@ construction. Browse them at `/app/component/ui` (Foundations → Controls).
`TabSelector` inside a `HeaderActionGroup` or `ButtonGroup`, and never render
a tab as a `Button`. A split button (`ButtonGroup` with a menu trigger) is
its own island; never nest it inside another, including through
- `SidePanel.HeaderActions`. Enforced by ast-grep `tsx-tabs-not-in-action-group`
+ `SidePanel.HeaderActions`. Use `ButtonGroup.Button` for explicit segments and
+ `variant="secondary" finish="raised"` for action frames; ordinary Buttons stay
+ independent. Enforced by ast-grep `tsx-tabs-not-in-action-group`
and `tsx-no-button-as-tab`, CI error.
- **FE-62** Lay out a desktop header as one row: title or breadcrumbs, then
view tabs on the left; islands on the right in the order filters, view
options, New, Search (detail views: entity actions, sharing, navigation,
- detail toggle). Every control in the row is 32px: `Tabs` `md`, `icon-md` for
- icon-only buttons (16px glyph), `md` for labelled ones (14px glyph), 8px
- between islands. Filter, sort, group, and download live in the header, never
+ detail toggle). Detail-header groups use `sm` labelled segments and `icon-sm`
+ icon-only segments (28px controls); Drive and Tasks list-header groups use
+ `md` / `icon-md`, matching Tabs, New, and Search. Keep 8px between islands. Filter, sort, group, and download live in the header, never
in a second toolbar row; only active filter chips sit below it.
-- **FE-63** Style controls only through their props (`variant`, `size`,
- `fullWidth`, `iconOnly`); `class` on a control is for placement (margin,
+- **FE-63** Style controls only through their props (`variant`, `size`, `finish`,
+ `fullWidth`); `class` on a control is for placement (margin,
width, order, shrink). Never resize or recolor a control from a wrapper
- (`[&_button]:size-8`), and don't use `square` for new icon buttons. Enforced
+ (`[&_button]:size-8`); use an explicit `icon-*` size for icon actions. Put glyph
+ sizing on the rendered icon, not on Button or ancestor SVG selectors. Enforced
for wrappers by ast-grep `tsx-no-descendant-button-styles`, warning.
-- **FE-64** Keep one selected state: desktop view tabs share one rounded track with an inset selected pill; a selected tab and a pressed button share
- the pressed fill; the inset selected pill has a subtle edge and shadow, while unselected options sit within the shared outer frame. No
- accent text, underlines, or bespoke tints for selection on desktop. The one
- exception is the agent composer's Auto/Chat/Code switch: `Tabs variant="track"`,
- a raised pill sliding along the composer tray's track.
+- Use `variant="primary"` for the main create, save, submit, invite, approve, or continue action. Primary uses the theme accent; the separate accent variant stays removed. Use `neutral` for solid monochrome emphasis: black with white text in light themes, white with black text in dark themes. Home/AI chat, channel, and email Send actions use the shared neutral `SendButton`. Keep the shared New launcher (`ViewCreateButton`) on `variant="secondary" finish="raised"`, and retain secondary, outline, ghost, and danger variants for their own roles.
+- Current application Button usages trial `secondary` instead of `outline`, including shared wrappers and groups. Keep the outline API and canonical Button gallery examples; do not change outline variants on badges, inputs, or other components.
+- Settings actions that previously used inverse-filled `cta` styling use explicit `variant="neutral"`, including creation, runtime setup, billing, invitation, and signature-save actions. Keep existing accent, ghost, and destructive actions in their own roles; do not recolor Button descendants from `SettingsPage`.
+- Primary, neutral, secondary, danger, and success Buttons and ButtonGroup frames automatically use the raised desktop finish and shared glass on touch. Use `finish="flat"` to opt out or `finish="raised"` to frame a ghost/link action. Outline variants, bare controls, and grouped segments always stay flat.
+- Follow the [Button and ButtonGroup contract](ui-primitives.md#button-and-buttongroup)
+ for accessible names, tooltips, sizing, explicit segments, and activation behavior.
+- **FE-64** Components own their state treatments: desktop Tabs share a flat rounded track with an inset selected pill;
+ Button uses the semantic pressed fill for its variant. Mark action toggles with
+ `aria-pressed`, and expansion triggers with `aria-expanded`. Do not restyle
+ buttons as tabs. The agent composer's Auto/Chat/Code switch remains
+ `Tabs variant="track"`, a flat pill sliding along the composer's tray. Keep all
+ tab treatments flat: use borders and selected fills, not raised edges, gradients, or shadows.
- **FE-65** Components own their touch treatment. Never branch on
`isTouchDevice()` to choose a tab component or variant; set `Tabs`' `touch`
to the style that surface already uses on touch.
diff --git a/.agents/rules/web/ui-primitives.md b/.agents/rules/web/ui-primitives.md
index be193ffe34..e9724c70ff 100644
--- a/.agents/rules/web/ui-primitives.md
+++ b/.agents/rules/web/ui-primitives.md
@@ -32,3 +32,39 @@ Applies to `apps/web/src/components/ui`, including ports from shadcn-solid.
- In `InputGroup`, keep the input as the single control and place surrounding
content in `Addon` slots. Use `align` for visual placement so accessible DOM
order stays independent of layout.
+
+## Button and ButtonGroup
+
+- Keep the shared `Button` and `@ui` import; migrate callers directly instead of
+ adding parallel implementations or legacy-prop adapters. The role and variant
+ policy lives in [the design system rule](design-system.md).
+- Buttons perform actions; navigation uses anchors. `variant="link"` changes
+ appearance, not semantics.
+- Name icon-only actions with `aria-label`. Tooltips are independent: use a string
+ or `{ content, placement, disabled, hotkey, shortcut }`. Do not restore `label`,
+ root-level `hotkey`/`shortcut`, `square`, `depth`, `glass`, or `noTouchResize`.
+- Use `xs` through `xl` for labeled actions and `icon-xs` through `icon-xl` for
+ square actions. Shared minimum heights are 24/28/32/40/48px; labeled controls
+ can grow with their content. Preserve the 36px touch minimum and size rendered
+ glyphs separately. Composer Send, microphone, and attachment controls use
+ `icon-md`, with 20px desktop and 24px touch glyphs.
+- Keep ordinary children in the Button's flex row so trailing carets, truncation,
+ and custom spacing work. Only loading actions need the reserved-content layer.
+ Preserve native disabled behavior and activation guards for polymorphic controls.
+- Compose groups explicitly with `ButtonGroup.Button`; standalone Buttons do not
+ inherit group styling. Segments inherit size and variant unless overridden,
+ remain flat, and own their hover/pressed/disabled states. The frame owns its
+ material once, without a whole-group hover treatment. Group labels use
+ `aria-label`; `CopyButton` joins with `as={ButtonGroup.Button}`.
+- Keep `aria-expanded` on disclosure controls without treating expanded content
+ as a selected action. Button highlights an open popup only when the same
+ trigger has `aria-haspopup`; use `aria-pressed` for genuine action toggles.
+- Keep Button's visible focus outline suppressed in ordinary color modes and
+ retain its forced-colors indicator. Do not remove other controls' focus styling.
+- Keep Tooltip's assembled and compound APIs on the same implementation and
+ clean up closed or detached popups. Do not add document-wide mutation observers
+ to track individual triggers.
+- Keep materials in `src/index.css`; JavaScript only derives accent text contrast
+ and the corresponding state-mix direction. Reset runtime material assignments
+ at theme boundaries so previews resolve their own palette. Do not persist
+ derived Button tokens in authored theme data.
diff --git a/.agents/rules/web/ui.md b/.agents/rules/web/ui.md
index d5d20a33c1..b0621135a3 100644
--- a/.agents/rules/web/ui.md
+++ b/.agents/rules/web/ui.md
@@ -21,6 +21,12 @@ Components, styling, and interaction conventions.
default palette is disabled via `--color-*: initial` in
`apps/web/src/index.css`, so classes like `text-red-500` silently render
nothing. Enforced by ast-grep `tsx-no-raw-tailwind-palette`, CI error.
+- Keep runtime theme tokens together in `apps/web/src/index.css`: one
+ `:root, [data-theme-light]` block for dark defaults, followed by one
+ `[data-theme-light='true']` override block. Keep any narrower root/device
+ conditions inside that theme area. `@theme` registers Tailwind tokens;
+ component utilities and layer/inversion rules keep their own responsibilities.
+ Do not append separate border, Button, glass, or avatar theme blocks elsewhere.
- **FE-26** Prefer composition over configurability; keep reusable components
small and free of queries/complex state.
- **FE-27** Don't add `cursor-pointer` to clickable elements. Enforced by
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index c48db0cc0d..74d7c097ab 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -279,7 +279,8 @@ the user's newest account for that app from the last fifteen minutes.
workflow and mobile controls. Use `ListHeader` for the single-row Email, Drive,
and Tasks headers: title, filters, view options, New, expandable Search. Put sidebar search in
`ViewSidebar.Header` so its icon precedes collapse and its field opens above New.
-- Keep desktop headers on the shared `ListHeader` / `HeaderActionGroup` pattern: view `Tabs` as pills after the title, 32px semantic islands with 8px gaps on the right, fully rounded elevated frames, New then expandable Search; preserve touch layouts. Pick each control by role from the [design system rule](../../.agents/rules/web/design-system.md); see [UI conventions](../../docs/agent-guide/ui-conventions.md#top-bars). Never use recessed/inset backgrounds in headers.
+- Keep desktop headers on the shared `ListHeader` / `HeaderActionGroup` pattern: view `Tabs` as pills after the title, `sm`/`icon-sm` semantic islands (28px controls) with 8px gaps on the right, fully rounded frames, New then expandable Search; retain `md` sizing for Tabs, New, and Search. Drive and Tasks list-header filter, layout, sort, and grouping islands use `md`/`icon-md` (32px) to match New and Search. Preserve touch layouts. Compose ButtonGroup actions with explicit `ButtonGroup.Button` segments; use `variant="secondary" finish="raised"` on action frames. Standalone Buttons do not inherit group styling. Pick each control by role from the [design system rule](../../.agents/rules/web/design-system.md); see [UI conventions](../../docs/agent-guide/ui-conventions.md#top-bars). Never use recessed/inset backgrounds in headers.
+- Keep desktop model and effort controls separate: the model selector opens the catalog and the speedometer opens the runtime's advertised slider stops; retain the mobile effort sheet.
- Passive PR mentions must not retry initial GitHub status failures on remount; preserve confirmed status through refetch errors and keep pending data reads out of their parent Suspense boundary.
- Keep native booking exit navigation in the route shell, outside page loading boundaries, and use the router so the native hash route stays intact.
- Diagnose native full reloads with `native_webview_started`, `native_diagnostic_recovered`, and the shared `frontend_instance_id`; use `reloadApp(reason)` for frontend reloads and keep breadcrumbs content-free. Treat `previous_document_*` checkpoints as last-observed lifecycle evidence, never a crash verdict; clear them on logout. `previous_document_last_*` comes from the native navigation breadcrumb (route and entity type, never ids). See [frontend checkpoints](docs/native-reload-diagnostics.md) and `tauri/src-tauri/README.md`.
diff --git a/apps/web/src/components/app/DesktopTitleBar.test.tsx b/apps/web/src/components/app/DesktopTitleBar.test.tsx
index e4cef16534..c9239506c2 100644
--- a/apps/web/src/components/app/DesktopTitleBar.test.tsx
+++ b/apps/web/src/components/app/DesktopTitleBar.test.tsx
@@ -9,11 +9,9 @@ import { afterEach, expect, it, vi } from 'vitest';
import { DesktopTitleBar } from './DesktopTitleBar';
vi.mock('@ui', () => ({
- Button: (
- props: JSX.ButtonHTMLAttributes<HTMLButtonElement> & { label: string }
- ) => (
+ Button: (props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) => (
<button
- aria-label={props.label}
+ aria-label={props['aria-label']}
disabled={props.disabled}
onClick={props.onClick}
>
diff --git a/apps/web/src/components/app/DesktopTitleBar.tsx b/apps/web/src/components/app/DesktopTitleBar.tsx
index 7595ec50cf..ca6c75a787 100644
--- a/apps/web/src/components/app/DesktopTitleBar.tsx
+++ b/apps/web/src/components/app/DesktopTitleBar.tsx
@@ -19,10 +19,10 @@ export function DesktopTitleBar() {
>
<div class="flex items-center gap-1">
<Button
+ aria-label="Go Back"
+ tooltip={{ content: 'Go Back', hotkey: TOKENS.split.go.back }}
variant="ghost"
size="icon-sm"
- label="Go Back"
- hotkey={TOKENS.split.go.back}
disabled={!activeSplit()?.canGoBack()}
onClick={() => {
if (splitBackInterceptor()?.()) return;
@@ -32,10 +32,10 @@ export function DesktopTitleBar() {
<CaretLeftIcon class="size-4" />
</Button>
<Button
+ aria-label="Go Forward"
+ tooltip={{ content: 'Go Forward', hotkey: TOKENS.split.go.forward }}
variant="ghost"
size="icon-sm"
- label="Go Forward"
- hotkey={TOKENS.split.go.forward}
disabled={!activeSplit()?.canGoForward()}
onClick={() => activeSplit()?.goForward()}
>
@@ -51,10 +51,13 @@ export function DesktopTitleBar() {
<Show when={globalSplitManager()}>
{(manager) => (
<Button
+ aria-label="New Split"
+ tooltip={{
+ content: 'New Split',
+ hotkey: TOKENS.global.createNewSplit,
+ }}
variant="ghost"
size="icon-sm"
- label="New Split"
- hotkey={TOKENS.global.createNewSplit}
disabled={!manager().canAppendSplit()}
onClick={() =>
manager().openWithSplit(
diff --git a/apps/web/src/components/app/FatalError.tsx b/apps/web/src/components/app/FatalError.tsx
index e9af47e9f6..f38d1ca2ed 100644
--- a/apps/web/src/components/app/FatalError.tsx
+++ b/apps/web/src/components/app/FatalError.tsx
@@ -40,14 +40,14 @@ export function FatalError(props: FatalErrorProps) {
<div class="flex flex-row gap-3 justify-center">
<Button
- variant="strong"
+ variant="secondary"
onClick={() => {
window.location.href = window.location.origin + '/app';
}}
>
<HomeIcon class="size-4" /> Home
</Button>
- <Button variant="outline" onClick={props.reset}>
+ <Button variant="secondary" onClick={props.reset}>
<ResetIcon class="size-4" /> Try Again
</Button>
</div>
diff --git a/apps/web/src/components/app/FileDownloadHeader.tsx b/apps/web/src/components/app/FileDownloadHeader.tsx
index 208179819e..1c49e41709 100644
--- a/apps/web/src/components/app/FileDownloadHeader.tsx
+++ b/apps/web/src/components/app/FileDownloadHeader.tsx
@@ -10,7 +10,7 @@ export function FileDownloadHeader(props: {
return (
<SidePanel.HeaderActions>
<HeaderActionGroup label="File download">
- <FileDownloadButton download={props.download} />
+ <FileDownloadButton grouped download={props.download} />
</HeaderActionGroup>
</SidePanel.HeaderActions>
);
diff --git a/apps/web/src/components/app/HeaderActionButton.tsx b/apps/web/src/components/app/HeaderActionButton.tsx
index 6dd8378371..dcada61bec 100644
--- a/apps/web/src/components/app/HeaderActionButton.tsx
+++ b/apps/web/src/components/app/HeaderActionButton.tsx
@@ -1,5 +1,5 @@
-import { Button, cn } from '@ui';
-import type { JSX, Ref } from 'solid-js';
+import { Button, ButtonGroup, type ButtonSize, cn } from '@ui';
+import { type JSX, type Ref, Show } from 'solid-js';
/** Shared geometry for labeled actions in a block's header. */
export function HeaderActionButton(props: {
@@ -11,12 +11,16 @@ export function HeaderActionButton(props: {
disabled?: boolean;
busy?: boolean;
class?: string;
+ grouped?: boolean;
+ size?: ButtonSize;
}) {
+ const Control = props.grouped ? ButtonGroup.Button : Button;
+ const iconOnly = () => props.size?.startsWith('icon-') ?? false;
return (
- <Button
+ <Control
ref={props.ref}
variant="ghost"
- size="md"
+ size={props.size ?? (props.grouped ? undefined : 'md')}
data-header-action
aria-label={props.label}
tooltip={props.tooltip}
@@ -24,14 +28,20 @@ export function HeaderActionButton(props: {
disabled={props.disabled}
aria-busy={props.busy}
class={cn(
- '@max-[600px]/split-header:w-8 @max-[600px]/split-header:p-0',
+ !iconOnly() && 'px-2 @max-[600px]/split-header:p-0',
+ !iconOnly() &&
+ (props.grouped && props.size !== 'md'
+ ? '@max-[600px]/split-header:w-7'
+ : '@max-[600px]/split-header:w-8'),
props.class
)}
>
{props.icon}
- <span data-header-action-label class="@max-[600px]/split-header:hidden">
- {props.label}
- </span>
- </Button>
+ <Show when={!iconOnly()}>
+ <span data-header-action-label class="@max-[600px]/split-header:hidden">
+ {props.label}
+ </span>
+ </Show>
+ </Control>
);
}
diff --git a/apps/web/src/components/app/HeaderActionGroup.tsx b/apps/web/src/components/app/HeaderActionGroup.tsx
index 0b8b4927ed..4677c58186 100644
--- a/apps/web/src/components/app/HeaderActionGroup.tsx
+++ b/apps/web/src/components/app/HeaderActionGroup.tsx
@@ -4,29 +4,31 @@ import { cn } from '@ui/utils/classname';
import { type ParentProps, Show } from 'solid-js';
/**
- * A desktop header island: related actions share one elevated frame and
- * their buttons stay flat. Touch renders the actions without a frame, and a
+ * A desktop header island: related actions share the secondary raised frame.
+ * Their segments stay flat. Touch renders actions without a frame, and a
* nested group reuses its parent's frame. An island with no actions renders
* nothing, so conditional children need no wrapper.
*
* @do Group actions by meaning: filters, view options, sharing, navigation, detail toggles.
- * @do Use `size="icon-md"` for icon-only actions and `size="md"` for labelled ones.
+ * @do Use `size="icon-sm"` for icon-only actions; labelled segments inherit `sm`.
* @do Mark on/off toggles with `aria-pressed`; the pressed fill matches a selected tab.
* @dont Do not put Tabs, TabSelector, or Buttons acting as tabs in an island.
* @dont Do not add borders, shadows, or backgrounds to the buttons inside.
*/
export function HeaderActionGroup(
- props: ParentProps<{ label: string; class?: string }>
+ props: ParentProps<{ label: string; class?: string; size?: 'sm' | 'md' }>
) {
const group = useButtonGroupContext();
return (
<Show when={!isTouchDevice() && !group} fallback={props.children}>
<ButtonGroup
- label={props.label}
- variant="outline"
- size="md"
+ aria-label={props.label}
+ variant="secondary"
+ finish="raised"
+ size={props.size ?? 'sm'}
class={cn(
- 'hidden h-8 shrink-0 has-[[data-button]]:inline-flex',
+ 'hidden shrink-0 border-0 has-[[data-button]]:inline-flex',
+ props.size === 'md' ? 'min-h-8' : 'min-h-7',
props.class
)}
>
diff --git a/apps/web/src/components/app/ResponsiveBlockToolbar.tsx b/apps/web/src/components/app/ResponsiveBlockToolbar.tsx
index 3a7f2aaf27..1ee214a743 100644
--- a/apps/web/src/components/app/ResponsiveBlockToolbar.tsx
+++ b/apps/web/src/components/app/ResponsiveBlockToolbar.tsx
@@ -3,7 +3,7 @@ import type { HotkeyToken } from '@core/hotkey/tokens';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import type { EntityData } from '@entity';
import type { ItemType } from '@service-storage/client';
-import { Button, cn } from '@ui';
+import { Button, ButtonGroup, cn } from '@ui';
import { type Component, For, type JSX, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { HeaderActionGroup } from './HeaderActionGroup';
@@ -33,36 +33,39 @@ export type BlockTool = {
children?: SplitFileMenuAction[];
condition?: () => boolean;
isActive?: () => boolean;
- buttonComponent?: () => JSX.Element;
+ buttonComponent?: Component<{ grouped?: boolean }>;
focusTarget?: () => HTMLElement | null;
hotkeyToken?: HotkeyToken;
/** Menu section this tool renders in when shown in the title file menu. */
group?: SplitFileMenuActionGroup;
};
-export function ToolButton(props: { tool: BlockTool }) {
+export function ToolButton(props: { tool: BlockTool; grouped?: boolean }) {
const label = () =>
typeof props.tool.label === 'function'
? props.tool.label()
: props.tool.label;
+ const Control = props.grouped ? ButtonGroup.Button : Button;
return (
- <Button
+ <Control
+ variant="ghost"
+ aria-label={label()}
+ tooltip={{ content: label(), hotkey: props.tool.hotkeyToken }}
onClick={props.tool.action}
- label={label()}
- hotkey={props.tool.hotkeyToken}
class={cn(
'px-1',
props.tool.isActive?.() && 'bg-accent/20 hover:bg-accent/30 text-accent'
)}
- size={isTouchDevice() ? 'icon-sm' : 'icon-md'}
+ size={isTouchDevice() || props.grouped ? 'icon-sm' : 'icon-md'}
>
<Dynamic
component={
props.tool.icon as Component<JSX.SvgSVGAttributes<SVGSVGElement>>
}
+ class="size-4 shrink-0 touch:size-3.5"
/>
- </Button>
+ </Control>
);
}
@@ -149,9 +152,9 @@ export function ResponsiveBlockToolbar(props: BlockToolbarProps) {
<For each={activeToolbarTools()}>
{(tool) =>
tool.buttonComponent ? (
- <tool.buttonComponent />
+ <tool.buttonComponent grouped />
) : (
- <ToolButton tool={tool} />
+ <ToolButton tool={tool} grouped />
)
}
</For>
diff --git a/apps/web/src/components/app/app-sidebar/sidebar-search-menu.tsx b/apps/web/src/components/app/app-sidebar/sidebar-search-menu.tsx
index b6685ff358..24210e923f 100644
--- a/apps/web/src/components/app/app-sidebar/sidebar-search-menu.tsx
+++ b/apps/web/src/components/app/app-sidebar/sidebar-search-menu.tsx
@@ -29,9 +29,10 @@ export function SidebarSearchMenu(props: {
}}
>
<Dropdown.Trigger
+ aria-label={t('nav.search')}
+ tooltip={t('nav.search')}
size="icon-md"
{...props.triggerProps}
- label={t('nav.search')}
>
<MagnifyingGlassIcon class="size-5" />
</Dropdown.Trigger>
diff --git a/apps/web/src/components/app/mobile/ConfirmDrawer.tsx b/apps/web/src/components/app/mobile/ConfirmDrawer.tsx
index 20ec013f91..21e8bebb91 100644
--- a/apps/web/src/components/app/mobile/ConfirmDrawer.tsx
+++ b/apps/web/src/components/app/mobile/ConfirmDrawer.tsx
@@ -2,7 +2,7 @@ import { t } from '@app/lib/i18n';
import SpinnerIcon from '@icon/system/regular/spinner.svg';
import CloseIcon from '@icon/system/regular/x.svg';
import { ActionDialogShell } from '@ui/components/ActionDialogShell';
-import { Button } from '@ui/components/Button';
+import { Button, type ButtonVariant } from '@ui/components/Button';
import type { ConfirmDialogProps } from '@ui/components/ConfirmDialog';
import { createUniqueId, Show } from 'solid-js';
import { MobileDrawer } from './MobileDrawer';
@@ -14,6 +14,11 @@ export function ConfirmDrawer(props: ConfirmDialogProps) {
const close = () => {
if (!props.pending) props.onOpenChange(false);
};
+ const confirmVariant = (): ButtonVariant => {
+ if (props.tone === 'danger') return 'danger';
+ if (props.tone === 'success') return 'success';
+ return 'primary';
+ };
return (
<MobileDrawer
side="bottom"
@@ -73,7 +78,7 @@ export function ConfirmDrawer(props: ConfirmDialogProps) {
{props.cancelLabel ?? t('mobile.cancel')}
</Button>
<Button
- variant="strong"
+ variant={confirmVariant()}
size="xl"
class="min-w-0 flex-1"
disabled={props.pending}
@@ -112,14 +117,10 @@ export function ConfirmDrawer(props: ConfirmDialogProps) {
</MobileDrawer.ScrollBody>
<div class="shrink-0 px-4 pb-[max(24px,var(--mobile-sheet-safe-padding))]">
<Button
- variant="cta"
+ variant={confirmVariant()}
size="xl"
fullWidth
- glass={false}
class="h-12 rounded-2xl"
- classList={{
- 'bg-success text-surface': props.tone === 'success',
- }}
disabled={props.pending}
onClick={() => !props.pending && props.onConfirm()}
>
diff --git a/apps/web/src/components/app/mobile/browser-test/fixture.tsx b/apps/web/src/components/app/mobile/browser-test/fixture.tsx
index d15ea726ea..28a4b71bb9 100644
--- a/apps/web/src/components/app/mobile/browser-test/fixture.tsx
+++ b/apps/web/src/components/app/mobile/browser-test/fixture.tsx
@@ -51,7 +51,7 @@ function EmailSettingsPage() {
</Button>
</SettingsRow>
<SettingsRow label="Add another inbox">
- <Button variant="outline" onClick={connectEmail}>
+ <Button variant="secondary" onClick={connectEmail}>
Add account
</Button>
</SettingsRow>
diff --git a/apps/web/src/components/app/mobile/glassPress.test.ts b/apps/web/src/components/app/mobile/glassPress.test.ts
index 876eb144f8..619122e914 100644
--- a/apps/web/src/components/app/mobile/glassPress.test.ts
+++ b/apps/web/src/components/app/mobile/glassPress.test.ts
@@ -123,7 +123,22 @@ describe('mobile glass surface press', () => {
expect(group.style.getPropertyValue('--press-y')).toBe('20px');
expect(group.children).toHaveLength(2);
});
- it.each(['glass', 'island', 'touch:island'])(
+ it.each(['glass', 'touch:glass'])(
+ 'keeps %s group press feedback on the shared frame',
+ (className) => {
+ const group = surface();
+ group.removeAttribute('data-mobile-dock-island');
+ group.dataset.slot = 'button-group';
+ group.className = className;
+ const button = group.querySelector('button')!;
+
+ pointer(button, 'pointerdown');
+
+ expect(group.dataset.glassPress).toBe('wide');
+ expect(button.hasAttribute('data-glass-press')).toBe(false);
+ }
+ );
+ it.each(['glass', 'touch:glass', 'island', 'touch:island'])(
'animates standalone %s buttons without per-control setup',
(className) => {
const button = document.createElement('button');
diff --git a/apps/web/src/components/app/mobile/glassPress.ts b/apps/web/src/components/app/mobile/glassPress.ts
index ce514ce183..432f78754d 100644
--- a/apps/web/src/components/app/mobile/glassPress.ts
+++ b/apps/web/src/components/app/mobile/glassPress.ts
@@ -2,7 +2,7 @@ import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { isPlatform } from '@core/util/platform';
const GROUP =
- '[data-mobile-dock-island], [data-header-island], [data-slot="button-group"].glass';
+ '[data-mobile-dock-island], [data-header-island], [data-slot="button-group"]:is(.glass, [class~="touch:glass"])';
const CONTROL =
'button, a, [role="button"], [role="tab"], [data-header-island]';
const INPUT = '[data-glass-input], [data-input] [data-composer-collapsed]';
@@ -72,7 +72,9 @@ export function installGlassPress() {
const element =
input ??
control?.closest<HTMLElement>(GROUP) ??
- (control?.matches('.glass, .island, [class~="touch:island"]')
+ (control?.matches(
+ '.glass, [class~="touch:glass"], .island, [class~="touch:island"]'
+ )
? control
: undefined);
if (!element) return;
diff --git a/apps/web/src/components/app/side-panel/SidePanel.tsx b/apps/web/src/components/app/side-panel/SidePanel.tsx
index 486038079f..42b3fdf249 100644
--- a/apps/web/src/components/app/side-panel/SidePanel.tsx
+++ b/apps/web/src/components/app/side-panel/SidePanel.tsx
@@ -12,7 +12,7 @@ import CircleDashedEmpty from '@icon/system/regular/circle-dashed.svg';
import InfoIcon from '@icon/system/regular/info.svg';
import SidePanelIcon from '@icon/system/regular/sidebar-simple.svg';
import { Accordion } from '@kobalte/core/accordion';
-import { Button, Panel, Scroll } from '@ui';
+import { Button, ButtonGroup, Panel, Scroll } from '@ui';
import { cn } from '@ui/utils/classname';
import {
type Accessor,
@@ -416,49 +416,56 @@ function SidePanelLayoutInner(
);
}
-function Toggle() {
+function Toggle(props: { size?: 'sm' | 'md' } = {}) {
const ctx = useContext(SidePanelContext);
if (!ctx) {
throw new Error('<SidePanel.Toggle> must be inside <SidePanel.Root>');
}
+ const iconSize = () =>
+ isTouchDevice() || props.size === 'md' ? 'icon-md' : 'icon-sm';
return (
<Show when={ctx.hasSections()}>
- <HeaderActionGroup label="Details">
- <Button
- depth={2}
+ <HeaderActionGroup label="Details" size={props.size}>
+ <ButtonGroup.Button
variant="ghost"
- size="icon-md"
+ size={iconSize()}
+ aria-label={ctx.isOpen() ? 'Hide details' : 'Show details'}
class={cn(
isTouchDevice() &&
'border-0 hover:bg-transparent! active:bg-transparent! focus-visible:bg-transparent! active:text-accent',
isTouchDevice() && ctx.isOpen() && 'text-accent'
)}
- tooltip={
- isTouchDevice()
+ tooltip={{
+ content: isTouchDevice()
? ctx.isOpen()
? 'Hide details'
: 'Show details'
: ctx.isOpen()
? 'Hide Side Panel'
- : 'Show Side Panel'
- }
+ : 'Show Side Panel',
+ hotkey: TOKENS.block.toggleSidePanel,
+ }}
aria-haspopup={isTouchDevice() ? 'dialog' : undefined}
aria-expanded={ctx.isOpen()}
- hotkey={TOKENS.block.toggleSidePanel}
onClick={() => ctx.toggle()}
>
<Show
when={isTouchDevice()}
fallback={
<SidePanelIcon
- class={cn('rotate-180', ctx.isOpen() && 'text-accent')}
+ class={cn(
+ 'size-4 shrink-0 rotate-180',
+ ctx.isOpen() && 'text-accent'
+ )}
/>
}
>
- <InfoIcon class={cn(ctx.isOpen() && 'text-accent')} />
+ <InfoIcon
+ class={cn('size-6 shrink-0', ctx.isOpen() && 'text-accent')}
+ />
</Show>
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
</Show>
);
diff --git a/apps/web/src/components/app/sidebar-next/create-button.tsx b/apps/web/src/components/app/sidebar-next/create-button.tsx
index 5e1c0239ed..432f324a54 100644
--- a/apps/web/src/components/app/sidebar-next/create-button.tsx
+++ b/apps/web/src/components/app/sidebar-next/create-button.tsx
@@ -16,13 +16,16 @@ export const SidebarRailCreateButton = () => {
const createMenuTarget = tourTarget(APP_TOUR.createMenu);
return (
<Button
+ aria-label={t('nav.create')}
+ tooltip={{
+ content: t('nav.create'),
+ placement: 'right',
+ hotkey: TOKENS.global.createCommand,
+ }}
ref={createMenuTarget}
variant="ghost"
- class="size-10 [&_svg]:size-5"
+ class="size-10"
size="icon-md"
- label={t('nav.create')}
- tooltipPlacement="right"
- hotkey={TOKENS.global.createCommand}
aria-haspopup="dialog"
aria-expanded={createMenuOpen()}
onClick={() => {
diff --git a/apps/web/src/components/app/sidebar-next/customize-sidebar-modal.tsx b/apps/web/src/components/app/sidebar-next/customize-sidebar-modal.tsx
index 4405992265..f0c2e0aca6 100644
--- a/apps/web/src/components/app/sidebar-next/customize-sidebar-modal.tsx
+++ b/apps/web/src/components/app/sidebar-next/customize-sidebar-modal.tsx
@@ -120,20 +120,22 @@ function CustomizeNavRow(props: {
fallback={
<div class="flex shrink-0 flex-col">
<Button
+ aria-label={t('nav.moveItemUp', { label: props.item.label })}
+ tooltip={t('nav.moveItemUp', { label: props.item.label })}
variant="ghost"
size="icon-sm"
class="size-6"
- label={t('nav.moveItemUp', { label: props.item.label })}
disabled={!canMoveUp()}
onClick={() => props.onMove(-1)}
>
<CaretUpIcon class="size-3" />
</Button>
<Button
+ aria-label={t('nav.moveItemDown', { label: props.item.label })}
+ tooltip={t('nav.moveItemDown', { label: props.item.label })}
variant="ghost"
size="icon-sm"
class="size-6"
- label={t('nav.moveItemDown', { label: props.item.label })}
disabled={!canMoveDown()}
onClick={() => props.onMove(1)}
>
@@ -218,7 +220,7 @@ export function CustomizeSidebarModal(props: {
<Panel depth={2} class="max-h-[75vh] text-ink rounded-xl">
<Panel.Header class="px-2 gap-1">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
{t('nav.customizeSidebar')}
diff --git a/apps/web/src/components/app/sidebar-next/footer-actions.tsx b/apps/web/src/components/app/sidebar-next/footer-actions.tsx
index ba5f7c1f34..51f6371416 100644
--- a/apps/web/src/components/app/sidebar-next/footer-actions.tsx
+++ b/apps/web/src/components/app/sidebar-next/footer-actions.tsx
@@ -57,15 +57,14 @@ const MobileAppButton = () => {
return (
<Show when={!isNativeMobilePlatform() && isTabAvailable('Mobile App')}>
<Button
+ aria-label={t('nav.getMobileApp')}
variant="ghost"
size="icon-md"
class={cn(
'size-10 cursor-default rounded-xl',
isActive() && 'bg-hover text-ink'
)}
- label={t('nav.getMobileApp')}
- tooltip={t('nav.getMobileApp')}
- tooltipPlacement="right"
+ tooltip={{ content: t('nav.getMobileApp'), placement: 'right' }}
draggable={false}
aria-current={isActive() ? 'page' : undefined}
data-active={isActive() ? '' : undefined}
@@ -134,21 +133,23 @@ export const FooterActions = (props: {
triggerClass="size-10"
>
<Button
+ aria-label={t('nav.settings')}
variant="ghost"
size="icon-md"
class={cn(
'size-10 cursor-default rounded-xl',
isSettingsActive() && 'bg-hover text-ink'
)}
- label={t('nav.settings')}
aria-description={
accountName()
? t('nav.signedInAs', { name: accountName() ?? '' })
: undefined
}
- tooltip={t('nav.settings')}
- tooltipPlacement="right"
- hotkey={TOKENS.global.toggleSettings}
+ tooltip={{
+ content: t('nav.settings'),
+ placement: 'right',
+ hotkey: TOKENS.global.toggleSettings,
+ }}
draggable={false}
aria-current={isSettingsActive() ? 'page' : undefined}
data-active={isSettingsActive() ? '' : undefined}
diff --git a/apps/web/src/components/app/sidebar-next/list-nav.tsx b/apps/web/src/components/app/sidebar-next/list-nav.tsx
index 9e9e1827d7..d93d0f7475 100644
--- a/apps/web/src/components/app/sidebar-next/list-nav.tsx
+++ b/apps/web/src/components/app/sidebar-next/list-nav.tsx
@@ -131,13 +131,13 @@ export const ListNav = (props: ListNavProps) => {
}
>
<Button
+ aria-label={props.item.label}
variant="ghost"
size="icon-md"
class={cn(
'size-10 cursor-default rounded-xl',
isActive() && 'bg-hover text-ink'
)}
- label={props.item.label}
aria-description={
[
props.unread && t('nav.unreadItems'),
@@ -147,13 +147,13 @@ export const ListNav = (props: ListNavProps) => {
.filter(Boolean)
.join('. ') || undefined
}
- tooltip={t('nav.goTo', { label: props.item.label })}
- tooltipPlacement="right"
- hotkey={
- props.item.hotkeyToken
+ tooltip={{
+ content: t('nav.goTo', { label: props.item.label }),
+ placement: 'right',
+ hotkey: props.item.hotkeyToken
? [TOKENS.sidebar.goToLeader, props.item.hotkeyToken]
- : undefined
- }
+ : undefined,
+ }}
draggable={false}
aria-current={isActive() ? 'page' : undefined}
// An attribute rather than a class-only state, so the styling can be
diff --git a/apps/web/src/components/app/sidebar-next/more-menu.tsx b/apps/web/src/components/app/sidebar-next/more-menu.tsx
index f75f6f59b7..99302064c0 100644
--- a/apps/web/src/components/app/sidebar-next/more-menu.tsx
+++ b/apps/web/src/components/app/sidebar-next/more-menu.tsx
@@ -60,12 +60,11 @@ export function MoreMenu(props: MoreMenuProps) {
<>
<Dropdown placement="right-start" gutter={6}>
<Dropdown.Trigger
+ aria-label={t('nav.more')}
variant="ghost"
size="icon-md"
class="size-10 shrink-0 cursor-default rounded-xl"
- label={t('nav.more')}
- tooltip={t('nav.moreOptions')}
- tooltipPlacement="right"
+ tooltip={{ content: t('nav.moreOptions'), placement: 'right' }}
draggable={false}
data-sidebar-next-item="more"
>
diff --git a/apps/web/src/components/app/sidebar-next/nav-glyph.tsx b/apps/web/src/components/app/sidebar-next/nav-glyph.tsx
index 96d29e8d0e..160f12f0eb 100644
--- a/apps/web/src/components/app/sidebar-next/nav-glyph.tsx
+++ b/apps/web/src/components/app/sidebar-next/nav-glyph.tsx
@@ -5,7 +5,7 @@ import { Dynamic } from 'solid-js/web';
/** Any SVG component — the rail uses the original Macro icon family. */
export type NavIcon = Component<JSX.SvgSVGAttributes<SVGSVGElement>>;
-const SWAP = 'absolute inset-0';
+const SWAP = 'absolute inset-0 size-full';
/**
* A nav glyph, instantly switching to a filled counterpart when active.
diff --git a/apps/web/src/components/app/sidebar-next/return-to-call-button.tsx b/apps/web/src/components/app/sidebar-next/return-to-call-button.tsx
index b8a69617e3..8187a2d496 100644
--- a/apps/web/src/components/app/sidebar-next/return-to-call-button.tsx
+++ b/apps/web/src/components/app/sidebar-next/return-to-call-button.tsx
@@ -58,9 +58,8 @@ function ReturnToCallButtonContent() {
variant="success"
size="icon-md"
class="size-10 cursor-default rounded-xl"
- label={t('nav.returnToCall')}
- tooltip={t('nav.returnToCall')}
- tooltipPlacement="right"
+ aria-label={t('nav.returnToCall')}
+ tooltip={{ content: t('nav.returnToCall'), placement: 'right' }}
draggable={false}
data-sidebar-next-item="active-call"
{...pressHandlers(open)}
diff --git a/apps/web/src/components/app/sidebar-next/search-bar-button.test.tsx b/apps/web/src/components/app/sidebar-next/search-bar-button.test.tsx
index a385acfd41..875fd9eaee 100644
--- a/apps/web/src/components/app/sidebar-next/search-bar-button.test.tsx
+++ b/apps/web/src/components/app/sidebar-next/search-bar-button.test.tsx
@@ -5,7 +5,6 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { SearchRailButton } from './search-bar-button';
@@ -43,9 +42,7 @@ vi.mock('../split-layout/layout', () => ({
}));
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
vi.mock('@ui/components/Hotkey', () => ({ Hotkey: () => null }));
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
+
vi.mock('@ui', async () => ({
...(await import('@ui/utils/classname')),
...(await import('@ui/utils/menuKeyboardNavigation')),
diff --git a/apps/web/src/components/app/sidebar-next/search-bar-button.tsx b/apps/web/src/components/app/sidebar-next/search-bar-button.tsx
index 4feeb9f04c..d9777ee77f 100644
--- a/apps/web/src/components/app/sidebar-next/search-bar-button.tsx
+++ b/apps/web/src/components/app/sidebar-next/search-bar-button.tsx
@@ -1,5 +1,6 @@
import { requestSearchFocus } from '@app/features/next-soup/soup-view/search-controllers';
import { useAnalytics } from '@app/lib/analytics/analytics-context';
+import { t } from '@app/lib/i18n';
import { globalSplitManager } from '@app/signal/splitLayout';
import { navigateToSidebarView } from '@components/app/app-sidebar/sidebar';
import { TOKENS } from '@core/hotkey/tokens';
@@ -48,10 +49,13 @@ export const SearchRailButton = () => {
triggerProps={{
size: 'icon-md',
variant: 'ghost',
- tooltipPlacement: 'right',
- hotkey: TOKENS.sidebar.goTo.search,
+ tooltip: {
+ content: t('nav.search'),
+ placement: 'right',
+ hotkey: TOKENS.sidebar.goTo.search,
+ },
'data-sidebar-next-search': '',
- class: 'size-10 rounded-xl [&_svg]:size-5',
+ class: 'size-10 rounded-xl',
}}
/>
);
diff --git a/apps/web/src/components/app/sidebar-next/update-button.tsx b/apps/web/src/components/app/sidebar-next/update-button.tsx
index 59abca9670..a6f3581e31 100644
--- a/apps/web/src/components/app/sidebar-next/update-button.tsx
+++ b/apps/web/src/components/app/sidebar-next/update-button.tsx
@@ -55,11 +55,12 @@ export function UpdateButton(props: { update: () => AppUpdate }) {
gutter={8}
>
<Popover.Trigger
+ aria-label={t('nav.updateAvailable')}
+ tooltip={t('nav.updateAvailable')}
as={Button}
variant="ghost"
size="icon-md"
class="size-10 cursor-default rounded-xl"
- label={t('nav.updateAvailable')}
draggable={false}
data-sidebar-next-item="app-update"
>
@@ -85,7 +86,7 @@ export function UpdateButton(props: { update: () => AppUpdate }) {
</Popover.Description>
<div class="mt-3 flex justify-end">
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={props.update().busy}
onClick={() => props.update().apply()}
diff --git a/apps/web/src/components/app/split-layout/SplitButtons.tsx b/apps/web/src/components/app/split-layout/SplitButtons.tsx
index f10e86a8ad..cc27e04410 100644
--- a/apps/web/src/components/app/split-layout/SplitButtons.tsx
+++ b/apps/web/src/components/app/split-layout/SplitButtons.tsx
@@ -13,13 +13,14 @@ export function SplitBackButton() {
if (!context) return '';
return (
<Button
+ aria-label={t('splitMenu.goBack')}
+ tooltip={t('splitMenu.goBack')}
variant="ghost"
size="icon-md"
- label={t('splitMenu.goBack')}
disabled={!context.handle.canGoBack()}
onClick={context.handle.goBack}
>
- <ArrowLeft />
+ <ArrowLeft class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -29,13 +30,14 @@ export function SplitForwardButton() {
if (!context) return '';
return (
<Button
+ aria-label={t('splitMenu.goForward')}
+ tooltip={t('splitMenu.goForward')}
variant="ghost"
size="icon-md"
- label={t('splitMenu.goForward')}
disabled={!context.handle.canGoForward()}
onClick={context.handle.goForward}
>
- <ArrowRight />
+ <ArrowRight class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -45,9 +47,10 @@ export function SplitCreateButton() {
if (!context) return '';
return (
<Button
+ aria-label={t('splitMenu.createNewSplit')}
+ tooltip={t('splitMenu.createNewSplit')}
variant="ghost"
size="icon-md"
- label={t('splitMenu.createNewSplit')}
onClick={() => {
context.manager.createNewSplit({
content: {
@@ -58,7 +61,7 @@ export function SplitCreateButton() {
});
}}
>
- <SplitIcon />
+ <SplitIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -68,12 +71,13 @@ export function SplitCloseButton() {
if (!context) return '';
return (
<Button
+ aria-label={t('splitMenu.close')}
+ tooltip={t('splitMenu.close')}
variant="ghost"
- size="icon-md"
- label={t('splitMenu.close')}
+ size="icon-sm"
onClick={context.handle.close}
>
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
diff --git a/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx b/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx
index 98260a1f97..9a658efe17 100644
--- a/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx
@@ -139,12 +139,13 @@ export function SplitDrawer(
</Show>
<div class="grow" />
<Button
+ aria-label={t('splitMenu.close')}
+ tooltip={t('splitMenu.close')}
variant="ghost"
size="icon-sm"
- label={t('splitMenu.close')}
onClick={drawerControl.close}
>
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="size-full overflow-hidden">
diff --git a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
index fb9076edf2..7470a0d6e5 100644
--- a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
@@ -184,7 +184,7 @@ function DesktopRender(props: SplitFileMenuRenderProps) {
size="icon-sm"
variant="ghost"
>
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content class="min-w-64 max-w-[min(22rem,calc(100vw-1rem))]">
<For each={sections()}>
diff --git a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
index 7ee6505231..9cff99a5b8 100644
--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
@@ -26,7 +26,7 @@ import CaretUp from '@icon/system/regular/caret-up.svg';
import CloseIcon from '@icon/system/regular/x.svg';
import { mergeRefs } from '@solid-primitives/refs';
import { createDroppable, useDragDropContext } from '@thisbeyond/solid-dnd';
-import { Button, cn } from '@ui';
+import { Button, ButtonGroup, cn } from '@ui';
import {
createMemo,
onCleanup,
@@ -127,11 +127,11 @@ function SplitBackButton() {
if (!context) return null;
return (
<Button
- square
- size="sm"
+ variant="ghost"
+ aria-label={t('splitMenu.goBack')}
+ tooltip={{ content: t('splitMenu.goBack'), hotkey: TOKENS.split.go.back }}
+ size="icon-sm"
class="p-1 touch:active:bg-transparent"
- label={t('splitMenu.goBack')}
- hotkey={TOKENS.split.go.back}
disabled={
!context.handle.canGoBack() &&
!hasAgentsBackFallback(context.handle.content())
@@ -152,7 +152,7 @@ function SplitBackButton() {
})
}
>
- <CaretLeft />
+ <CaretLeft class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -164,13 +164,19 @@ function _SplitSpotlightButton() {
return (
<Show when={canSpotlight(layout.manager)}>
<Button
- class="p-1 hidden"
- label={
+ variant="ghost"
+ aria-label={
context.handle.isSpotLight()
? t('splitMenu.minimizeSplit')
: t('splitMenu.spotlightSplit')
}
- hotkey={TOKENS.window.spotlight.toggle}
+ tooltip={{
+ content: context.handle.isSpotLight()
+ ? t('splitMenu.minimizeSplit')
+ : t('splitMenu.spotlightSplit'),
+ hotkey: TOKENS.window.spotlight.toggle,
+ }}
+ class="p-1 hidden"
onClick={() => context.handle.toggleSpotlight()}
>
{context.handle.isSpotLight() ? (
@@ -205,13 +211,13 @@ function SplitCloseButton() {
}
>
<Button
- square
+ aria-label={label()}
+ tooltip={{ content: label(), hotkey: TOKENS.split.close }}
+ variant="ghost"
size="icon-sm"
- label={label()}
- hotkey={TOKENS.split.close}
onClick={() => closeSplitOrReturnToList(layout.manager, context.handle)}
>
- <CloseIcon class="size-4" />
+ <CloseIcon class="size-3.5" />
</Button>
</Show>
);
@@ -344,30 +350,41 @@ function SoupNavigationButtons() {
export function ListNavigationButtons(props: {
navigation: ListDetailNavigationTarget;
class?: string;
+ size?: 'sm' | 'md';
}) {
+ const iconSize = () =>
+ isTouchDevice() || props.size === 'md' ? 'icon-md' : 'icon-sm';
return (
- <HeaderActionGroup label={t('splitMenu.itemNavigation')}>
+ <HeaderActionGroup label={t('splitMenu.itemNavigation')} size={props.size}>
<div class={cn('flex items-center touch:gap-0.5', props.class)}>
- <Button
- size="icon-md"
- label={t('splitMenu.previousItem')}
- hotkey={TOKENS.entity.step.start}
+ <ButtonGroup.Button
+ aria-label={t('splitMenu.previousItem')}
+ tooltip={{
+ content: t('splitMenu.previousItem'),
+ hotkey: TOKENS.entity.step.start,
+ }}
+ variant="ghost"
+ size={iconSize()}
disabled={!props.navigation.canPrevious()}
onMouseDown={(event) => event.preventDefault()}
onClick={props.navigation.previous}
>
<CaretUp class="size-4" />
- </Button>
- <Button
- size="icon-md"
- label={t('splitMenu.nextItem')}
- hotkey={TOKENS.entity.step.end}
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label={t('splitMenu.nextItem')}
+ tooltip={{
+ content: t('splitMenu.nextItem'),
+ hotkey: TOKENS.entity.step.end,
+ }}
+ variant="ghost"
+ size={iconSize()}
disabled={!props.navigation.canNext()}
onMouseDown={(event) => event.preventDefault()}
onClick={props.navigation.next}
>
<CaretDown class="size-4" />
- </Button>
+ </ButtonGroup.Button>
</div>
</HeaderActionGroup>
);
diff --git a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
index 346f67b999..b994bb7224 100644
--- a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
@@ -358,12 +358,13 @@ export function SplitPanel(props: SplitPanelProps) {
{panel().title}
</h3>
<Button
+ aria-label="Close"
+ tooltip="Close"
variant="ghost"
size="icon-sm"
- label="Close"
onClick={() => panel().onClose?.()}
>
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="min-h-0 flex-1 overflow-hidden">
@@ -382,8 +383,11 @@ export function SplitPanel(props: SplitPanelProps) {
<Button
variant="ghost"
size="icon-xs"
- label="Close split"
- hotkey={TOKENS.split.close}
+ aria-label="Close split"
+ tooltip={{
+ content: 'Close split',
+ hotkey: TOKENS.split.close,
+ }}
class={cn(
'absolute top-0 left-0 z-split-panel-chrome origin-top-left scale-[1.15] size-4 p-0 rounded-none border-0 border-r border-b border-edge-frame bg-panel text-ink-muted/70 hover:bg-hover hover:text-ink',
props.handle.isSpotLight()
diff --git a/apps/web/src/components/app/split-panel/SplitPanel.tsx b/apps/web/src/components/app/split-panel/SplitPanel.tsx
index 02136d183d..a64d2a4419 100644
--- a/apps/web/src/components/app/split-panel/SplitPanel.tsx
+++ b/apps/web/src/components/app/split-panel/SplitPanel.tsx
@@ -168,34 +168,34 @@ function BackButton(props: SplitControlButtonProps) {
'children',
'class',
'disabled',
- 'hotkey',
- 'label',
+ 'tooltip',
'size',
- 'square',
'type',
'variant',
]);
- const label = () => local.label ?? 'Go back';
+ const label = () => local['aria-label'] ?? 'Go back';
return (
<Button
{...rest}
+ tooltip={
+ local.tooltip ?? { content: label(), hotkey: TOKENS.split.go.back }
+ }
type={local.type ?? 'button'}
variant={local.variant}
- size={local.size ?? 'sm'}
- square={local.square ?? true}
+ size={local.size ?? 'icon-sm'}
class={cn(
!local.size && 'p-1',
'transition-none touch:active:bg-transparent',
local.class
)}
- aria-label={local['aria-label']}
- label={label()}
- hotkey={local.hotkey ?? TOKENS.split.go.back}
+ aria-label={label()}
disabled={Boolean(local.disabled) || !controller.canGoBack()}
{...pressHandlers(() => controller.goBack())}
>
- {local.children ?? <CaretLeftIcon />}
+ {local.children ?? (
+ <CaretLeftIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
);
}
@@ -207,34 +207,34 @@ function ForwardButton(props: SplitControlButtonProps) {
'children',
'class',
'disabled',
- 'hotkey',
- 'label',
+ 'tooltip',
'size',
- 'square',
'type',
'variant',
]);
- const label = () => local.label ?? 'Go forward';
+ const label = () => local['aria-label'] ?? 'Go forward';
return (
<Button
{...rest}
+ tooltip={
+ local.tooltip ?? { content: label(), hotkey: TOKENS.split.go.forward }
+ }
type={local.type ?? 'button'}
variant={local.variant}
- size={local.size ?? 'sm'}
- square={local.square ?? true}
+ size={local.size ?? 'icon-sm'}
class={cn(
!local.size && 'p-1',
'transition-none touch:active:bg-transparent',
local.class
)}
- aria-label={local['aria-label']}
- label={label()}
- hotkey={local.hotkey ?? TOKENS.split.go.forward}
+ aria-label={label()}
disabled={Boolean(local.disabled) || !controller.canGoForward()}
{...pressHandlers(() => controller.goForward())}
>
- {local.children ?? <CaretRightIcon />}
+ {local.children ?? (
+ <CaretRightIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
);
}
@@ -247,14 +247,12 @@ function CloseButton(props: SplitControlButtonProps) {
'children',
'class',
'disabled',
- 'hotkey',
- 'label',
+ 'tooltip',
'size',
- 'square',
'type',
'variant',
]);
- const label = () => local.label ?? 'Close';
+ const label = () => local['aria-label'] ?? 'Close';
return (
<Show
@@ -264,19 +262,19 @@ function CloseButton(props: SplitControlButtonProps) {
>
<Button
{...rest}
+ tooltip={
+ local.tooltip ?? { content: label(), hotkey: TOKENS.split.close }
+ }
type={local.type ?? 'button'}
- variant={local.variant}
+ variant={local.variant ?? 'ghost'}
size={local.size ?? 'icon-sm'}
- square={local.square ?? true}
class={cn('transition-none', local.class)}
- aria-label={local['aria-label']}
- label={label()}
- hotkey={local.hotkey ?? TOKENS.split.close}
+ aria-label={label()}
disabled={Boolean(local.disabled)}
data-split-panel-close=""
{...pressHandlers(() => controller?.close())}
>
- {local.children ?? <CloseIcon class="size-4" />}
+ {local.children ?? <CloseIcon class="size-3.5" />}
</Button>
</Show>
);
diff --git a/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx b/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx
index 9023782380..2d633b4ef1 100644
--- a/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx
+++ b/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx
@@ -46,8 +46,7 @@ function TabItem(props: { tabManager: TabManager; tab: DesktopTab }) {
<Button
variant="ghost"
size="icon-xs"
- label={t('tabs.closeTab')}
- noTouchResize
+ aria-label={t('tabs.closeTab')}
class={cn(
'shrink-0',
!active() && 'invisible not-touch:group-hover:visible'
@@ -88,8 +87,8 @@ export function DesktopTabStrip() {
<Button
variant="ghost"
size="icon-sm"
- label={t('tabs.newTab')}
- hotkey={TOKENS.tabs.new}
+ aria-label={t('tabs.newTab')}
+ tooltip={{ content: t('tabs.newTab'), hotkey: TOKENS.tabs.new }}
onClick={() => tabManager().newTab()}
>
<PlusIcon class="size-4" />
diff --git a/apps/web/src/components/date-time-range/date-time-range-fields.tsx b/apps/web/src/components/date-time-range/date-time-range-fields.tsx
index 05f7a45342..ace6834c45 100644
--- a/apps/web/src/components/date-time-range/date-time-range-fields.tsx
+++ b/apps/web/src/components/date-time-range/date-time-range-fields.tsx
@@ -57,7 +57,7 @@ function DateField(props: DateFieldProps) {
aria-invalid={props.invalid || undefined}
aria-describedby={props.describedBy}
class={buttonClasses({
- variant: 'outline',
+ variant: 'secondary',
size: 'sm',
class: cn(
'max-w-40 justify-start',
diff --git a/apps/web/src/components/date-time-range/time-range-editor.tsx b/apps/web/src/components/date-time-range/time-range-editor.tsx
index 39b05124ba..3fe60c6853 100644
--- a/apps/web/src/components/date-time-range/time-range-editor.tsx
+++ b/apps/web/src/components/date-time-range/time-range-editor.tsx
@@ -117,7 +117,7 @@ export function TimeRangeEditor(props: {
<Button
size="icon-sm"
variant="ghost"
- label={`Clear ${props.subject}`}
+ aria-label={`Clear ${props.subject}`}
tooltip="Clear"
onClick={clear}
>
diff --git a/apps/web/src/components/diff-view/DiffView.tsx b/apps/web/src/components/diff-view/DiffView.tsx
index 0060fd58cc..9789be18dd 100644
--- a/apps/web/src/components/diff-view/DiffView.tsx
+++ b/apps/web/src/components/diff-view/DiffView.tsx
@@ -361,7 +361,7 @@ function CollapseButton() {
>
<CaretRightIcon
class={cn(
- 'transition-transform duration-100 motion-reduce:transition-none',
+ 'size-3.5 shrink-0 transition-transform duration-100 motion-reduce:transition-none',
!collapsed() && 'rotate-90'
)}
/>
@@ -422,9 +422,9 @@ function CollapseAll(props: { iconOnly?: boolean }) {
const { collapse } = useDiffView();
return (
<Button
+ aria-label={collapse.anyExpanded() ? 'Collapse all' : 'Expand all'}
variant="ghost"
size={props.iconOnly ? 'icon-sm' : 'sm'}
- label={collapse.anyExpanded() ? 'Collapse all' : 'Expand all'}
tooltip={
collapse.anyExpanded()
? 'Hide every diff, keeping just the file headers'
@@ -432,7 +432,11 @@ function CollapseAll(props: { iconOnly?: boolean }) {
}
onClick={() => collapse.toggleAll()}
>
- {collapse.anyExpanded() ? <ArrowsInIcon /> : <ArrowsOutIcon />}
+ {collapse.anyExpanded() ? (
+ <ArrowsInIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ ) : (
+ <ArrowsOutIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ )}
<Show when={!props.iconOnly}>
<span>{collapse.anyExpanded() ? 'Collapse all' : 'Expand all'}</span>
</Show>
diff --git a/apps/web/src/components/diff-view/README.md b/apps/web/src/components/diff-view/README.md
index dfdb566364..ae654dec1b 100644
--- a/apps/web/src/components/diff-view/README.md
+++ b/apps/web/src/components/diff-view/README.md
@@ -32,6 +32,9 @@ the sticky row on hover. Hovering the header highlights the row but does not tog
it; only the disclosure and path controls toggle collapse. Toolbar parts use
standard `Button` and `Tabs` sizes, and backgrounds come from the
card's depth.
+The disclosure caret keeps `aria-expanded` and rotates with the diff state, but
+an expanded diff does not give its Button a selected fill. Open popup triggers
+and genuine `aria-pressed` action toggles keep their separate active styling.
The host composes the rest:
diff --git a/apps/web/src/components/diff-view/comments/CommentThread.tsx b/apps/web/src/components/diff-view/comments/CommentThread.tsx
index d131e3c1df..b84858bba2 100644
--- a/apps/web/src/components/diff-view/comments/CommentThread.tsx
+++ b/apps/web/src/components/diff-view/comments/CommentThread.tsx
@@ -114,7 +114,7 @@ function Composer(props: {
Cancel
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={empty()}
onClick={() => props.onSubmit()}
diff --git a/apps/web/src/components/diff-view/debug/DiffViewGallery.tsx b/apps/web/src/components/diff-view/debug/DiffViewGallery.tsx
index 36cb3d7c7d..a14807af96 100644
--- a/apps/web/src/components/diff-view/debug/DiffViewGallery.tsx
+++ b/apps/web/src/components/diff-view/debug/DiffViewGallery.tsx
@@ -112,7 +112,7 @@ function CustomHeaderDemo() {
tooltip="Copy path"
onClick={() => setCopied(entry.file.path)}
>
- <CopyIcon />
+ <CopyIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</>
)}
diff --git a/apps/web/src/components/gantt/gantt-markers.tsx b/apps/web/src/components/gantt/gantt-markers.tsx
index 798dfd4c82..ff61797fa6 100644
--- a/apps/web/src/components/gantt/gantt-markers.tsx
+++ b/apps/web/src/components/gantt/gantt-markers.tsx
@@ -75,9 +75,8 @@ export function GanttTodayButton() {
const gantt = useGantt();
return (
<Button
- depth={2}
size="md"
- variant="outline"
+ variant="secondary"
class="bg-surface shadow-sm"
onClick={() => (gantt.hours() ? gantt.fitToday() : gantt.scrollToToday())}
>
diff --git a/apps/web/src/components/gantt/gantt-settings.tsx b/apps/web/src/components/gantt/gantt-settings.tsx
index fca97abda5..244c3993af 100644
--- a/apps/web/src/components/gantt/gantt-settings.tsx
+++ b/apps/web/src/components/gantt/gantt-settings.tsx
@@ -21,8 +21,7 @@ export function GanttSettings() {
return (
<Dropdown placement="bottom-end">
<Dropdown.Trigger
- depth={2}
- variant="outline"
+ variant="secondary"
size="icon-md"
class="bg-surface shadow-sm"
aria-label="Timeline settings"
diff --git a/apps/web/src/components/gantt/gantt-sidebar.tsx b/apps/web/src/components/gantt/gantt-sidebar.tsx
index 373d037ad2..6473738350 100644
--- a/apps/web/src/components/gantt/gantt-sidebar.tsx
+++ b/apps/web/src/components/gantt/gantt-sidebar.tsx
@@ -19,14 +19,16 @@ export function GanttSidebarToggle() {
return (
<div class="absolute left-3 top-2 z-40">
<Button
- depth={2}
+ aria-label={
+ gantt.sidebar.open() ? 'Hide timeline items' : 'Show timeline items'
+ }
+ tooltip={
+ gantt.sidebar.open() ? 'Hide timeline items' : 'Show timeline items'
+ }
ref={gantt.sidebar.setTrigger}
size="icon-md"
- variant="outline"
+ variant="secondary"
class="bg-surface shadow-sm"
- label={
- gantt.sidebar.open() ? 'Hide timeline items' : 'Show timeline items'
- }
aria-expanded={gantt.sidebar.open()}
disabled={gantt.editing()}
onClick={() => gantt.sidebar.setOpen(!gantt.sidebar.open())}
diff --git a/apps/web/src/components/gantt/gantt-zoom-controls.tsx b/apps/web/src/components/gantt/gantt-zoom-controls.tsx
index 6c7c6c5597..09c8d1190b 100644
--- a/apps/web/src/components/gantt/gantt-zoom-controls.tsx
+++ b/apps/web/src/components/gantt/gantt-zoom-controls.tsx
@@ -39,11 +39,10 @@ export function GanttZoomControls() {
>
<div class="flex shrink-0 items-center gap-1">
<Button
- depth={2}
+ aria-label={'Zoom out'}
+ tooltip={{ content: 'Zoom out', disabled: !canZoomOut() }}
size="icon-lg"
variant="ghost"
- label="Zoom out"
- tooltipDisabled={!canZoomOut()}
class={cn(
'invisible border-edge-muted bg-surface opacity-0 shadow-md transition-opacity group-hover/zoom:visible group-hover/zoom:pointer-events-auto group-hover/zoom:opacity-100 group-focus-within/zoom:visible group-focus-within/zoom:pointer-events-auto group-focus-within/zoom:opacity-100 touch:visible touch:pointer-events-auto touch:opacity-100 motion-reduce:transition-none',
gantt.scrollZooming() && 'visible pointer-events-auto opacity-100'
@@ -54,11 +53,10 @@ export function GanttZoomControls() {
<MinusIcon class="size-5" />
</Button>
<Button
- depth={2}
+ aria-label={'Zoom in'}
+ tooltip={{ content: 'Zoom in', disabled: !canZoomIn() }}
size="icon-lg"
variant="ghost"
- label="Zoom in"
- tooltipDisabled={!canZoomIn()}
class={cn(
'invisible border-edge-muted bg-surface opacity-0 shadow-md transition-opacity group-hover/zoom:visible group-hover/zoom:pointer-events-auto group-hover/zoom:opacity-100 group-focus-within/zoom:visible group-focus-within/zoom:pointer-events-auto group-focus-within/zoom:opacity-100 touch:visible touch:pointer-events-auto touch:opacity-100 motion-reduce:transition-none',
gantt.scrollZooming() && 'visible pointer-events-auto opacity-100'
@@ -70,10 +68,9 @@ export function GanttZoomControls() {
</Button>
</div>
<Button
- depth={2}
+ aria-label={'Reset zoom'}
size="lg"
variant="ghost"
- label="Reset zoom"
tooltip="Reset zoom to 100%"
disabled={unavailable()}
class="pointer-events-auto min-w-16 shrink-0 border-edge-muted bg-surface px-2 text-sm shadow-md tabular-nums"
diff --git a/apps/web/src/components/ui/components/ApiKeyInput.docs.tsx b/apps/web/src/components/ui/components/ApiKeyInput.docs.tsx
index 9c261a5621..668d6200ce 100644
--- a/apps/web/src/components/ui/components/ApiKeyInput.docs.tsx
+++ b/apps/web/src/components/ui/components/ApiKeyInput.docs.tsx
@@ -15,7 +15,7 @@ function NewKeyDemo() {
onValueChange={setKey}
aria-label="Anthropic API key"
/>
- <Button variant="outline" size="sm" disabled={key().trim() === ''}>
+ <Button variant="secondary" size="sm" disabled={key().trim() === ''}>
Save
</Button>
</div>
@@ -36,7 +36,7 @@ function SavedKeyDemo() {
onValueChange={setKey}
aria-label="Anthropic API key"
/>
- <Button variant="outline" size="sm" disabled={key().trim() === ''}>
+ <Button variant="secondary" size="sm" disabled={key().trim() === ''}>
Replace
</Button>
</div>
diff --git a/apps/web/src/components/ui/components/Avatar.tsx b/apps/web/src/components/ui/components/Avatar.tsx
index 2140df1730..869a962de3 100644
--- a/apps/web/src/components/ui/components/Avatar.tsx
+++ b/apps/web/src/components/ui/components/Avatar.tsx
@@ -74,7 +74,7 @@ export function avatarClasses(options: AvatarClassOptions = {}): string {
return cn(
avatarVariants({ size, shape }),
- shape === 'square' && SQUARE_RADIUS[size],
+ shape === 'square' && size != null && SQUARE_RADIUS[size],
// Only the root draws the edge. `avatar-edge` is an outline, which paints
// after every descendant and is not clipped by `overflow`, so it lands on
// top of a covering image without the image needing one of its own.
diff --git a/apps/web/src/components/ui/components/Badge.tsx b/apps/web/src/components/ui/components/Badge.tsx
index 85424accc6..0f80286516 100644
--- a/apps/web/src/components/ui/components/Badge.tsx
+++ b/apps/web/src/components/ui/components/Badge.tsx
@@ -14,6 +14,7 @@ export const badgeVariants = createVariants(
{
variant: {
ghost: 'bg-transparent text-ink-muted',
+ secondary: 'bg-button-secondary-bg text-ink',
outline: 'bg-transparent text-ink-muted border-edge-muted',
},
size: {
@@ -62,9 +63,8 @@ export function badgeTriggerClasses(options: BadgeClassOptions = {}): string {
const { variant = 'ghost', size = 'md', class: className } = options;
return cn(
buttonClasses({
- variant,
- size,
- noTouchResize: true,
+ variant: variant ?? 'ghost',
+ size: size ?? 'md',
class: className,
}),
'focus-visible:ring-2 focus-visible:ring-accent/20',
diff --git a/apps/web/src/components/ui/components/Button.docs.tsx b/apps/web/src/components/ui/components/Button.docs.tsx
index a9d9609c8b..53cafaa32a 100644
--- a/apps/web/src/components/ui/components/Button.docs.tsx
+++ b/apps/web/src/components/ui/components/Button.docs.tsx
@@ -1,47 +1,42 @@
import { defineDoc } from '@app/features/ui-gallery/types';
+import { HeaderActionButton } from '@components/app/HeaderActionButton';
import ArrowRightIcon from '@icon/system/regular/arrow-right.svg';
import PlusIcon from '@icon/system/regular/plus.svg';
-import TrashIcon from '@icon/system/regular/trash.svg';
-import { For, Show } from 'solid-js';
+import { DropdownMenu } from '@kobalte/core/dropdown-menu';
+import { macroDarkTheme } from '@theme/themes/macro-dark';
+import { macroLightTheme } from '@theme/themes/macro-light';
+import { themeCssVars } from '@theme/utils/themeCssVars';
+import { createSignal, For } from 'solid-js';
import { Button, type ButtonVariant } from './Button';
import { ButtonGroup } from './ButtonGroup';
const VARIANTS: ButtonVariant[] = [
- 'ghost',
+ 'primary',
+ 'neutral',
+ 'secondary',
'outline',
- 'accent',
- 'success',
+ 'ghost',
'danger',
- 'strong',
- 'cta',
+ 'success',
+ 'link',
];
// #region demo:variants
function VariantsDemo() {
return (
- <div class="flex w-full flex-col gap-3">
+ <div class="flex flex-col gap-4">
<For each={VARIANTS}>
{(variant) => (
- <div class="flex items-center gap-3">
- <span class="w-20 shrink-0 font-mono text-xs text-ink-subtle">
- {variant}
- </span>
+ <div class="flex flex-wrap items-center gap-4">
+ <span class="w-20 font-mono text-xs text-ink-muted">{variant}</span>
<Button variant={variant}>Button</Button>
<Button variant={variant}>
- <PlusIcon />
- With icon
+ <PlusIcon class="size-4" aria-hidden="true" />
+ Create item
</Button>
- <Button variant={variant} size="icon-md" label={`${variant} icon`}>
- <PlusIcon />
- </Button>
- <Button variant={variant} glass>
- Glass
- </Button>
- <Button variant={variant} glass={false}>
- No glass
- </Button>
- <Button variant={variant} disabled>
- Disabled
+ <Button variant={variant}>
+ Continue
+ <ArrowRightIcon class="size-4" aria-hidden="true" />
</Button>
</div>
)}
@@ -54,111 +49,170 @@ function VariantsDemo() {
// #region demo:sizes
function SizesDemo() {
return (
- <div class="flex flex-wrap items-end gap-3">
- <For each={['xs', 'sm', 'md', 'lg', 'xl'] as const}>
- {(size) => (
- <div class="flex flex-col items-start gap-1.5">
- <span class="font-mono text-xs text-ink-subtle">{size}</span>
- <Button variant="outline" size={size}>
- Button
+ <div class="flex flex-col gap-4">
+ <div class="flex flex-wrap items-center gap-4">
+ <For each={['xs', 'sm', 'md', 'lg', 'xl'] as const}>
+ {(size) => (
+ <Button variant="secondary" size={size}>
+ {size}
</Button>
- </div>
- )}
- </For>
+ )}
+ </For>
+ </div>
+ <div class="flex flex-wrap items-center gap-4">
+ <For
+ each={
+ ['icon-xs', 'icon-sm', 'icon-md', 'icon-lg', 'icon-xl'] as const
+ }
+ >
+ {(size) => (
+ <Button
+ variant="secondary"
+ size={size}
+ aria-label={`Add item (${size})`}
+ tooltip={size}
+ >
+ <PlusIcon class="size-4" />
+ </Button>
+ )}
+ </For>
+ </div>
</div>
);
}
// #endregion
-// #region demo:icon-only
-function IconOnlyDemo() {
+// #region demo:states
+function StatesDemo() {
+ const [pressed, setPressed] = createSignal(false);
+ const [loading, setLoading] = createSignal(false);
return (
- <div class="flex flex-wrap items-end gap-3">
- <For
- each={
- ['icon-xs', 'icon-sm', 'icon-md', 'icon-lg', 'icon-composer'] as const
- }
+ <div class="flex flex-wrap items-center gap-4">
+ <Button
+ variant="ghost"
+ aria-pressed={pressed()}
+ onClick={() => setPressed(!pressed())}
>
- {(size) => (
- <div class="flex flex-col items-start gap-1.5">
- <span class="font-mono text-xs text-ink-subtle">{size}</span>
- <Button variant="outline" size={size} label="Add item">
- <PlusIcon />
- </Button>
- </div>
- )}
- </For>
+ Toggle {pressed() ? 'on' : 'off'}
+ </Button>
+ <Button variant="secondary" disabled>
+ Disabled
+ </Button>
+ <Button
+ variant="primary"
+ loading={loading()}
+ onClick={() => setLoading(true)}
+ >
+ Save example
+ </Button>
+ <Button
+ variant="ghost"
+ disabled={!loading()}
+ onClick={() => setLoading(false)}
+ >
+ Reset loading
+ </Button>
+ <Button
+ size="icon-md"
+ variant="secondary"
+ aria-label="Add item"
+ tooltip={{ content: 'Add item', shortcut: 'meta+enter' }}
+ >
+ <PlusIcon class="size-4" />
+ </Button>
</div>
);
}
// #endregion
-// #region demo:size-compositions
-function SizeCompositionsDemo() {
- const sizes = [
- { size: 'xs', iconSize: 'icon-xs' },
- { size: 'sm', iconSize: 'icon-sm' },
- { size: 'md', iconSize: 'icon-md' },
- { size: 'lg', iconSize: 'icon-lg' },
- { size: 'xl', iconSize: undefined },
- ] as const;
+// #region demo:group
+function GroupDemo() {
+ return (
+ <ButtonGroup
+ finish="raised"
+ variant="secondary"
+ size="md"
+ aria-label="Document actions"
+ >
+ <ButtonGroup.Button>Add</ButtonGroup.Button>
+ <ButtonGroup.Divider />
+ <ButtonGroup.Button>Duplicate</ButtonGroup.Button>
+ <ButtonGroup.Divider />
+ <ButtonGroup.Button>Archive</ButtonGroup.Button>
+ </ButtonGroup>
+ );
+}
+// #endregion
+
+// #region demo:header
+function HeaderDemo() {
+ const [actions, setActions] = createSignal(0);
+ return (
+ <div class="@container/split-header flex w-full items-center justify-between gap-4">
+ <span class="text-sm text-ink-muted" aria-live="polite">
+ Local actions: {actions()}
+ </span>
+ <HeaderActionButton
+ label="Add item"
+ icon={
+ <PlusIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ tooltip="Add a local example item"
+ onClick={() => setActions(actions() + 1)}
+ />
+ </div>
+ );
+}
+// #endregion
+// #region demo:trigger
+function TriggerDemo() {
+ const [choice, setChoice] = createSignal('No action selected');
return (
- <div class="flex w-full flex-col gap-3">
- <For each={sizes}>
- {({ size, iconSize }) => (
- <div class="flex items-center gap-3">
- <span class="w-8 shrink-0 font-mono text-xs text-ink-subtle">
- {size}
- </span>
- <Button variant="outline" size={size} square label="Add item">
- <PlusIcon />
- </Button>
- <Button variant="outline" size={size}>
- Button
- </Button>
- <Button variant="outline" size={size}>
- <PlusIcon />
- With icon
- </Button>
- <Show when={iconSize}>
- {(resolvedIconSize) => (
- <Button
- variant="outline"
- size={resolvedIconSize()}
- label={resolvedIconSize()}
- >
- <PlusIcon />
- </Button>
- )}
- </Show>
- </div>
- )}
- </For>
+ <div class="flex items-center gap-4">
+ <DropdownMenu>
+ <DropdownMenu.Trigger as={Button} variant="secondary">
+ Actions
+ </DropdownMenu.Trigger>
+ <DropdownMenu.Portal>
+ <DropdownMenu.Content class="menu-surface z-50 min-w-40 p-1">
+ <DropdownMenu.Item
+ class="rounded-md px-3 py-2 outline-none data-highlighted:bg-hover"
+ onSelect={() => setChoice('Duplicate selected')}
+ >
+ Duplicate
+ </DropdownMenu.Item>
+ <DropdownMenu.Item
+ class="rounded-md px-3 py-2 outline-none data-highlighted:bg-hover"
+ onSelect={() => setChoice('Archive selected')}
+ >
+ Archive
+ </DropdownMenu.Item>
+ </DropdownMenu.Content>
+ </DropdownMenu.Portal>
+ </DropdownMenu>
+ <span class="text-sm text-ink-muted" aria-live="polite">
+ {choice()}
+ </span>
</div>
);
}
// #endregion
-// #region demo:group
-function GroupDemo() {
+// #region demo:themes
+function ThemesDemo() {
return (
- <div class="flex flex-col gap-4 items-center">
- <For each={['sm', 'md', 'lg'] as const}>
- {(size) => (
- <ButtonGroup variant="outline" size={size}>
- <Button>
- <TrashIcon />
- Delete
- </Button>
- <ButtonGroup.Divider />
- <Button>Duplicate</Button>
- <ButtonGroup.Divider />
- <Button>
- Next
- <ArrowRightIcon />
- </Button>
- </ButtonGroup>
+ <div class="flex flex-col gap-4">
+ <For each={[macroLightTheme, macroDarkTheme]}>
+ {(theme) => (
+ <div
+ data-theme-light={String(theme.mode === 'light')}
+ style={themeCssVars(theme)}
+ class="rounded-xl bg-panel p-4 text-ink"
+ >
+ <p class="mb-4 text-sm">{theme.name}</p>
+ <VariantsDemo />
+ </div>
)}
</For>
</div>
@@ -166,16 +220,20 @@ function GroupDemo() {
}
// #endregion
-// #region demo:tooltip
-function TooltipDemo() {
+// #region demo:finishes
+function FinishesDemo() {
return (
- <div class="flex flex-wrap items-center gap-3">
- <Button variant="outline" label="Create document" shortcut="⌘N">
- <PlusIcon />
+ <div class="flex flex-wrap items-center gap-4">
+ <Button variant="secondary">Automatic</Button>
+ <Button variant="secondary" finish="flat">
+ Flat
</Button>
- <Button variant="ghost" tooltip="Permanently deletes the selection">
- <TrashIcon />
- Delete
+ <Button variant="ghost" finish="raised">
+ Framed ghost
+ </Button>
+ <Button variant="ghost">Ghost</Button>
+ <Button variant="secondary" aria-pressed="true">
+ Pressed
</Button>
</div>
);
@@ -186,54 +244,22 @@ export default defineDoc({
name: 'Button',
category: 'Actions',
description:
- 'The standard way to trigger an action. Variant carries emphasis, size carries density, and both are shared with Badge so button-like elements line up.',
- status: 'stable',
+ 'Shared action control with semantic materials, automatic desktop elevation and touch glass, explicit icon sizes, and configurable tooltips.',
+ status: 'beta',
exports: ['Button', 'ButtonGroup'],
import: "import { Button, ButtonGroup } from '@ui';",
demos: [
+ { id: 'variants', title: 'Variants', render: VariantsDemo },
+ { id: 'sizes', title: 'Text and icon sizes', render: SizesDemo },
+ { id: 'states', title: 'State and tooltip behavior', render: StatesDemo },
+ { id: 'group', title: 'Grouped actions', render: GroupDemo },
+ { id: 'header', title: 'Header action', render: HeaderDemo, fill: true },
+ { id: 'trigger', title: 'Headless menu trigger', render: TriggerDemo },
+ { id: 'themes', title: 'Light and dark', render: ThemesDemo, fill: true },
{
- id: 'variants',
- title: 'Variants',
- description:
- '`ghost` for low-emphasis actions in dense chrome, `outline` for standard actions, `strong` for the same frame with bolder text, `accent` for the primary action in a group, `cta` for the single most important action on a screen. `danger` is reserved for destructive work. Framed variants use the shared elevated surface on desktop and glass on touch. `glass={false}` keeps a flat frame. Success and danger use colored ink with an unfilled outline frame; icon sizes preserve the same emphasis as text buttons.',
- render: VariantsDemo,
- fill: true,
- },
- {
- id: 'sizes',
- title: 'Sizes',
- description:
- '`md` is the default. `sm` suits toolbars and inline chrome; `lg` and `xl` are for marketing and empty-state surfaces.',
- render: SizesDemo,
- },
- {
- id: 'icon-only',
- title: 'Icon-only',
- description:
- 'Use an `icon-*` size for square buttons. `label` is required — it names the button for screen readers and becomes its tooltip.',
- render: IconOnlyDemo,
- },
- {
- id: 'size-compositions',
- title: 'Compositions by size',
- description:
- 'Square regular-size, text-only, text-with-icon, and matching dedicated `icon-*` buttons shown together for direct comparison.',
- render: SizeCompositionsDemo,
- fill: true,
- },
- {
- id: 'group',
- title: 'Button group',
- description:
- '`ButtonGroup` joins related actions into a single segmented control. Add `ButtonGroup.Divider` between segments; the group owns the shared border and corner radius.',
- render: GroupDemo,
- },
- {
- id: 'tooltip',
- title: 'Tooltips and shortcuts',
- description:
- '`label` doubles as the tooltip; `tooltip` overrides it when the accessible name and the hint should differ. `hotkey` renders a registered shortcut, `shortcut` a raw string. Tooltips are disabled on touch devices, including when an action receives focus.',
- render: TooltipDemo,
+ id: 'finishes',
+ title: 'Automatic and flat finishes',
+ render: FinishesDemo,
},
],
});
diff --git a/apps/web/src/components/ui/components/Button.test.tsx b/apps/web/src/components/ui/components/Button.test.tsx
index 382012b073..3cd5b4b1c3 100644
--- a/apps/web/src/components/ui/components/Button.test.tsx
+++ b/apps/web/src/components/ui/components/Button.test.tsx
@@ -1,62 +1,55 @@
-import { cleanup, render, screen } from '@solidjs/testing-library';
+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
import { createSignal } from 'solid-js';
-import { afterEach, describe, expect, it } from 'vitest';
-import { Button, type ButtonSize, buttonClasses } from './Button';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { Button } from './Button';
import { ButtonGroup } from './ButtonGroup';
afterEach(cleanup);
-describe('Button emphasis', () => {
- it.each(['md', 'icon-md', 'icon-composer'] satisfies ButtonSize[])(
- 'preserves variant emphasis at size %s, including square controls',
- (size) => {
- for (const square of [false, true]) {
- expect(buttonClasses({ variant: 'strong', size, square })).toContain(
- 'bg-control'
- );
- expect(buttonClasses({ variant: 'strong', size, square })).toContain(
- 'font-semibold'
- );
- expect(buttonClasses({ variant: 'cta', size, square })).toContain(
- 'bg-accent '
- );
- expect(buttonClasses({ variant: 'outline', size, square })).toContain(
- 'border-edge-button'
- );
- }
- }
- );
-
- it('can disable glass reactively without changing emphasis or leaking a DOM prop', () => {
- const [glass, setGlass] = createSignal<boolean | undefined>();
+describe('Button', () => {
+ it('disables activation while loading and preserves its accessible name', () => {
+ const [loading, setLoading] = createSignal(false);
+ const onClick = vi.fn();
render(() => (
- <Button variant="cta" glass={glass()}>
- Create
+ <Button loading={loading()} onClick={onClick}>
+ Save
</Button>
));
- const button = screen.getByRole('button', { name: 'Create' });
- expect(button.classList.contains('glass')).toBe(false);
- expect(button.classList.contains('touch:glass')).toBe(true);
- setGlass(true);
- expect(button.classList.contains('glass')).toBe(true);
- expect(button.classList.contains('touch:glass')).toBe(false);
- setGlass(false);
- expect(button.classList.contains('touch:glass')).toBe(false);
- expect(button.classList.contains('glass')).toBe(false);
- expect(button.classList.contains('bg-accent')).toBe(true);
- expect(button.hasAttribute('glass')).toBe(false);
+ const button = screen.getByRole('button', { name: 'Save' });
+ fireEvent.click(button);
+ expect(onClick).toHaveBeenCalledTimes(1);
+
+ setLoading(true);
+ expect(button.hasAttribute('disabled')).toBe(true);
+ expect(button.getAttribute('aria-busy')).toBe('true');
+ fireEvent.click(button);
+ expect(onClick).toHaveBeenCalledTimes(1);
+ expect(screen.getByRole('button', { name: 'Save' })).toBe(button);
+
+ setLoading(false);
+ expect(button.hasAttribute('disabled')).toBe(false);
+ fireEvent.click(button);
+ expect(onClick).toHaveBeenCalledTimes(2);
});
- it('preserves emphasis inside a group without giving each segment glass', () => {
+ it('inherits group settings only through explicit segments', () => {
render(() => (
- <ButtonGroup variant="strong">
- <Button>Save</Button>
- <Button>Save all</Button>
+ <ButtonGroup variant="secondary" size="sm">
+ <ButtonGroup.Button>Save</ButtonGroup.Button>
+ <ButtonGroup.Button variant="primary" size="lg">
+ Publish
+ </ButtonGroup.Button>
+ <Button>Independent</Button>
</ButtonGroup>
));
- for (const button of screen.getAllByRole('button')) {
- expect(button.classList.contains('bg-control')).toBe(true);
- expect(button.classList.contains('glass')).toBe(false);
- }
+ const save = screen.getByRole('button', { name: 'Save' });
+ expect(save.getAttribute('data-variant')).toBe('secondary');
+ expect(save.getAttribute('data-size')).toBe('sm');
+ const publish = screen.getByRole('button', { name: 'Publish' });
+ expect(publish.getAttribute('data-variant')).toBe('primary');
+ expect(publish.getAttribute('data-size')).toBe('lg');
+ const independent = screen.getByRole('button', { name: 'Independent' });
+ expect(independent.getAttribute('data-variant')).toBe('primary');
+ expect(independent.getAttribute('data-size')).toBe('md');
});
});
diff --git a/apps/web/src/components/ui/components/Button.tsx b/apps/web/src/components/ui/components/Button.tsx
index 0a8bd21a66..9bb4e31a57 100644
--- a/apps/web/src/components/ui/components/Button.tsx
+++ b/apps/web/src/components/ui/components/Button.tsx
@@ -1,267 +1,310 @@
import type { HotkeyToken } from '@core/hotkey/tokens';
-import type { Placement } from '@floating-ui/dom';
import {
type ButtonRootProps,
Button as KobalteButton,
} from '@kobalte/core/button';
-import { type ComponentProps, type JSX, Show, splitProps } from 'solid-js';
+import type { PolymorphicProps } from '@kobalte/core/polymorphic';
+import {
+ type ComponentProps,
+ For,
+ type JSX,
+ Show,
+ splitProps,
+ type ValidComponent,
+} from 'solid-js';
+import { createButtonActivation } from '../utils/button-activation';
+import { raisedButtonStyles } from '../utils/button-finishes';
import { cn } from '../utils/classname';
-import { CONTROL_SIZE_VARIANTS } from '../utils/controlSizes';
+import { iconControlSizes, labeledControlSizes } from '../utils/control-sizes';
import { createVariants, type VariantProps } from '../utils/variants';
-import { useButtonGroupContext } from './ButtonGroup';
-import { Layer } from './Layer';
+import { Hotkey } from './Hotkey';
import { Tooltip } from './Tooltip';
-const BUTTON_TOUCH_STYLES =
- "touch:min-h-9 touch:min-w-9 touch:[&>svg:not([class*='size-'])]:size-6";
-
-// Variant owns emphasis and surface; size only controls geometry.
-/** 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-full border border-transparent font-medium outline-none select-none transition-colors duration-120 motion-reduce:transition-none [&_*]:select-none',
- 'focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-edge-focus',
- 'aria-pressed:overlay-active',
- 'data-disabled:cursor-not-allowed data-disabled:opacity-50',
- '[&_svg]:pointer-events-none [&_svg]:shrink-0'
+const buttonFrames = {
+ primary:
+ 'bg-button-primary-bg text-button-primary-ink border-transparent shadow-button',
+ neutral:
+ 'bg-button-neutral-bg text-button-neutral-ink border-transparent shadow-button',
+ secondary: cn(
+ 'bg-button-secondary-bg text-ink-muted border-border-secondary dark-mode:border-transparent shadow-button',
+ 'light-mode:not-data-disabled:active:border-border-secondary light-mode:aria-pressed:border-border-secondary light-mode:popup-open:border-border-secondary'
),
+ outline:
+ 'bg-transparent text-ink-muted border-border-secondary bg-none shadow-none',
+ ghost:
+ 'bg-button-tertiary-bg text-ink-muted border-transparent bg-none shadow-none',
+ danger: 'bg-button-danger-bg text-failure border-transparent shadow-button',
+ success: 'bg-button-success-bg text-success border-transparent shadow-button',
+ link: 'border-transparent bg-transparent text-link shadow-none',
+};
+
+const buttonMutedTextStyles =
+ 'not-data-disabled:hover:text-ink not-data-disabled:focus-visible:text-ink not-data-disabled:active:text-ink aria-pressed:text-ink popup-open:text-ink';
+// Disclosure state stays semantic; only open popups receive active styling.
+const buttonPressedStyles =
+ 'not-data-disabled:active:bg-none aria-pressed:bg-none popup-open:bg-none not-data-disabled:active:shadow-none aria-pressed:shadow-none popup-open:shadow-none';
+
+/** Shared recipe for Button and headless controls that own their rendering. */
+const buttonStyles = createVariants(
+ 'relative inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-full border font-medium select-none transition-colors duration-150 disabled:cursor-not-allowed disabled:opacity-45 data-disabled:cursor-not-allowed data-disabled:opacity-45 focus-visible:outline-hidden focus-visible:-outline-offset-2 motion-reduce:transition-none forced-colors:focus-visible:outline-current touch:min-h-9 touch:min-w-9',
{
variant: {
- danger:
- 'bg-transparent border-edge-button text-failure not-touch:not-disabled:hover:overlay-hover not-touch:not-disabled:active:overlay-active',
- outline:
- 'bg-control text-ink-muted border-edge-button not-touch:not-disabled:hover:overlay-hover not-touch:not-disabled:hover:text-ink not-touch:not-disabled:active:overlay-active',
- accent:
- 'bg-accent-bg not-touch:not-disabled:hover:overlay-accent-bg text-accent',
- success:
- 'bg-transparent border-edge-button text-success not-touch:not-disabled:hover:overlay-hover not-touch:not-disabled:active:overlay-active',
- ghost:
- 'bg-transparent text-ink-muted not-touch:not-disabled:hover:overlay-hover not-touch:not-disabled:hover:text-ink not-touch:not-disabled:active:overlay-active',
- strong:
- 'bg-control text-ink-muted border-edge-button font-semibold not-touch:not-disabled:hover:overlay-hover not-touch:not-disabled:hover:text-ink not-touch:not-disabled:active:overlay-active',
- 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-touch:not-disabled:hover:overlay-[color-mix(in_oklch,var(--color-surface)_12%,transparent)] not-touch:not-disabled:active:overlay-[color-mix(in_oklch,var(--color-surface)_22%,transparent)]',
+ primary: cn(
+ buttonFrames.primary,
+ 'not-data-disabled:hover:bg-button-primary-hover not-data-disabled:active:bg-button-primary-pressed aria-pressed:bg-button-primary-pressed aria-pressed:not-data-disabled:hover:bg-button-primary-pressed popup-open:bg-button-primary-pressed popup-open:not-data-disabled:hover:bg-button-primary-pressed',
+ buttonPressedStyles
+ ),
+ neutral: cn(
+ buttonFrames.neutral,
+ 'not-data-disabled:hover:bg-button-neutral-hover not-data-disabled:active:bg-button-neutral-pressed aria-pressed:bg-button-neutral-pressed aria-pressed:not-data-disabled:hover:bg-button-neutral-pressed popup-open:bg-button-neutral-pressed popup-open:not-data-disabled:hover:bg-button-neutral-pressed',
+ buttonPressedStyles
+ ),
+ secondary: cn(
+ buttonFrames.secondary,
+ buttonMutedTextStyles,
+ 'not-data-disabled:hover:bg-button-secondary-hover not-data-disabled:active:bg-button-secondary-pressed aria-pressed:bg-button-secondary-pressed aria-pressed:not-data-disabled:hover:bg-button-secondary-pressed popup-open:bg-button-secondary-pressed popup-open:not-data-disabled:hover:bg-button-secondary-pressed',
+ buttonPressedStyles
+ ),
+ outline: cn(
+ buttonFrames.outline,
+ buttonMutedTextStyles,
+ 'not-data-disabled:hover:bg-button-outline-hover not-data-disabled:active:bg-button-outline-pressed aria-pressed:bg-button-outline-pressed aria-pressed:not-data-disabled:hover:bg-button-outline-pressed popup-open:bg-button-outline-pressed popup-open:not-data-disabled:hover:bg-button-outline-pressed',
+ buttonPressedStyles
+ ),
+ ghost: cn(
+ buttonFrames.ghost,
+ 'not-data-disabled:hover:bg-button-tertiary-hover not-data-disabled:hover:text-ink not-data-disabled:active:bg-button-tertiary-pressed not-data-disabled:active:text-ink aria-pressed:bg-button-tertiary-pressed aria-pressed:text-ink aria-pressed:not-data-disabled:hover:bg-button-tertiary-pressed popup-open:bg-button-tertiary-pressed popup-open:text-ink popup-open:not-data-disabled:hover:bg-button-tertiary-pressed',
+ buttonPressedStyles
+ ),
+ danger: cn(
+ buttonFrames.danger,
+ 'not-data-disabled:hover:bg-button-danger-hover not-data-disabled:active:bg-button-danger-pressed aria-pressed:bg-button-danger-pressed aria-pressed:not-data-disabled:hover:bg-button-danger-pressed popup-open:bg-button-danger-pressed popup-open:not-data-disabled:hover:bg-button-danger-pressed',
+ buttonPressedStyles
+ ),
+ success: cn(
+ buttonFrames.success,
+ 'not-data-disabled:hover:bg-button-success-hover not-data-disabled:active:bg-button-success-pressed aria-pressed:bg-button-success-pressed aria-pressed:not-data-disabled:hover:bg-button-success-pressed popup-open:bg-button-success-pressed popup-open:not-data-disabled:hover:bg-button-success-pressed',
+ buttonPressedStyles
+ ),
+ link: cn(
+ buttonFrames.link,
+ 'underline-offset-4 not-data-disabled:hover:text-link-hover not-data-disabled:hover:underline'
+ ),
},
size: {
- xs: "h-5 gap-1 px-1.5 text-xs [&>svg:not([class*='size-'])]:size-3",
- 'icon-xs': "size-5 p-0.5 [&>svg:not([class*='size-'])]:size-3",
- sm: CONTROL_SIZE_VARIANTS.sm,
- md: CONTROL_SIZE_VARIANTS.md,
- lg: CONTROL_SIZE_VARIANTS.lg,
- xl: "h-12 gap-2 px-4 text-base [&>svg:not([class*='size-'])]:size-5",
- 'icon-lg':
- "size-9 aspect-square p-2 [&>svg:not([class*='size-'])]:size-5",
- 'icon-md':
- "size-8 aspect-square p-1.5 [&>svg:not([class*='size-'])]:size-4",
- 'icon-sm':
- "size-6 aspect-square p-1 [&>svg:not([class*='size-'])]:size-3.5",
- 'icon-composer':
- 'size-6 aspect-square p-1 touch:[&_svg]:size-3.5 not-touch:size-[33.75px] not-touch:p-[3.75px] not-touch:[&_svg]:size-[20.625px]',
+ ...labeledControlSizes,
+ 'icon-xs': iconControlSizes.xs,
+ 'icon-sm': iconControlSizes.sm,
+ 'icon-md': iconControlSizes.md,
+ 'icon-lg': iconControlSizes.lg,
+ 'icon-xl': iconControlSizes.xl,
},
},
- {
- variant: 'ghost',
- size: 'md',
- }
+ { variant: 'primary', size: 'md' }
);
-/** Variant props inferred from the canonical button variant definition. */
-export type ButtonVariantProps = VariantProps<typeof buttonVariants>;
+export type ButtonVariantProps = VariantProps<typeof buttonStyles>;
export type ButtonVariant = NonNullable<ButtonVariantProps['variant']>;
export type ButtonSize = NonNullable<ButtonVariantProps['size']>;
-
+export type ButtonFinish = 'flat' | 'raised';
export type ButtonClassOptions = {
variant?: ButtonVariant;
+ /** Composed rows own their surface states without layering a second button face. */
+ appearance?: 'default' | 'bare';
+ /** Outline is always flat; other framed variants adapt to desktop and touch. */
+ finish?: ButtonFinish;
size?: ButtonSize;
fullWidth?: boolean;
- noTouchResize?: boolean;
- /** Framed variants are elevated on desktop and glass on touch; false opts out. */
- glass?: boolean;
- square?: boolean;
class?: string;
};
-export type ButtonProps = ButtonRootProps<'button'> &
- ComponentProps<'button'> & {
- depth?: 0 | 1 | 2 | 3 | 4;
- tooltipPlacement?: Placement;
- /**
- * Stretch the button (and, when a tooltip wraps it, the tooltip's trigger
- * wrapper) to fill the available width. Without this the tooltip wrapper is
- * `inline-flex` and collapses a `w-full` button to its content width.
- */
- fullWidth?: boolean;
- noTouchResize?: boolean;
- /** Framed variants are elevated on desktop and glass on touch; false opts out. */
- glass?: boolean;
- square?: boolean;
- variant?: ButtonVariant;
- children?: JSX.Element;
- /**
- * 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.
- */
- shortcut?: string | string[];
- size?: ButtonSize;
- class?: string;
- tooltipDisabled?: boolean;
- };
+function buttonFinishClasses(variant: ButtonVariant, finish?: ButtonFinish) {
+ if (finish === 'flat' || variant === 'outline') return 'shadow-none';
+ if (finish !== 'raised' && (variant === 'ghost' || variant === 'link')) {
+ return undefined;
+ }
-/** Returns the canonical classes for a button-like element. */
-export function buttonClasses(options: ButtonClassOptions = {}): string {
- const {
- variant,
- size,
- fullWidth = false,
- noTouchResize = false,
- square = false,
- glass,
- class: className,
- } = options;
+ return raisedButtonStyles;
+}
- const framed =
- glass === true || (glass === undefined && (variant ?? 'ghost') !== 'ghost');
+/** Non-interactive frame material shared by Button and ButtonGroup. */
+export function buttonFrameClasses(
+ options: Pick<ButtonClassOptions, 'variant' | 'finish'> = {}
+) {
+ const { variant = 'primary', finish } = options;
+ return cn(buttonFrames[variant], buttonFinishClasses(variant, finish));
+}
+
+export function buttonClasses(options: ButtonClassOptions = {}) {
+ const { variant = 'primary', finish, appearance } = options;
+ const isBare = appearance === 'bare';
return cn(
- buttonVariants({ variant, size }),
- glass === true && 'glass not-touch:elevated',
- glass === undefined &&
- (variant ?? 'ghost') !== 'ghost' &&
- 'not-touch:elevated touch:glass',
- // Pressed matches a selected Tabs option: the pressed fill, flat.
- framed &&
- 'not-touch:aria-pressed:border-edge-button not-touch:aria-pressed:shadow-none',
- fullWidth && 'w-full',
- !noTouchResize && BUTTON_TOUCH_STYLES,
- square && 'aspect-square p-0',
- className
+ buttonStyles({ variant: isBare ? null : variant, size: options.size }),
+ isBare && 'border-transparent bg-transparent shadow-none',
+ !isBare && buttonFinishClasses(variant, finish),
+ options.fullWidth && 'w-full',
+ options.class
);
}
-function isIconSize(size: ButtonSize): boolean {
- return size.startsWith('icon-');
+export const buttonVariants = buttonClasses;
+
+export type ButtonTooltipOptions = {
+ content: JSX.Element;
+ placement?: ComponentProps<typeof Tooltip.Root>['placement'];
+ disabled?: boolean;
+ hotkey?: HotkeyToken | HotkeyToken[];
+ shortcut?: string | string[];
+};
+export type ButtonTooltip = string | ButtonTooltipOptions;
+
+function tooltipOptions(
+ value: ButtonTooltip | undefined
+): ButtonTooltipOptions {
+ if (typeof value === 'string' || value === undefined) {
+ return { content: value };
+ }
+ return value;
}
+export type ButtonProps<T extends ValidComponent = 'button'> = PolymorphicProps<
+ T,
+ ButtonRootProps<T> &
+ ButtonClassOptions & {
+ /** Plain text or tooltip options; accessible naming stays in aria-label. */
+ tooltip?: ButtonTooltip;
+ loading?: boolean;
+ children?: JSX.Element;
+ }
+>;
+
/**
- * The standard way to trigger an action. `variant` carries emphasis and
- * `size` carries density; both are shared with Badge so button-like elements
- * line up.
- *
- * @do Use ghost for unframed actions, at any size.
- * @do Use strong for outline actions with bolder type and cta for accent-filled actions.
- * @do Use the default shared surface, or glass={false} for a flat frame.
- * @do Always set `label` on icon-only buttons; it is the accessible name.
- * @do Use `icon-*` sizes for icon-only buttons; `icon-md` beside 32px controls.
- * @do Mark on/off toggles with `aria-pressed`; it draws the selected-tab fill.
- * @do Use `danger` only for destructive actions, paired with a confirmation.
- * @dont Do not restyle a button with utility classes when a variant already
- * covers it, and never resize one from a wrapper (`[&_button]:size-8`).
- * @dont Do not use `square` for new icon buttons; it keeps the text-size glyph.
- * @dont Do not build tabs from Buttons; use `Tabs` or `TabSelector`.
- * @dont Do not use a Button for navigation that should be a link.
- * @dont Do not put two `danger` buttons next to each other.
+ * Actions use Button; navigation uses anchors. Framed variants adapt to the device.
+ * @do Set aria-label for icon-only actions and use an explicit icon-* size.
+ * @do Use tooltip strings for content only, or options for hotkeys and placement.
+ * @dont Use Button for links or size descendant icons through the control.
*/
-export const Button = (props: ButtonProps) => {
- const [local, others] = splitProps(props, [
- 'tooltipPlacement',
- 'children',
- 'tooltip',
+export function Button<T extends ValidComponent = 'button'>(
+ props: ButtonProps<T>
+) {
+ const [local, native] = splitProps(props as ButtonProps, [
'variant',
- 'hotkey',
- 'shortcut',
- 'class',
- 'depth',
- 'label',
+ 'appearance',
+ 'finish',
'size',
+ 'loading',
+ 'class',
+ 'children',
+ 'disabled',
'fullWidth',
- 'noTouchResize',
- 'glass',
- 'square',
- 'tooltipDisabled',
- 'aria-label',
+ 'tooltip',
+ 'tabIndex',
+ 'onClick',
+ 'onAuxClick',
+ 'onKeyDown',
+ 'onKeyUp',
]);
+ const variant = () => local.variant ?? 'primary';
+ const size = () => local.size ?? 'md';
+ const unavailable = () => !!(local.disabled || local.loading);
+ const activation = createButtonActivation(unavailable, local);
+ const tabIndexProps = () => {
+ if (unavailable()) return { tabIndex: -1 };
+ if (local.tabIndex === undefined) return {};
+ return { tabIndex: local.tabIndex };
+ };
+ const tooltip = () => tooltipOptions(local.tooltip);
+ const tokens = () => {
+ const value = tooltip().hotkey;
+ return value ? (Array.isArray(value) ? value : [value]) : [];
+ };
+ const shortcuts = () => {
+ const value = tooltip().shortcut;
+ return value ? (Array.isArray(value) ? value : [value]) : [];
+ };
- const group = useButtonGroupContext();
-
- const variant = () => local.variant ?? group?.variant ?? 'ghost';
- const size = () => local.size ?? group?.size ?? 'md';
-
- const cls = () =>
- cn(
- buttonClasses({
- variant: variant(),
- size: size(),
- fullWidth: local.fullWidth,
- noTouchResize: local.noTouchResize,
- glass: group !== undefined ? false : local.glass,
- square: local.square,
- }),
- local.class
+ const Control = (buttonProps: ComponentProps<typeof KobalteButton>) => {
+ return (
+ <KobalteButton
+ {...buttonProps}
+ as={buttonProps.as ?? 'button'}
+ data-button=""
+ data-slot="button"
+ data-size={size()}
+ data-variant={variant()}
+ data-appearance={local.appearance ?? 'default'}
+ disabled={unavailable()}
+ {...tabIndexProps()}
+ aria-busy={local.loading || buttonProps['aria-busy'] || undefined}
+ class={buttonClasses({
+ ...local,
+ variant: variant(),
+ size: size(),
+ class: local.class,
+ })}
+ {...activation}
+ >
+ <Show when={local.loading !== undefined} fallback={local.children}>
+ <span
+ class={cn(
+ 'inline-flex min-w-0 flex-1 items-center [gap:inherit] [justify-content:inherit]',
+ local.loading && 'opacity-0'
+ )}
+ >
+ {local.children}
+ </span>
+ </Show>
+ <Show when={local.loading}>
+ <span
+ aria-hidden="true"
+ class="absolute size-3.5 animate-spin rounded-full border-2 border-current border-r-transparent motion-reduce:animate-none"
+ />
+ </Show>
+ </KobalteButton>
);
-
- const placement = () => local.tooltipPlacement ?? 'bottom';
-
- const accessibleLabel = () =>
- local['aria-label'] ??
- local.label ??
- (isIconSize(size()) || local.square ? local.tooltip : undefined);
-
- const button = () => (
- <KobalteButton
- data-button
- data-slot="button"
- data-variant={variant()}
- data-size={size()}
- class={cls()}
- aria-label={accessibleLabel()}
- {...others}
- >
- {local.children}
- </KobalteButton>
- );
-
- const tooltipLabel = () => local.tooltip ?? local.label;
-
- // Skip Layer when inside a ButtonGroup (the group already provides one)
- // unless the button has its own explicit depth
- const skipLayer = () => group !== undefined && local.depth === undefined;
-
- const content = () => (
- <Show
- when={tooltipLabel() !== undefined ? tooltipLabel() : false}
- fallback={button()}
- >
- {(label) => (
- <Tooltip
- class={local.fullWidth ? 'w-full' : undefined}
- hotkey={local.hotkey}
- shortcut={local.shortcut}
- placement={placement()}
- label={label()}
- disabled={local.tooltipDisabled}
- >
- {button()}
- </Tooltip>
- )}
- </Show>
- );
+ };
return (
- <Show
- when={skipLayer()}
- fallback={<Layer depth={local.depth ?? 0}>{content()}</Layer>}
- >
- {content()}
+ <Show when={local.tooltip != null} fallback={<Control {...native} />}>
+ <Tooltip.Root
+ disabled={tooltip().disabled}
+ placement={tooltip().placement}
+ >
+ <Control
+ {...native}
+ as={(triggerProps: JSX.ButtonHTMLAttributes<HTMLButtonElement>) => (
+ <Tooltip.Trigger {...triggerProps} as={native.as ?? 'button'} />
+ )}
+ />
+ <Tooltip.Portal>
+ <Tooltip.Content>
+ <div class="flex items-center gap-2">
+ <div class="min-w-0">{tooltip().content}</div>
+ <For each={tokens()}>
+ {(token, index) => (
+ <>
+ <Show when={index() > 0}>
+ <span class="text-ink-muted">then</span>
+ </Show>
+ <Hotkey token={token} theme="subtle" />
+ </>
+ )}
+ </For>
+ <For each={shortcuts()}>
+ {(shortcut, index) => (
+ <>
+ <Show when={index() > 0}>
+ <span class="text-ink-muted">then</span>
+ </Show>
+ <Hotkey shortcut={shortcut} theme="subtle" />
+ </>
+ )}
+ </For>
+ </div>
+ </Tooltip.Content>
+ </Tooltip.Portal>
+ </Tooltip.Root>
</Show>
);
-};
+}
diff --git a/apps/web/src/components/ui/components/ButtonGroup.tsx b/apps/web/src/components/ui/components/ButtonGroup.tsx
index 4ea7431da7..533eec37db 100644
--- a/apps/web/src/components/ui/components/ButtonGroup.tsx
+++ b/apps/web/src/components/ui/components/ButtonGroup.tsx
@@ -1,110 +1,59 @@
-import { createContext, type JSX, useContext } from 'solid-js';
+import {
+ type ComponentProps,
+ createContext,
+ splitProps,
+ useContext,
+ type ValidComponent,
+} from 'solid-js';
import { cn } from '../utils/classname';
-import { createVariants } from '../utils/variants';
-import type { ButtonSize, ButtonVariant } from './Button';
-import { Layer } from './Layer';
+import {
+ Button,
+ type ButtonFinish,
+ type ButtonProps,
+ type ButtonSize,
+ type ButtonVariant,
+ buttonFrameClasses,
+} from './Button';
type ButtonGroupOrientation = 'horizontal' | 'vertical';
-
type ButtonGroupContextValue = {
- variant?: ButtonVariant;
- size?: ButtonSize;
+ variant: ButtonVariant;
+ size: ButtonSize;
orientation: ButtonGroupOrientation;
};
-const ButtonGroupContext = createContext<ButtonGroupContextValue | undefined>(
- undefined
-);
-
+const ButtonGroupContext = createContext<ButtonGroupContextValue>();
export const useButtonGroupContext = () => useContext(ButtonGroupContext);
-type ButtonGroupProps = {
- depth?: 0 | 1 | 2 | 3 | 4;
+export type ButtonGroupProps = Omit<ComponentProps<'div'>, 'size'> & {
variant?: ButtonVariant;
+ /** The shared frame adapts by default; segments always stay flat. */
+ finish?: ButtonFinish;
size?: ButtonSize;
orientation?: ButtonGroupOrientation;
- class?: string;
- label?: string;
- children?: JSX.Element;
};
-/** Canonical classes for the button-group frame. */
-export const buttonGroupVariants = createVariants(
- cn(
- 'inline-flex items-center justify-center rounded-[10px] data-[orientation=horizontal]:rounded-full border border-edge-button bg-control not-touch:elevated',
- 'has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-edge-muted',
- 'has-[[data-slot=input-group-control]]:rounded-full',
- 'data-[orientation=horizontal]:flex-row',
- 'data-[orientation=vertical]:flex-col',
- // strip per-button rounding + borders so the group owns the frame
- '**:data-button:rounded-none **:data-button:border-0'
- ),
- {
- variant: {
- danger: '',
- outline: '',
- accent: '',
- success: '',
- ghost: '',
- strong: '',
- cta: '',
- },
- // Explicit cross-axis size so the frame matches a standalone Button of the
- // same size (border-box absorbs the 1px frame); radius tracks size too.
- size: {
- xs: '',
- sm: 'data-[orientation=horizontal]:h-6',
- md: '',
- lg: '',
- xl: 'data-[orientation=horizontal]:h-12',
- 'icon-xs':
- 'data-[orientation=horizontal]:h-5 data-[orientation=vertical]:w-5',
- 'icon-sm':
- 'data-[orientation=horizontal]:h-6 data-[orientation=vertical]:w-6',
- 'icon-composer':
- 'data-[orientation=horizontal]:h-6 data-[orientation=vertical]:w-6 not-touch:data-[orientation=horizontal]:h-[33.75px] not-touch:data-[orientation=vertical]:w-[33.75px]',
- 'icon-md':
- 'data-[orientation=horizontal]:h-8 data-[orientation=vertical]:w-8',
- 'icon-lg':
- 'rounded-xl data-[orientation=horizontal]:h-9 data-[orientation=vertical]:w-9',
- },
- },
- {
- variant: 'ghost',
- size: 'md',
- }
-);
-
-/** Divider frame classes; `variant` picks the rule color. */
-export const buttonGroupDividerVariants = createVariants(
- cn(
- 'shrink-0 self-stretch',
- 'data-[orientation=horizontal]:w-px',
- 'data-[orientation=vertical]:h-px'
- ),
- {
- variant: {
- danger: 'bg-edge-divider',
- outline: 'bg-edge-divider',
- accent: 'bg-edge-divider',
- success: 'bg-edge-divider',
- ghost: 'bg-edge-divider',
- strong: 'bg-edge-divider',
- cta: 'bg-edge-divider',
- },
- },
- {
- variant: 'outline',
- }
-);
+/** Layout only; Button owns the frame's colors, border, and optional finish. */
+export const buttonGroupVariants =
+ 'inline-flex items-stretch justify-center rounded-full border data-[orientation=horizontal]:flex-row data-[orientation=vertical]:flex-col has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-button-focus';
+export const buttonGroupDividerVariants =
+ 'shrink-0 self-stretch bg-divider data-[orientation=horizontal]:w-px data-[orientation=vertical]:h-px';
-export const ButtonGroup = (props: ButtonGroupProps) => {
- const orientation = () => props.orientation ?? 'horizontal';
- const size = () => props.size ?? 'md';
-
- const ctx: ButtonGroupContextValue = {
+export function ButtonGroup(props: ButtonGroupProps) {
+ const [local, rest] = splitProps(props, [
+ 'variant',
+ 'finish',
+ 'size',
+ 'orientation',
+ 'class',
+ 'children',
+ ]);
+ const variant = () => local.variant ?? 'secondary';
+ const size = () => local.size ?? 'md';
+ const orientation = () => local.orientation ?? 'horizontal';
+ const context: ButtonGroupContextValue = {
get variant() {
- return props.variant;
+ return variant();
},
get size() {
return size();
@@ -115,32 +64,60 @@ export const ButtonGroup = (props: ButtonGroupProps) => {
};
return (
- <ButtonGroupContext.Provider value={ctx}>
- <Layer depth={props.depth ?? 0}>
- <div
- data-slot="button-group"
- data-orientation={orientation()}
- data-size={size()}
- class={cn(
- buttonGroupVariants({ variant: props.variant, size: props.size }),
- props.class
- )}
- role="group"
- aria-label={props.label}
- >
- {/* Clip the segments independently of the group frame. */}
- <div class="flex size-full min-w-0 items-center justify-center overflow-hidden rounded-[inherit] [flex-direction:inherit]">
- {props.children}
- </div>
+ <ButtonGroupContext.Provider value={context}>
+ <div
+ {...rest}
+ data-slot="button-group"
+ data-orientation={orientation()}
+ data-size={size()}
+ data-variant={variant()}
+ data-finish={local.finish}
+ class={cn(
+ buttonGroupVariants,
+ buttonFrameClasses({ variant: variant(), finish: local.finish }),
+ local.class
+ )}
+ role="group"
+ >
+ <div class="flex min-w-0 flex-1 items-stretch justify-center overflow-hidden rounded-[inherit] [flex-direction:inherit]">
+ {local.children}
</div>
- </Layer>
+ </div>
</ButtonGroupContext.Provider>
);
-};
+}
-type DividerProps = { class?: string };
+/** Only explicit segments inherit the group; ordinary Buttons remain independent. */
+function GroupButton<T extends ValidComponent = 'button'>(
+ props: ButtonProps<T>
+) {
+ const group = useButtonGroupContext();
+ const [local, rest] = splitProps(props as ButtonProps, [
+ 'variant',
+ 'finish',
+ 'size',
+ 'class',
+ ]);
+ const variant = () => local.variant ?? group?.variant ?? 'primary';
+
+ return (
+ <Button
+ {...rest}
+ data-button-group-button=""
+ variant={variant()}
+ size={local.size ?? group?.size}
+ finish={group ? 'flat' : local.finish}
+ class={cn(
+ group && 'self-stretch rounded-none border-0 shadow-none',
+ group && variant() === group.variant && 'bg-transparent',
+ group?.orientation === 'vertical' && 'w-full',
+ local.class
+ )}
+ />
+ );
+}
-const Divider = (props: DividerProps) => {
+function Divider(props: { class?: string }) {
const group = useButtonGroupContext();
const orientation = () => group?.orientation ?? 'horizontal';
return (
@@ -148,12 +125,10 @@ const Divider = (props: DividerProps) => {
role="separator"
aria-orientation={orientation()}
data-orientation={orientation()}
- class={cn(
- buttonGroupDividerVariants({ variant: group?.variant }),
- props.class
- )}
+ class={cn(buttonGroupDividerVariants, props.class)}
/>
);
-};
+}
+ButtonGroup.Button = GroupButton;
ButtonGroup.Divider = Divider;
diff --git a/apps/web/src/components/ui/components/Calendar.tsx b/apps/web/src/components/ui/components/Calendar.tsx
index 03fcd8eaaf..74725f4423 100644
--- a/apps/web/src/components/ui/components/Calendar.tsx
+++ b/apps/web/src/components/ui/components/Calendar.tsx
@@ -452,12 +452,12 @@ export function CalendarMonthMenu(props: CalendarMonthMenuProps) {
<Show when={props.presentation === 'radio-group'}>
<div class="flex pt-3">
<Button
+ aria-label="Go To Today"
+ tooltip="Go To Today"
fullWidth
variant="ghost"
size="sm"
- depth={3}
class="min-h-11 bg-ink/6 px-3 text-ink"
- label="Go To Today"
onClick={() => {
if (props.onToday) {
props.onToday();
diff --git a/apps/web/src/components/ui/components/CollapseTransition.docs.tsx b/apps/web/src/components/ui/components/CollapseTransition.docs.tsx
index 2bd12ae00a..072e6b6874 100644
--- a/apps/web/src/components/ui/components/CollapseTransition.docs.tsx
+++ b/apps/web/src/components/ui/components/CollapseTransition.docs.tsx
@@ -9,7 +9,7 @@ function DisclosureDemo() {
return (
<div class="flex w-72 flex-col gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="self-start"
aria-expanded={open()}
diff --git a/apps/web/src/components/ui/components/CollapsedInput.tsx b/apps/web/src/components/ui/components/CollapsedInput.tsx
index 1ef2dda3be..4884376ee3 100644
--- a/apps/web/src/components/ui/components/CollapsedInput.tsx
+++ b/apps/web/src/components/ui/components/CollapsedInput.tsx
@@ -65,14 +65,14 @@ export function CollapsedInput(props: CollapsedInputProps) {
when={props.leadingAction}
fallback={
<Button
+ tooltip="Attach files"
variant="ghost"
- size="icon-composer"
+ size="icon-md"
class="not-touch:light-mode:text-composer-ink"
aria-label="Attach files"
- label="Attach files"
onClick={() => props.onAttach?.()}
>
- <PaperclipIcon />
+ <PaperclipIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
}
>
@@ -105,20 +105,20 @@ export function CollapsedInput(props: CollapsedInputProps) {
</button>
<Show when={hasAttachments() && !hasText()}>
<Button
+ tooltip={`${attachmentCount()} attachment${
+ attachmentCount() === 1 ? '' : 's'
+ }`}
variant="ghost"
size="sm"
class="h-8 px-1.5 gap-1"
aria-label={`${attachmentCount()} attachment${
attachmentCount() === 1 ? '' : 's'
}`}
- label={`${attachmentCount()} attachment${
- attachmentCount() === 1 ? '' : 's'
- }`}
ref={attachFocusInput}
onClick={() => props.onOpen?.()}
data-collapsed-input-attachments
>
- <PaperclipIcon />
+ <PaperclipIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
<span>{attachmentCount()}</span>
</Button>
</Show>
diff --git a/apps/web/src/components/ui/components/ConfirmDialog.test.tsx b/apps/web/src/components/ui/components/ConfirmDialog.test.tsx
index 04ff6763d1..4a4958dbf5 100644
--- a/apps/web/src/components/ui/components/ConfirmDialog.test.tsx
+++ b/apps/web/src/components/ui/components/ConfirmDialog.test.tsx
@@ -33,7 +33,7 @@ afterEach(() => {
describe('controlled confirmation', () => {
it.each([false, true])(
- 'uses ghost/strong actions with mobile=%s',
+ 'uses ghost/danger actions with mobile=%s',
(isMobile) => {
mobile.value = isMobile;
render(() => (
@@ -50,7 +50,7 @@ describe('controlled confirmation', () => {
).toBe('ghost');
expect(
screen.getByRole('button', { name: 'Confirm' }).dataset.variant
- ).toBe('strong');
+ ).toBe('danger');
}
);
diff --git a/apps/web/src/components/ui/components/ConfirmDialog.tsx b/apps/web/src/components/ui/components/ConfirmDialog.tsx
index 3372471b6b..365441df64 100644
--- a/apps/web/src/components/ui/components/ConfirmDialog.tsx
+++ b/apps/web/src/components/ui/components/ConfirmDialog.tsx
@@ -3,7 +3,7 @@ import { isMobile } from '@core/mobile/isMobile';
import { createSignal, type JSX, onCleanup, Show } from 'solid-js';
import { cn } from '../utils/classname';
import { ActionDialogShell } from './ActionDialogShell';
-import { Button } from './Button';
+import { Button, type ButtonVariant } from './Button';
import { Dialog, type DialogProps } from './Dialog';
import {
type ManagedDialogProps,
@@ -41,6 +41,11 @@ export type ConfirmDialogProps = ManagedDialogProps &
/** Controlled confirmation UI: a dialog on desktop, a drawer on mobile. */
export function ConfirmDialog(props: ConfirmDialogProps) {
+ const confirmVariant = (): ButtonVariant => {
+ if (props.tone === 'danger') return 'danger';
+ if (props.tone === 'success') return 'success';
+ return 'primary';
+ };
return (
<Show
when={isMobile()}
@@ -66,7 +71,6 @@ export function ConfirmDialog(props: ConfirmDialogProps) {
<Button
type="button"
variant="ghost"
- depth={2}
disabled={props.pending}
onClick={() => props.onOpenChange(false)}
>
@@ -74,8 +78,7 @@ export function ConfirmDialog(props: ConfirmDialogProps) {
</Button>
<Button
type="button"
- variant="strong"
- depth={2}
+ variant={confirmVariant()}
disabled={props.pending}
onClick={props.onConfirm}
>
diff --git a/apps/web/src/components/ui/components/CopyButton.docs.tsx b/apps/web/src/components/ui/components/CopyButton.docs.tsx
index df4a243014..6754ee1fed 100644
--- a/apps/web/src/components/ui/components/CopyButton.docs.tsx
+++ b/apps/web/src/components/ui/components/CopyButton.docs.tsx
@@ -7,7 +7,7 @@ import { CopyButton } from './CopyButton';
function VariantsDemo() {
return (
<div class="flex flex-wrap items-center gap-3">
- <For each={['ghost', 'outline', 'strong'] as const}>
+ <For each={['ghost', 'outline', 'secondary'] as const}>
{(variant) => (
<CopyButton
variant={variant}
@@ -30,9 +30,10 @@ function SizesDemo() {
<For each={['sm', 'md', 'lg', 'icon-md'] as const}>
{(size) => (
<CopyButton
+ aria-label="Copy example"
+ tooltip="Copy example"
size={size}
- variant="outline"
- label="Copy example"
+ variant="secondary"
onClick={() => navigator.clipboard.writeText('Copied from Macro')}
>
<CopyIcon />
diff --git a/apps/web/src/components/ui/components/CopyButton.test.tsx b/apps/web/src/components/ui/components/CopyButton.test.tsx
index 155ba293c1..c196fd1107 100644
--- a/apps/web/src/components/ui/components/CopyButton.test.tsx
+++ b/apps/web/src/components/ui/components/CopyButton.test.tsx
@@ -43,7 +43,7 @@ describe('CopyButton', () => {
const copy = vi.fn().mockResolvedValue(undefined);
const view = render(() => (
<div on:click={(event) => event.stopPropagation()}>
- <CopyButton onClick={copy} label="Copy code">
+ <CopyButton aria-label="Copy code" tooltip="Copy code" onClick={copy}>
<svg />
</CopyButton>
</div>
@@ -62,7 +62,11 @@ describe('CopyButton', () => {
let forwardedRef: HTMLButtonElement | undefined;
render(() => (
<ButtonGroup variant="outline" size="md">
- <CopyButton ref={(element) => (forwardedRef = element)} onClick={copy}>
+ <CopyButton
+ as={ButtonGroup.Button}
+ ref={(element) => (forwardedRef = element)}
+ onClick={copy}
+ >
<svg aria-hidden="true" style={{ width: '18px', height: '18px' }} />
Copy
</CopyButton>
diff --git a/apps/web/src/components/ui/components/CopyButton.tsx b/apps/web/src/components/ui/components/CopyButton.tsx
index 014b2622cf..1cb46cc189 100644
--- a/apps/web/src/components/ui/components/CopyButton.tsx
+++ b/apps/web/src/components/ui/components/CopyButton.tsx
@@ -1,16 +1,21 @@
import CheckCircle from '@icon/system/fill/check-circle-fill.svg';
+import type { PolymorphicProps } from '@kobalte/core/polymorphic';
import { mergeRefs } from '@solid-primitives/refs';
import {
+ children,
createSignal,
type JSX,
onCleanup,
onMount,
Show,
splitProps,
+ type ValidComponent,
} from 'solid-js';
+import { Dynamic } from 'solid-js/web';
import { Button, type ButtonProps } from './Button';
-export type CopyButtonProps = ButtonProps;
+export type CopyButtonProps<T extends ValidComponent = 'button'> =
+ PolymorphicProps<T, Omit<ButtonProps, 'as'>>;
const TRANSITION_MS = 160;
const SUCCESS_MS = 1400;
@@ -21,10 +26,13 @@ const SUCCESS_MS = 1400;
*
* @do Return the clipboard promise from onClick so feedback waits for success.
* @do Return false (or reject) when copying fails; report errors in the handler.
+ * @do Use as={ButtonGroup.Button} to render a segment in an action group.
* @dont Discard the promise with `void` inside onClick.
*/
-export function CopyButton(props: CopyButtonProps) {
- const [local, rest] = splitProps(props, ['onClick', 'children', 'ref']);
+export function CopyButton<T extends ValidComponent = 'button'>(
+ props: CopyButtonProps<T>
+) {
+ const [local, rest] = splitProps(props, ['onClick', 'children', 'ref', 'as']);
const [feedback, setFeedback] = createSignal<JSX.CSSProperties>();
let button!: HTMLButtonElement;
let check: SVGSVGElement | undefined;
@@ -122,16 +130,22 @@ export function CopyButton(props: CopyButtonProps) {
);
}
+ const content = children(() => (
+ <>
+ {local.children}
+ <Show when={feedback()}>
+ {(style) => <FeedbackIcon style={style()} />}
+ </Show>
+ </>
+ ));
return (
- <Button
+ <Dynamic
+ component={local.as ?? Button}
{...rest}
ref={mergeRefs((element) => (button = element), local.ref)}
on:click={onClick}
>
- {local.children}
- <Show when={feedback()}>
- {(style) => <FeedbackIcon style={style()} />}
- </Show>
- </Button>
+ {content()}
+ </Dynamic>
);
}
diff --git a/apps/web/src/components/ui/components/DeleteDialog.tsx b/apps/web/src/components/ui/components/DeleteDialog.tsx
index 2b03023c5e..ba23d8277f 100644
--- a/apps/web/src/components/ui/components/DeleteDialog.tsx
+++ b/apps/web/src/components/ui/components/DeleteDialog.tsx
@@ -94,7 +94,6 @@ export function DeleteDialog(props: DeleteDialogProps) {
<Button
type="button"
variant="ghost"
- depth={2}
disabled={props.pending}
onClick={close}
>
@@ -103,7 +102,6 @@ export function DeleteDialog(props: DeleteDialogProps) {
<Button
type="button"
variant="danger"
- depth={2}
disabled={!canDelete()}
onClick={deleteItem}
>
diff --git a/apps/web/src/components/ui/components/Dropdown.tsx b/apps/web/src/components/ui/components/Dropdown.tsx
index f50205941c..688c0e50b6 100644
--- a/apps/web/src/components/ui/components/Dropdown.tsx
+++ b/apps/web/src/components/ui/components/Dropdown.tsx
@@ -1,7 +1,10 @@
import { isModality } from '@core/mobile/inputModality';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import CheckIcon from '@icon/system/regular/check.svg';
-import { DropdownMenu as KobalteDropdownMenu } from '@kobalte/core/dropdown-menu';
+import {
+ DropdownMenu as KobalteDropdownMenu,
+ type DropdownMenuTriggerProps as KobalteDropdownTriggerProps,
+} from '@kobalte/core/dropdown-menu';
import {
type ComponentProps,
createSignal,
@@ -9,6 +12,7 @@ import {
onCleanup,
Show,
splitProps,
+ type ValidComponent,
} from 'solid-js';
import { cn } from '../utils/classname';
import {
@@ -66,10 +70,8 @@ export type DropdownContentProps = ComponentProps<
/** Block pointer interaction behind the menu with a transparent backdrop. */
blockingBackdrop?: boolean;
};
-export type DropdownTriggerProps = ComponentProps<
- typeof KobalteDropdownMenu.Trigger
-> &
- ButtonProps;
+export type DropdownTriggerProps<T extends ValidComponent = 'button'> =
+ ButtonProps<T> & KobalteDropdownTriggerProps<T>;
export type DropdownItemIndicatorProps = ComponentProps<
typeof KobalteDropdownMenu.ItemIndicator
>;
@@ -477,10 +479,12 @@ function DropdownItem(props: DropdownItemProps) {
);
}
-function DropdownTrigger(props: DropdownTriggerProps) {
+function DropdownTrigger<T extends ValidComponent = 'button'>(
+ props: DropdownTriggerProps<T>
+) {
return (
- <KobalteDropdownMenu.Trigger
- variant="outline"
+ <KobalteDropdownMenu.Trigger<ValidComponent>
+ variant="secondary"
as={Button}
size="sm"
{...props}
diff --git a/apps/web/src/components/ui/components/EntityComposer.test.tsx b/apps/web/src/components/ui/components/EntityComposer.test.tsx
index eb2595f939..c3b48c0cdb 100644
--- a/apps/web/src/components/ui/components/EntityComposer.test.tsx
+++ b/apps/web/src/components/ui/components/EntityComposer.test.tsx
@@ -29,11 +29,11 @@ function renderSubmit() {
return onClick;
}
-it('shows the keyboard shortcut on the submit button with a keyboard', () => {
+it('keeps the submit button label free of shortcut text with a keyboard', () => {
const onClick = renderSubmit();
const submit = screen.getByRole('button', { name: /Create Task/ });
- expect(submit.textContent).toContain('⌘');
+ expect(submit.textContent).toBe('Create Task');
fireEvent.click(submit);
expect(onClick).toHaveBeenCalledOnce();
});
diff --git a/apps/web/src/components/ui/components/EntityComposer.tsx b/apps/web/src/components/ui/components/EntityComposer.tsx
index d4292b49fc..4176294e25 100644
--- a/apps/web/src/components/ui/components/EntityComposer.tsx
+++ b/apps/web/src/components/ui/components/EntityComposer.tsx
@@ -1,8 +1,6 @@
-import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import { type JSX, Show, splitProps } from 'solid-js';
+import { type JSX, splitProps } from 'solid-js';
import { cn } from '../utils/classname';
import { Button, type ButtonProps } from './Button';
-import { Hotkey } from './Hotkey';
type SlotProps = JSX.HTMLAttributes<HTMLDivElement>;
@@ -87,25 +85,21 @@ function Submit(props: ButtonProps & { hasContent: boolean }) {
'children',
'hasContent',
'variant',
+ 'tooltip',
]);
return (
<Button
{...rest}
- variant={local.variant ?? 'strong'}
- depth={3}
- class={cn(
- 'gap-3',
- !isTouchDevice() && 'h-[33.75px] px-[15px]',
- local.class
- )}
+ variant={local.variant ?? 'primary'}
+ class={local.class}
+ tooltip={
+ local.tooltip ?? {
+ content: local.children,
+ shortcut: 'cmd+enter',
+ }
+ }
>
{local.children}
- <Show when={!isTouchDevice()}>
- <Hotkey
- shortcut="cmd+enter"
- theme={local.variant === 'outline' ? 'subtle' : 'current'}
- />
- </Show>
</Button>
);
}
diff --git a/apps/web/src/components/ui/components/FileTree.tsx b/apps/web/src/components/ui/components/FileTree.tsx
index ec0773b83a..753046101e 100644
--- a/apps/web/src/components/ui/components/FileTree.tsx
+++ b/apps/web/src/components/ui/components/FileTree.tsx
@@ -176,10 +176,11 @@ function Root<T>(props: FileTreeRootProps<T>) {
</Row>
<span class="absolute top-1/2 right-1.5 flex -translate-y-1/2">
<Button
+ aria-label={`${open() ? 'Collapse' : 'Expand'} ${row.directory.name}`}
+ tooltip={`${open() ? 'Collapse' : 'Expand'} ${row.directory.name}`}
variant="ghost"
size="icon-sm"
class="size-6 shrink-0 rounded-lg touch:size-9"
- label={`${open() ? 'Collapse' : 'Expand'} ${row.directory.name}`}
aria-expanded={open()}
onClick={() => toggle(path())}
>
diff --git a/apps/web/src/components/ui/components/HoldButton.tsx b/apps/web/src/components/ui/components/HoldButton.tsx
index ee12ddd5cd..5aca240b73 100644
--- a/apps/web/src/components/ui/components/HoldButton.tsx
+++ b/apps/web/src/components/ui/components/HoldButton.tsx
@@ -71,7 +71,7 @@ export function HoldButton(props: HoldButtonProps) {
{...rest}
data-holding={holding() ? '' : undefined}
class={cn('overflow-hidden touch-none', local.class)}
- onPointerDown={(event) => {
+ onPointerDown={(event: PointerEvent) => {
if (event.button > 0) return;
press();
}}
@@ -81,7 +81,7 @@ export function HoldButton(props: HoldButtonProps) {
onBlur={release}
onKeyDown={onKeyDown}
onKeyUp={onKeyUp}
- onContextMenu={(event) => event.preventDefault()}
+ onContextMenu={(event: MouseEvent) => event.preventDefault()}
>
<span
aria-hidden="true"
diff --git a/apps/web/src/components/ui/components/InputGroup.docs.tsx b/apps/web/src/components/ui/components/InputGroup.docs.tsx
index aa028cf609..467e3dd3fc 100644
--- a/apps/web/src/components/ui/components/InputGroup.docs.tsx
+++ b/apps/web/src/components/ui/components/InputGroup.docs.tsx
@@ -4,7 +4,6 @@ import CheckCircleIcon from '@icon/system/regular/check-circle.svg';
import EnvelopeIcon from '@icon/system/regular/envelope.svg';
import MagnifyingGlassIcon from '@icon/system/regular/magnifying-glass.svg';
import { createSignal } from 'solid-js';
-import { Button } from './Button';
import { ButtonGroup } from './ButtonGroup';
import { InputGroup } from './InputGroup';
@@ -54,7 +53,7 @@ function AddonsDemo() {
<InputGroup.Addon align="inline-start">https://</InputGroup.Addon>
<InputGroup.Input placeholder="macro.com" aria-label="Website" />
<InputGroup.Addon align="inline-end">
- <InputGroup.Button aria-label="Open website" square>
+ <InputGroup.Button size="icon-md" aria-label="Open website">
<ArrowRightIcon />
</InputGroup.Button>
</InputGroup.Addon>
@@ -68,7 +67,8 @@ function AddonsDemo() {
function ButtonGroupDemo() {
return (
<ButtonGroup
- variant="outline"
+ finish="raised"
+ variant="secondary"
size="md"
class="w-full max-w-sm"
aria-label="Search documents"
@@ -83,9 +83,9 @@ function ButtonGroupDemo() {
</InputGroup.Addon>
</InputGroup>
<ButtonGroup.Divider />
- <Button aria-label="Submit search" square>
- <ArrowRightIcon />
- </Button>
+ <ButtonGroup.Button size="icon-md" aria-label="Submit search">
+ <ArrowRightIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
</ButtonGroup>
);
}
diff --git a/apps/web/src/components/ui/components/InputGroup.tsx b/apps/web/src/components/ui/components/InputGroup.tsx
index 51b4ca2f78..011b1b07ea 100644
--- a/apps/web/src/components/ui/components/InputGroup.tsx
+++ b/apps/web/src/components/ui/components/InputGroup.tsx
@@ -191,6 +191,9 @@ function InputGroupRoot(props: InputGroupProps) {
isTouchDevice() ? 'rounded-lg' : 'rounded-full',
grouped() &&
'flex-1 rounded-none border-0 bg-transparent outline-none has-[[data-slot=input-group-control]:focus-visible]:ring-0',
+ grouped() &&
+ buttonGroup?.orientation === 'horizontal' &&
+ 'h-full min-h-0',
local.class
)}
{...rest}
@@ -284,21 +287,13 @@ function InputGroupAddon(props: InputGroupAddonProps) {
export type InputGroupButtonProps = ButtonProps;
function InputGroupButton(props: InputGroupButtonProps) {
- const [local, rest] = splitProps(props, [
- 'class',
- 'noTouchResize',
- 'size',
- 'square',
- 'variant',
- ]);
+ const [local, rest] = splitProps(props, ['class', 'size', 'variant']);
const group = useInputGroupContext();
return (
<Button
variant={local.variant ?? 'ghost'}
size={local.size ?? INPUT_GROUP_BUTTON_SIZE[group.size]}
- square={local.square}
- noTouchResize={local.noTouchResize ?? true}
class={local.class}
{...rest}
/>
@@ -314,7 +309,7 @@ function InputGroupClearButton(props: InputGroupClearButtonProps) {
<Show when={group.hasValue() && group.canClear()}>
<InputGroupButton
type="button"
- square
+ size={INPUT_GROUP_BUTTON_SIZE[group.size]}
aria-label="Clear input"
class={props.class}
onPointerDown={(event) => event.preventDefault()}
diff --git a/apps/web/src/components/ui/components/InvertUtil.docs.tsx b/apps/web/src/components/ui/components/InvertUtil.docs.tsx
index a3fa440305..8a36dd9824 100644
--- a/apps/web/src/components/ui/components/InvertUtil.docs.tsx
+++ b/apps/web/src/components/ui/components/InvertUtil.docs.tsx
@@ -58,10 +58,10 @@ function InvertedDemo() {
<Input aria-label="Inverted input" placeholder="Write something…" />
<div class="flex flex-wrap gap-2">
<Button variant="ghost">Ghost</Button>
- <Button variant="outline">Outline</Button>
- <Button variant="strong">Strong</Button>
- <Button variant="accent">Accent</Button>
- <Button variant="cta">Primary action</Button>
+ <Button variant="secondary">Outline</Button>
+ <Button variant="secondary">Strong</Button>
+ <Button variant="primary">Primary</Button>
+ <Button variant="primary">Primary action</Button>
<Button variant="success">Success</Button>
<Button variant="danger">Danger</Button>
<Button disabled>Disabled</Button>
@@ -78,7 +78,7 @@ function InvertedDemo() {
background.
<div class="mt-3 flex flex-col gap-3">
<InvertedPaletteSamples />
- <Button variant="cta">Nested primary action</Button>
+ <Button variant="primary">Nested primary action</Button>
</div>
</div>
</InvertUtil>
diff --git a/apps/web/src/components/ui/components/Item.docs.tsx b/apps/web/src/components/ui/components/Item.docs.tsx
index d80c1ffb64..e3eb6ebbae 100644
--- a/apps/web/src/components/ui/components/Item.docs.tsx
+++ b/apps/web/src/components/ui/components/Item.docs.tsx
@@ -5,6 +5,7 @@ import FilePdf from '@icon/system/regular/file-pdf.svg';
import FileText from '@icon/system/regular/file-text.svg';
import Heart from '@icon/system/regular/heart.svg';
import { createSignal, For, Show } from 'solid-js';
+import { cn } from '../utils/classname';
import { Badge } from './Badge';
import { Button } from './Button';
import { Card } from './Card';
@@ -30,7 +31,12 @@ function ReferenceDemo() {
aria-pressed={saved()}
onClick={() => setSaved(!saved())}
>
- <Heart class={saved() ? 'fill-current text-accent' : ''} />
+ <Heart
+ class={cn(
+ 'size-3.5 shrink-0',
+ saved() && 'fill-current text-accent'
+ )}
+ />
</Button>
</Item.Actions>
</Item>
@@ -253,7 +259,7 @@ function TextOnlyDemo() {
<Item.Actions class="h-5">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
aria-pressed={following()}
onClick={() => setFollowing(!following())}
>
diff --git a/apps/web/src/components/ui/components/NumberUnitInput.docs.tsx b/apps/web/src/components/ui/components/NumberUnitInput.docs.tsx
index 60ef4efb82..1a1a0b2c5c 100644
--- a/apps/web/src/components/ui/components/NumberUnitInput.docs.tsx
+++ b/apps/web/src/components/ui/components/NumberUnitInput.docs.tsx
@@ -15,14 +15,20 @@ function AmountsDemo() {
format={false}
>
<NumberUnitInput.Controls align="inline-start">
- <NumberUnitInput.DecrementTrigger label="Decrease duration" />
+ <NumberUnitInput.DecrementTrigger
+ aria-label="Decrease duration"
+ tooltip="Decrease duration"
+ />
</NumberUnitInput.Controls>
<NumberUnitInput.Frame>
<NumberUnitInput.Input aria-label="Duration" />
<NumberUnitInput.Unit>min</NumberUnitInput.Unit>
</NumberUnitInput.Frame>
<NumberUnitInput.Controls align="inline-end">
- <NumberUnitInput.IncrementTrigger label="Increase duration" />
+ <NumberUnitInput.IncrementTrigger
+ aria-label="Increase duration"
+ tooltip="Increase duration"
+ />
</NumberUnitInput.Controls>
</NumberUnitInput>
<NumberUnitInput defaultValue={1} step={0.01}>
diff --git a/apps/web/src/components/ui/components/NumberUnitInput.tsx b/apps/web/src/components/ui/components/NumberUnitInput.tsx
index 5d2b800d32..89d5454353 100644
--- a/apps/web/src/components/ui/components/NumberUnitInput.tsx
+++ b/apps/web/src/components/ui/components/NumberUnitInput.tsx
@@ -107,7 +107,7 @@ function StepButton(props: ButtonProps) {
const readOnly = useContext(ReadOnlyContext);
return (
<Button
- variant="outline"
+ variant="secondary"
{...props}
disabled={props.disabled || readOnly?.()}
/>
@@ -121,7 +121,8 @@ function IncrementTrigger(props: NumberUnitInputIncrementProps) {
as={StepButton}
type="button"
size="icon-md"
- label="Increase value"
+ aria-label="Increase value"
+ tooltip="Increase value"
{...rest}
>
{local.children ?? <Plus class="size-3.5" />}
@@ -136,7 +137,8 @@ function DecrementTrigger(props: NumberUnitInputDecrementProps) {
as={StepButton}
type="button"
size="icon-md"
- label="Decrease value"
+ aria-label="Decrease value"
+ tooltip="Decrease value"
{...rest}
>
{local.children ?? <Minus class="size-3.5" />}
diff --git a/apps/web/src/components/ui/components/Panel.docs.tsx b/apps/web/src/components/ui/components/Panel.docs.tsx
index 6318f93299..e7064325f5 100644
--- a/apps/web/src/components/ui/components/Panel.docs.tsx
+++ b/apps/web/src/components/ui/components/Panel.docs.tsx
@@ -28,7 +28,7 @@ function SlotsDemo() {
<Button variant="ghost" size="sm">
Cancel
</Button>
- <Button variant="accent" size="sm">
+ <Button variant="primary" size="sm">
Confirm
</Button>
</Panel.Footer>
diff --git a/apps/web/src/components/ui/components/PillButton.tsx b/apps/web/src/components/ui/components/PillButton.tsx
index eb9ff28b1a..bb29a78067 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() ? 'outline' : 'cta'}
+ variant={subtle() ? 'secondary' : 'primary'}
size="md"
class={cn(
'py-1',
diff --git a/apps/web/src/components/ui/components/SendButton.tsx b/apps/web/src/components/ui/components/SendButton.tsx
index a41f523e9d..8445b0fa6a 100644
--- a/apps/web/src/components/ui/components/SendButton.tsx
+++ b/apps/web/src/components/ui/components/SendButton.tsx
@@ -4,7 +4,10 @@ import { children, Show, splitProps } from 'solid-js';
import { cn } from '../utils/classname';
import { Button, type ButtonProps } from './Button';
-export type SendButtonProps = Omit<ButtonProps, 'size' | 'variant'> & {
+export type SendButtonProps = Omit<
+ ButtonProps,
+ 'size' | 'variant' | 'appearance'
+> & {
appearance?: 'default' | 'composer';
/**
* Empty composer with a queue waiting: the same send control, ringed so it
@@ -35,10 +38,8 @@ export function SendButton(props: SendButtonProps) {
return (
<Button
- depth={4}
- variant="strong"
- glass={false}
- size={local.appearance === 'composer' ? 'icon-composer' : 'icon-sm'}
+ variant="neutral"
+ size="icon-md"
draggable={false}
aria-label={
local['aria-label'] ??
@@ -50,16 +51,11 @@ export function SendButton(props: SendButtonProps) {
}
data-intent={local.intent === 'flush' ? 'flush' : undefined}
class={cn(
- 'border-0 bg-ink text-surface-4 touch:size-7.5',
- 'not-touch:not-disabled:hover:text-surface-4',
+ 'border-0',
local.intent === 'flush' && 'ring-2 ring-accent/60',
- local.appearance === 'composer'
- ? cn(
- 'not-touch:not-disabled:bg-composer-action not-touch:not-disabled:text-composer-action-ink not-touch:not-disabled:hover:text-composer-action-ink not-touch:light-mode:shadow-none not-touch:light-mode:backdrop-filter-none not-touch:light-mode:after:hidden',
- local.actionLabel &&
- 'not-touch:w-auto! not-touch:aspect-auto! not-touch:px-3 not-touch:gap-1.5'
- )
- : 'size-7',
+ local.appearance === 'composer' &&
+ local.actionLabel &&
+ 'not-touch:w-auto! not-touch:aspect-auto! not-touch:px-3 not-touch:gap-1.5',
'transition-transform ease-in-out duration-150',
'data-disabled:opacity-100 data-disabled:text-ink-extra-muted! data-disabled:bg-ink-muted/5',
'active:not-disabled:scale-95',
@@ -73,11 +69,13 @@ export function SendButton(props: SendButtonProps) {
>
<Show
when={!local.pending}
- fallback={<SpinnerIcon class="animate-spin" />}
+ fallback={
+ <SpinnerIcon class="size-5 shrink-0 animate-spin touch:size-6" />
+ }
>
{resolved() ?? (
<>
- <ArrowUp />
+ <ArrowUp class="size-5 shrink-0 touch:size-6" />
<Show when={local.actionLabel}>
<span class="hidden whitespace-nowrap text-sm font-medium not-touch:inline">
{local.actionLabel}
diff --git a/apps/web/src/components/ui/components/TabSelector.tsx b/apps/web/src/components/ui/components/TabSelector.tsx
index 78fe3dfa2a..ce4c2c3cda 100644
--- a/apps/web/src/components/ui/components/TabSelector.tsx
+++ b/apps/web/src/components/ui/components/TabSelector.tsx
@@ -91,8 +91,10 @@ function List(props: ComponentProps<typeof Tabs.List>) {
<div class="flex min-w-0 items-center">
<Show when={left() || right()}>
<Button
+ variant="ghost"
+ aria-label="Scroll tabs left"
+ tooltip="Scroll tabs left"
size="icon-sm"
- label="Scroll tabs left"
class="shrink-0 rounded-full"
disabled={!left()}
onClick={() => scroll(-1)}
@@ -143,8 +145,10 @@ function List(props: ComponentProps<typeof Tabs.List>) {
</Tabs.List>
<Show when={left() || right()}>
<Button
+ variant="ghost"
+ aria-label="Scroll tabs right"
+ tooltip="Scroll tabs right"
size="icon-sm"
- label="Scroll tabs right"
class="shrink-0 rounded-full"
disabled={!right()}
onClick={() => scroll(1)}
diff --git a/apps/web/src/components/ui/components/Tabs.docs.tsx b/apps/web/src/components/ui/components/Tabs.docs.tsx
index 8c3e269026..b46fbcb29f 100644
--- a/apps/web/src/components/ui/components/Tabs.docs.tsx
+++ b/apps/web/src/components/ui/components/Tabs.docs.tsx
@@ -3,8 +3,8 @@ import ChatIcon from '@icon/system/regular/chat-text.svg';
import CodeIcon from '@icon/system/regular/code.svg';
import PaperclipIcon from '@icon/system/regular/paperclip.svg';
import UsersIcon from '@icon/system/regular/users.svg';
-import { createSignal } from 'solid-js';
-import { Tabs } from './Tabs';
+import { createSignal, For } from 'solid-js';
+import { Tabs, type TabsSize } from './Tabs';
// #region demo:view
function ViewDemo() {
@@ -67,6 +67,46 @@ function IconOnlyDemo() {
}
// #endregion
+// #region demo:sizes
+function SizeRow(props: { size: TabsSize }) {
+ const [view, setView] = createSignal<'messages' | 'files'>('messages');
+ const [icon, setIcon] = createSignal<'messages' | 'files'>('messages');
+ const options = [
+ { value: 'messages', label: 'Messages', icon: ChatIcon },
+ { value: 'files', label: 'Files', icon: PaperclipIcon },
+ ] as const;
+ return (
+ <div class="flex flex-wrap items-center gap-3">
+ <span class="w-6 font-mono text-xs text-ink-muted">{props.size}</span>
+ <Tabs
+ aria-label={`${props.size} view tabs`}
+ size={props.size}
+ options={options}
+ value={view()}
+ onChange={setView}
+ />
+ <Tabs
+ aria-label={`${props.size} icon tabs`}
+ size={props.size}
+ iconOnly
+ options={options}
+ value={icon()}
+ onChange={setIcon}
+ />
+ </div>
+ );
+}
+
+function SizesDemo() {
+ return (
+ <div class="flex flex-col gap-3">
+ <For each={['xs', 'sm', 'md', 'lg', 'xl'] as const}>
+ {(size) => <SizeRow size={size} />}
+ </For>
+ </div>
+ );
+}
+// #endregion
// #region demo:value
function ValueDemo() {
const [value, setValue] = createSignal<'team' | 'personal'>('team');
@@ -122,7 +162,7 @@ export default defineDoc({
id: 'view',
title: 'View tabs',
description:
- 'Header view tabs sit after the title, left of the controls. The choices share one rounded track with an inset selected pill, at the same height as neighbouring controls.',
+ 'Header view tabs sit after the title, left of the controls. The choices share a flat rounded track with an inset selected pill, sized to match neighbouring controls.',
render: ViewDemo,
},
{
@@ -138,6 +178,13 @@ export default defineDoc({
'A narrow header collapses labels to icons. Each label stays the accessible name and becomes the tooltip.',
render: IconOnlyDemo,
},
+ {
+ id: 'sizes',
+ title: 'Sizes',
+ description:
+ 'Tabs share Button minimum heights and square icon sizes. Medium labels use 14px text and 12px horizontal padding; large labels use 15px text. Touch treatments retain their minimum targets.',
+ render: SizesDemo,
+ },
{
id: 'value',
title: 'Choosing a value',
@@ -149,7 +196,7 @@ export default defineDoc({
id: 'track',
title: 'Composer mode switch',
description:
- '`variant="track"` slides one raised pill along a filled track on every device. It is only for the agent composer\'s Chat/Code switch in the composer tray.',
+ '`variant="track"` slides one flat pill along a filled track on every device. It is only for the agent composer\'s Chat/Code switch in the composer tray.',
render: TrackDemo,
},
],
diff --git a/apps/web/src/components/ui/components/Tabs.tsx b/apps/web/src/components/ui/components/Tabs.tsx
index d9643dec63..a8e8cd9cfe 100644
--- a/apps/web/src/components/ui/components/Tabs.tsx
+++ b/apps/web/src/components/ui/components/Tabs.tsx
@@ -3,6 +3,12 @@ import { SegmentedControl as KSegmentedControl } from '@kobalte/core/segmented-c
import { type Component, For, Match, Show, Switch } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { cn } from '../utils/classname';
+import {
+ iconControlSizes,
+ type LabeledControlSize,
+ labeledControlContents,
+ labeledControlFrames,
+} from '../utils/control-sizes';
import { Layer } from './Layer';
import { Tooltip } from './Tooltip';
@@ -16,8 +22,20 @@ export type TabOption<T extends string> = {
disabled?: boolean;
};
-/** Pill height matches the Button of the same size. */
-export type TabsSize = 'sm' | 'md' | 'lg';
+/** Button-sized pills; touch treatments keep their own minimum targets. */
+export type TabsSize = LabeledControlSize;
+
+const tabIconSizes: Record<TabsSize, { square: string; labeled: string }> = {
+ xs: { square: 'size-3', labeled: 'size-3' },
+ sm: { square: 'size-3.5', labeled: 'size-3' },
+ md: { square: 'size-4', labeled: 'size-3.5' },
+ lg: { square: 'size-5', labeled: 'size-4' },
+ xl: { square: 'size-6', labeled: 'size-5' },
+};
+
+function tabContentClasses(size: TabsSize) {
+ return cn(labeledControlContents[size], size === 'md' && 'px-3');
+}
/**
* Desktop joins options inside one segmented frame. Touch keeps the treatment each
@@ -49,7 +67,7 @@ export type TabsProps<T extends string> = {
}
| {
/**
- * One raised pill slides along a filled track, on every device. Only for
+ * One flat pill slides along a filled track, on every device. Only for
* the agent composer's mode switch, which sits in the composer's tray.
*/
variant: 'track';
@@ -61,8 +79,8 @@ export type TabsProps<T extends string> = {
/**
* One inline single choice: switch a view, a section, or a small set of
- * values. On desktop options share one rounded frame with dividers,
- * and the selected segment takes the pressed fill.
+ * values. On desktop options share one flat rounded frame,
+ * and the selected inset pill takes the pressed fill.
*
* @do Use for two to six short options that are all visible at once.
* @do Put view tabs left of the header controls, after the title.
@@ -104,7 +122,7 @@ export function Tabs<T extends string>(props: TabsProps<T>) {
class={cn(
'flex min-w-0 items-center',
props.wrap && 'flex-wrap',
- props.size === 'sm' ? 'gap-1' : 'gap-1.5',
+ props.size === 'xs' || props.size === 'sm' ? 'gap-1' : 'gap-1.5',
props.fullWidth && 'w-full'
)}
>
@@ -129,8 +147,8 @@ export function Tabs<T extends string>(props: TabsProps<T>) {
>
<div
class={cn(
- 'inline-flex min-w-0 items-center overflow-hidden rounded-full border border-edge-button bg-control elevated gap-0.5 p-0.5',
- props.size === 'sm' ? 'h-6' : props.size === 'lg' ? 'h-9' : 'h-8',
+ 'inline-flex min-w-0 items-stretch overflow-hidden rounded-full border border-edge-button bg-control gap-0.5 p-0.5',
+ labeledControlFrames[props.size ?? 'md'],
props.fullWidth && 'w-full'
)}
>
@@ -203,44 +221,37 @@ function PillOption<T extends string>(props: {
value={props.option.value}
disabled={props.option.disabled}
class={cn(
- 'relative inline-flex min-w-0 shrink-0 text-ink-muted transition-colors duration-120 motion-reduce:transition-none',
+ 'relative inline-flex min-w-0 shrink-0 rounded-full border text-ink-muted transition-colors duration-120 motion-reduce:transition-none',
props.joined
- ? 'h-full rounded-full border border-transparent data-checked:border-edge-button data-checked:shadow-sm'
- : 'rounded-full border bg-control elevated data-checked:shadow-none',
- // The joined track leaves a visible inset around each rounded option.
- 'not-touch:not-data-checked:hover:overlay-hover not-touch:not-data-checked:hover:text-ink',
- // The selected option uses the same pressed fill as a pressed Button.
- 'data-checked:border-edge-button data-checked:overlay-active data-checked:text-ink',
+ ? 'self-stretch border-transparent data-checked:border-edge-button'
+ : 'bg-control border-edge-button',
+ 'shadow-none not-touch:not-data-checked:hover:overlay-hover not-touch:not-data-checked:hover:text-ink',
+ 'data-checked:overlay-active data-checked:text-ink',
'has-focus-visible:ring-2 has-focus-visible:ring-inset has-focus-visible:ring-edge-focus',
'data-disabled:pointer-events-none data-disabled:opacity-50',
- !props.joined && props.size === 'sm' && 'h-6',
- !props.joined && props.size === 'md' && 'h-8',
- !props.joined && props.size === 'lg' && 'h-9',
- square() && 'aspect-square',
- props.fullWidth && 'flex-1'
+ !props.joined &&
+ (square()
+ ? iconControlSizes[props.size]
+ : labeledControlFrames[props.size]),
+ props.joined && square() && 'aspect-square',
+ 'touch:min-h-8',
+ square() && 'touch:min-w-8',
+ props.fullWidth && !square() && 'flex-1'
)}
>
<KSegmentedControl.ItemInput class="pointer-events-none absolute inset-0" />
<KSegmentedControl.ItemLabel
class={cn(
- 'flex size-full min-w-0 items-center justify-center font-medium whitespace-nowrap select-none',
- props.size === 'sm' && 'gap-1 px-2 text-xs',
- props.size === 'md' && 'gap-1.5 px-3 text-sm',
- props.size === 'lg' && 'gap-2 px-4 text-sm',
- // Equal-width options are centred, so narrow rails keep whole labels.
- props.fullWidth && 'px-1.5',
- square() && 'px-0'
+ 'flex min-w-0 flex-1 self-stretch items-center justify-center gap-2 font-medium whitespace-nowrap select-none',
+ !square() && tabContentClasses(props.size),
+ props.joined && 'py-0'
)}
>
<OptionContent
option={props.option}
iconOnly={props.iconOnly}
// Glyphs match a Button of the same size: smaller beside a label.
- iconClass={cn(
- props.size === 'sm' && (square() ? 'size-3.5' : 'size-3'),
- props.size === 'md' && (square() ? 'size-4' : 'size-3.5'),
- props.size === 'lg' && (square() ? 'size-5' : 'size-4')
- )}
+ iconClass={tabIconSizes[props.size][square() ? 'square' : 'labeled']}
/>
</KSegmentedControl.ItemLabel>
</KSegmentedControl.Item>
@@ -266,7 +277,7 @@ function Track<T extends string>(props: TabsProps<T>) {
props.fullWidth && 'w-full'
)}
>
- <KSegmentedControl.Indicator class="pointer-events-none absolute top-0 left-0 z-0 rounded-full bg-panel bg-[linear-gradient(to_bottom,color-mix(in_srgb,var(--color-ink)_2%,transparent),transparent)] transition-[transform,width,height] duration-250 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none dark-mode:bg-active light-mode:border light-mode:border-ink/7 light-mode:bg-none light-mode:shadow-[0_1px_6px_0_color-mix(in_srgb,var(--color-ink)_5%,transparent)]" />
+ <KSegmentedControl.Indicator class="pointer-events-none absolute top-0 left-0 z-0 rounded-full bg-panel transition-[transform,width,height] duration-250 ease-[cubic-bezier(0.22,1,0.36,1)] motion-reduce:transition-none dark-mode:bg-active light-mode:border light-mode:border-ink/7" />
<For each={props.options}>
{(option) => (
<KSegmentedControl.Item
@@ -299,11 +310,12 @@ function Track<T extends string>(props: TabsProps<T>) {
}
function TouchPill<T extends string>(props: TabsProps<T>) {
+ const size = () => props.size ?? 'md';
return (
<div
class={cn(
- 'relative flex items-center',
- props.size === 'lg' ? 'h-11' : 'h-8',
+ 'relative flex min-h-8 items-center',
+ size() === 'lg' && 'min-h-11',
props.fullWidth && 'w-full'
)}
>
@@ -314,22 +326,44 @@ function TouchPill<T extends string>(props: TabsProps<T>) {
value={option.value}
disabled={option.disabled}
class={cn(
- 'relative z-1 inline-flex h-full min-w-0 items-center rounded-full',
+ 'relative z-1 inline-flex min-w-0 items-center rounded-full',
'has-focus-visible:ring-2 has-focus-visible:ring-inset has-focus-visible:ring-edge-focus data-disabled:pointer-events-none data-disabled:opacity-50',
- props.fullWidth && 'flex-1'
+ props.iconOnly && option.icon !== undefined
+ ? iconControlSizes[size()]
+ : labeledControlFrames[size()],
+ 'touch:min-h-8',
+ size() === 'lg' && 'touch:min-h-11',
+ props.iconOnly && option.icon !== undefined && 'touch:min-w-8',
+ props.iconOnly &&
+ option.icon !== undefined &&
+ size() === 'lg' &&
+ 'touch:min-w-11',
+ props.fullWidth &&
+ !(props.iconOnly && option.icon !== undefined) &&
+ 'flex-1'
)}
>
<KSegmentedControl.ItemInput class="pointer-events-none absolute inset-0" />
<KSegmentedControl.ItemLabel
class={cn(
- 'flex h-full items-center gap-1.5 rounded-full px-4 text-xs font-medium whitespace-nowrap select-none text-ink-extra-muted hover:text-ink data-checked:text-ink transition-colors duration-120 motion-reduce:transition-none',
- props.fullWidth && 'w-full justify-center'
+ 'flex min-w-0 flex-1 self-stretch items-center gap-1.5 rounded-full font-medium whitespace-nowrap select-none text-ink-extra-muted hover:text-ink data-checked:text-ink transition-colors duration-120 motion-reduce:transition-none',
+ !(props.iconOnly && option.icon !== undefined) &&
+ tabContentClasses(size()),
+ (props.fullWidth ||
+ (props.iconOnly && option.icon !== undefined)) &&
+ 'justify-center'
)}
>
<OptionContent
option={option}
iconOnly={props.iconOnly ?? false}
- iconClass="size-3.5"
+ iconClass={
+ tabIconSizes[size()][
+ props.iconOnly && option.icon !== undefined
+ ? 'square'
+ : 'labeled'
+ ]
+ }
/>
</KSegmentedControl.ItemLabel>
</KSegmentedControl.Item>
@@ -340,6 +374,7 @@ function TouchPill<T extends string>(props: TabsProps<T>) {
}
function TouchInset<T extends string>(props: TabsProps<T>) {
+ const size = () => props.size ?? 'md';
return (
<Layer depth={0}>
<div
@@ -354,13 +389,28 @@ function TouchInset<T extends string>(props: TabsProps<T>) {
<KSegmentedControl.Item
value={option.value}
disabled={option.disabled}
- class={cn(props.fullWidth && 'flex-1')}
+ class={cn(
+ 'inline-flex min-w-0 items-center rounded-full touch:min-h-8',
+ props.iconOnly && option.icon !== undefined
+ ? iconControlSizes[size()]
+ : labeledControlFrames[size()],
+ props.iconOnly &&
+ option.icon !== undefined &&
+ 'touch:min-w-8',
+ props.fullWidth &&
+ !(props.iconOnly && option.icon !== undefined) &&
+ 'flex-1'
+ )}
>
<KSegmentedControl.ItemInput class="pointer-events-none absolute inset-0" />
<KSegmentedControl.ItemLabel
class={cn(
- 'flex items-center gap-1.5 rounded-full px-3 py-1 text-xs font-medium whitespace-nowrap text-ink-extra-muted ring-inset hover:text-ink data-checked:bg-surface data-checked:text-ink data-checked:ring data-checked:ring-edge-muted data-checked:shadow-[0_1px_2px_rgba(0,0,0,0.06)]',
- props.fullWidth && 'w-full justify-center'
+ 'flex min-w-0 flex-1 self-stretch items-center gap-1.5 rounded-full font-medium whitespace-nowrap text-ink-extra-muted ring-inset hover:text-ink data-checked:bg-surface data-checked:text-ink data-checked:ring data-checked:ring-edge-muted',
+ !(props.iconOnly && option.icon !== undefined) &&
+ tabContentClasses(size()),
+ (props.fullWidth ||
+ (props.iconOnly && option.icon !== undefined)) &&
+ 'justify-center'
)}
// Keep a focused input focused while switching.
onPointerDown={(event) => event.preventDefault()}
@@ -368,7 +418,13 @@ function TouchInset<T extends string>(props: TabsProps<T>) {
<OptionContent
option={option}
iconOnly={props.iconOnly ?? false}
- iconClass="size-3.5"
+ iconClass={
+ tabIconSizes[size()][
+ props.iconOnly && option.icon !== undefined
+ ? 'square'
+ : 'labeled'
+ ]
+ }
/>
</KSegmentedControl.ItemLabel>
</KSegmentedControl.Item>
@@ -381,11 +437,11 @@ function TouchInset<T extends string>(props: TabsProps<T>) {
}
function TouchSegmented<T extends string>(props: TabsProps<T>) {
+ const size = () => props.size ?? 'md';
return (
<div
class={cn(
- 'inline-flex overflow-hidden rounded-full border border-edge-frame',
- props.size === 'sm' ? 'h-6' : 'h-8',
+ 'inline-flex min-h-8 overflow-hidden rounded-full border border-edge-frame',
props.fullWidth && 'flex w-full'
)}
>
@@ -395,20 +451,38 @@ function TouchSegmented<T extends string>(props: TabsProps<T>) {
value={option.value}
disabled={option.disabled}
class={cn(
- 'relative flex h-full items-center justify-center border-r border-edge-divider font-medium outline-none last:border-r-0 has-focus-visible:ring-2 has-focus-visible:ring-inset has-focus-visible:ring-edge-focus transition-colors duration-120 motion-reduce:transition-none',
- props.size === 'sm' ? 'px-2 text-xs' : 'px-3 text-sm',
+ 'relative flex items-center justify-center border-r border-edge-divider font-medium outline-none last:border-r-0 has-focus-visible:ring-2 has-focus-visible:ring-inset has-focus-visible:ring-edge-focus transition-colors duration-120 motion-reduce:transition-none',
+ props.iconOnly && option.icon !== undefined
+ ? iconControlSizes[size()]
+ : labeledControlFrames[size()],
+ 'touch:min-h-8',
+ props.iconOnly && option.icon !== undefined && 'touch:min-w-8',
option.disabled
? 'opacity-50'
: 'text-ink-muted active:overlay-active data-checked:text-ink data-checked:overlay-active',
- props.fullWidth && 'flex-1'
+ props.fullWidth &&
+ !(props.iconOnly && option.icon !== undefined) &&
+ 'flex-1'
)}
>
<KSegmentedControl.ItemInput class="pointer-events-none absolute inset-0" />
- <KSegmentedControl.ItemLabel class="flex items-center gap-1.5">
+ <KSegmentedControl.ItemLabel
+ class={cn(
+ 'flex min-w-0 flex-1 self-stretch items-center justify-center gap-1.5',
+ !(props.iconOnly && option.icon !== undefined) &&
+ tabContentClasses(size())
+ )}
+ >
<OptionContent
option={option}
iconOnly={props.iconOnly ?? false}
- iconClass="size-3.5"
+ iconClass={
+ tabIconSizes[size()][
+ props.iconOnly && option.icon !== undefined
+ ? 'square'
+ : 'labeled'
+ ]
+ }
/>
</KSegmentedControl.ItemLabel>
</KSegmentedControl.Item>
diff --git a/apps/web/src/components/ui/components/Toast.docs.tsx b/apps/web/src/components/ui/components/Toast.docs.tsx
index 89c96a7b99..9c094101f4 100644
--- a/apps/web/src/components/ui/components/Toast.docs.tsx
+++ b/apps/web/src/components/ui/components/Toast.docs.tsx
@@ -14,7 +14,7 @@ function NotificationsDemo() {
return (
<div class="flex flex-wrap gap-2">
<Button
- variant="outline"
+ variant="secondary"
onClick={() =>
remember(toast.success('Changes saved', { stack: true }))
}
@@ -22,7 +22,7 @@ function NotificationsDemo() {
Success
</Button>
<Button
- variant="outline"
+ variant="secondary"
onClick={() => {
for (const message of [
'Link copied',
@@ -36,7 +36,7 @@ function NotificationsDemo() {
Preview stack
</Button>
<Button
- variant="outline"
+ variant="secondary"
onClick={() =>
remember(
toast.custom(
diff --git a/apps/web/src/components/ui/components/Toolbar.docs.tsx b/apps/web/src/components/ui/components/Toolbar.docs.tsx
index 1f0255416d..3202c2610a 100644
--- a/apps/web/src/components/ui/components/Toolbar.docs.tsx
+++ b/apps/web/src/components/ui/components/Toolbar.docs.tsx
@@ -13,21 +13,25 @@ function BasicDemo() {
return (
<Toolbar size="icon-sm">
<Toolbar.Group>
- <Toolbar.Button label="Undo">
+ <Toolbar.Button aria-label="Undo" tooltip="Undo">
<ArrowCounterClockwiseIcon />
</Toolbar.Button>
</Toolbar.Group>
<Toolbar.Divider />
<Toolbar.Group>
- <Toolbar.Button label="Copy">
+ <Toolbar.Button aria-label="Copy" tooltip="Copy">
<CopyIcon />
</Toolbar.Button>
- <Toolbar.Button label="Copy link">
+ <Toolbar.Button aria-label="Copy link" tooltip="Copy link">
<LinkIcon />
</Toolbar.Button>
</Toolbar.Group>
<Toolbar.Divider />
- <Toolbar.Button label="Delete" class="text-failure-ink">
+ <Toolbar.Button
+ aria-label="Delete"
+ tooltip="Delete"
+ class="text-failure-ink"
+ >
<TrashIcon />
</Toolbar.Button>
</Toolbar>
@@ -47,8 +51,9 @@ function MediumDemo() {
<Toolbar.Divider />
<Toolbar.Group>
<Toolbar.Button
+ aria-label="Zoom out"
+ tooltip="Zoom out"
size="icon-md"
- label="Zoom out"
onClick={() => setZoom((value) => Math.max(25, value - 25))}
>
<ZoomOutIcon />
@@ -57,8 +62,9 @@ function MediumDemo() {
{zoom()}%
</Toolbar.Button>
<Toolbar.Button
+ aria-label="Zoom in"
+ tooltip="Zoom in"
size="icon-md"
- label="Zoom in"
onClick={() => setZoom((value) => Math.min(200, value + 25))}
>
<ZoomInIcon />
diff --git a/apps/web/src/components/ui/components/Tooltip.test.tsx b/apps/web/src/components/ui/components/Tooltip.test.tsx
index 9e1e21f5a7..a79d5c45f0 100644
--- a/apps/web/src/components/ui/components/Tooltip.test.tsx
+++ b/apps/web/src/components/ui/components/Tooltip.test.tsx
@@ -1,5 +1,11 @@
-import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
-import { createSignal } from 'solid-js';
+import {
+ cleanup,
+ fireEvent,
+ render,
+ screen,
+ waitFor,
+} from '@solidjs/testing-library';
+import { createSignal, Show } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { setTooltipsEnabled } from '../signals/signals';
import { Tooltip } from './Tooltip';
@@ -77,4 +83,87 @@ describe('Tooltip touch behavior', () => {
button.parentElement?.focus();
expect(screen.getByRole('tooltip').textContent).toContain('Back to thread');
});
+
+ it('uses the control itself as a compound tooltip trigger', () => {
+ device.isTouch = () => false;
+ render(() => (
+ <Tooltip.Root open>
+ <Tooltip.Trigger>Details</Tooltip.Trigger>
+ <Tooltip.Portal>
+ <Tooltip.Content>Show details</Tooltip.Content>
+ </Tooltip.Portal>
+ </Tooltip.Root>
+ ));
+ const button = screen.getByRole('button', { name: 'Details' });
+ expect(button.tagName).toBe('BUTTON');
+ expect(screen.getByRole('tooltip').textContent).toContain('Show details');
+ });
+
+ it('closes when a compound trigger unmounts', () => {
+ device.isTouch = () => false;
+ const [mounted, setMounted] = createSignal(true);
+ render(() => (
+ <Tooltip.Root defaultOpen>
+ <Show when={mounted()}>
+ <Tooltip.Trigger>Details</Tooltip.Trigger>
+ </Show>
+ <Tooltip.Portal>
+ <Tooltip.Content>Show details</Tooltip.Content>
+ </Tooltip.Portal>
+ </Tooltip.Root>
+ ));
+ expect(screen.getByRole('tooltip').textContent).toContain('Show details');
+ setMounted(false);
+ expect(screen.queryByRole('tooltip')).toBeNull();
+ });
+
+ it('keeps the pointer-transparent override without losing caller styles', () => {
+ device.isTouch = () => false;
+ render(() => (
+ <Tooltip.Root open>
+ <Tooltip.Trigger>Details</Tooltip.Trigger>
+ <Tooltip.Portal>
+ <Tooltip.Content style={{ color: 'red', 'pointer-events': 'auto' }}>
+ Show details
+ </Tooltip.Content>
+ </Tooltip.Portal>
+ </Tooltip.Root>
+ ));
+ const tooltip = screen.getByRole('tooltip');
+ expect(tooltip.classList.contains('pointer-events-none!')).toBe(true);
+ expect(tooltip.style.color).toBe('red');
+ });
+
+ it('hides the popup when a mounted trigger loses its layout box', async () => {
+ device.isTouch = () => false;
+ vi.spyOn(document.documentElement, 'clientWidth', 'get').mockReturnValue(
+ 1024
+ );
+ vi.spyOn(document.documentElement, 'clientHeight', 'get').mockReturnValue(
+ 768
+ );
+ const [hidden, setHidden] = createSignal(false);
+ render(() => (
+ <Tooltip.Root
+ open
+ getAnchorRect={
+ hidden()
+ ? () => ({ x: 0, y: 0, width: 0, height: 0 })
+ : () => ({ x: 64, y: 64, width: 40, height: 40 })
+ }
+ >
+ <Tooltip.Trigger style={{ display: hidden() ? 'none' : undefined }}>
+ Details
+ </Tooltip.Trigger>
+ <Tooltip.Portal>
+ <Tooltip.Content>Show details</Tooltip.Content>
+ </Tooltip.Portal>
+ </Tooltip.Root>
+ ));
+ const trigger = screen.getByRole('button', { name: 'Details' });
+ await waitFor(() => expect(screen.getByRole('tooltip')).toBeTruthy());
+ setHidden(true);
+ await waitFor(() => expect(screen.queryByRole('tooltip')).toBeNull());
+ expect(trigger.isConnected).toBe(true);
+ });
});
diff --git a/apps/web/src/components/ui/components/Tooltip.tsx b/apps/web/src/components/ui/components/Tooltip.tsx
index 1e136a69e4..d3ca7e7e29 100644
--- a/apps/web/src/components/ui/components/Tooltip.tsx
+++ b/apps/web/src/components/ui/components/Tooltip.tsx
@@ -1,32 +1,28 @@
import type { HotkeyToken } from '@core/hotkey/tokens';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import type { Placement } from '@floating-ui/dom';
-import { Tooltip as KobalteTooltip } from '@kobalte/core/tooltip';
-import type { ParentProps } from 'solid-js';
-import { createEffect, createSignal, For, on, onCleanup, Show } from 'solid-js';
-import { Hotkey } from '../../ui/components/Hotkey';
+import type { PolymorphicProps } from '@kobalte/core/polymorphic';
+import {
+ Tooltip as KobalteTooltip,
+ type TooltipTriggerProps as KobalteTooltipTriggerProps,
+} from '@kobalte/core/tooltip';
+import {
+ type Accessor,
+ type ComponentProps,
+ createContext,
+ createSignal,
+ For,
+ onCleanup,
+ type ParentProps,
+ Show,
+ splitProps,
+ useContext,
+ type ValidComponent,
+} from 'solid-js';
import { tooltipsEnabled } from '../signals/signals';
import { cn } from '../utils/classname';
+import { Hotkey } from './Hotkey';
import { Surface } from './Surface';
-type TooltipProps = ParentProps<{
- hotkey?: HotkeyToken | HotkeyToken[];
- /**
- * Raw keyboard shortcut(s) to render in the tooltip (e.g. "cmd+enter").
- * Use this for shortcuts that aren't registered as a `HotkeyToken`.
- */
- shortcut?: string | string[];
- placement?: Placement;
- as?: 'div' | 'span';
- class?: string;
- label: string;
- /** Allows non-interactive tooltip targets, such as disabled actions, to receive keyboard focus. */
- tabIndex?: number;
- disabled?: boolean;
- /** Override visibility, for example while a nested control has keyboard focus. */
- open?: boolean;
-}>;
-
export type TooltipClassOptions = {
class?: string;
};
@@ -39,144 +35,168 @@ export function tooltipClasses(options: TooltipClassOptions = {}): string {
);
}
-/**
- * Informational content never intercepts pointer input to nearby controls.
- *
- * @example
- * <Tooltip label="" hotkey={}>
- * <div></div>
- * </Tooltip>
- */
-export function Tooltip(props: TooltipProps) {
- const [triggerRef, setTriggerRef] = createSignal<HTMLElement>();
- const [open, setOpen] = createSignal(false);
- const isOpen = () => props.open ?? open();
-
- if (import.meta.env.MODE === 'test') {
- return <>{props.children}</>;
- }
-
- function tokens(): HotkeyToken[] {
- return props.hotkey == null
- ? []
- : Array.isArray(props.hotkey)
- ? props.hotkey
- : [props.hotkey];
- }
-
- function shortcuts(): string[] {
- return props.shortcut == null
- ? []
- : Array.isArray(props.shortcut)
- ? props.shortcut
- : [props.shortcut];
- }
-
- function hasHotkey(): boolean {
- return tokens().length > 0 || shortcuts().length > 0;
- }
-
- function triggerIsMounted(ref: HTMLElement | undefined): boolean {
- if (!ref) return false;
- if (!ref.ownerDocument.body.contains(ref)) return false;
- if (ref.getClientRects().length > 0) return true;
- return false;
- }
+const TooltipContext = createContext<{
+ visible: Accessor<boolean>;
+ close: () => void;
+}>();
+
+type TooltipRootProps = ComponentProps<typeof KobalteTooltip>;
+
+function TooltipRoot(props: TooltipRootProps) {
+ const [local, rest] = splitProps(props, [
+ 'children',
+ 'disabled',
+ 'open',
+ 'defaultOpen',
+ 'onOpenChange',
+ ]);
+ const [open, setOpen] = createSignal(local.defaultOpen ?? false);
+ const enabled = () =>
+ import.meta.env.MODE !== 'test' &&
+ !local.disabled &&
+ !isTouchDevice() &&
+ tooltipsEnabled();
+ const visible = () => enabled() && (local.open ?? open());
+ const changeOpen = (value: boolean) => {
+ const next = value && enabled();
+ setOpen(next);
+ local.onOpenChange?.(next);
+ };
- createEffect(
- on([open, triggerRef], ([open, triggerRef]) => {
- if (!open || !triggerRef) return;
+ return (
+ <TooltipContext.Provider
+ value={{ visible, close: () => changeOpen(false) }}
+ >
+ <KobalteTooltip
+ placement="bottom"
+ ignoreSafeArea
+ overflowPadding={16}
+ fitViewport
+ hideWhenDetached
+ openDelay={400}
+ closeDelay={0}
+ flip
+ gutter={4}
+ {...rest}
+ open={visible()}
+ onOpenChange={changeOpen}
+ disabled={!enabled()}
+ >
+ {local.children}
+ </KobalteTooltip>
+ </TooltipContext.Provider>
+ );
+}
- const closeIfTriggerUnmounted = () => {
- if (triggerIsMounted(triggerRef)) return;
- setOpen(false);
- };
+function TooltipTrigger<T extends ValidComponent = 'button'>(
+ props: PolymorphicProps<T, KobalteTooltipTriggerProps<T>>
+) {
+ const context = useContext(TooltipContext);
+ // A removed trigger retires its popup through Solid's lifecycle, not a
+ // document-wide observer. Disposing the root also disposes its portal.
+ onCleanup(() => context?.close());
+ return <KobalteTooltip.Trigger<T> {...props} />;
+}
- if (!triggerIsMounted(triggerRef)) {
- setOpen(false);
- return;
- }
+function TooltipContent(props: ComponentProps<typeof KobalteTooltip.Content>) {
+ const context = useContext(TooltipContext);
+ const [local, rest] = splitProps(props, ['class', 'children']);
+ return (
+ <Show when={context?.visible()}>
+ <KobalteTooltip.Content
+ {...rest}
+ class={cn(
+ // Kobalte mutates inline pointer-events as its layer stack changes.
+ 'pointer-events-none! z-tool-tip max-w-[calc(100vw-32px)]',
+ local.class
+ )}
+ >
+ <Surface class={tooltipClasses()} depth={3}>
+ {local.children}
+ </Surface>
+ </KobalteTooltip.Content>
+ </Show>
+ );
+}
- const observer = new MutationObserver(closeIfTriggerUnmounted);
- observer.observe(triggerRef.ownerDocument.documentElement, {
- attributes: true,
- attributeFilter: ['class', 'hidden', 'style'],
- childList: true,
- subtree: true,
- });
+type TooltipProps = ParentProps<{
+ hotkey?: HotkeyToken | HotkeyToken[];
+ /** Raw shortcuts for actions without a registered HotkeyToken. */
+ shortcut?: string | string[];
+ placement?: TooltipRootProps['placement'];
+ as?: 'div' | 'span';
+ class?: string;
+ label: string;
+ /** Allows a non-interactive target to receive keyboard focus. */
+ tabIndex?: number;
+ disabled?: boolean;
+ open?: boolean;
+}>;
- onCleanup(() => {
- observer.disconnect();
- });
- })
- );
+/** Assembled tooltip; use the compound parts to keep a control as the trigger. */
+function TooltipComponent(props: TooltipProps) {
+ if (import.meta.env.MODE === 'test') return <>{props.children}</>;
- onCleanup(() => setOpen(false));
- const enabled = () =>
- !isTouchDevice() && !props.disabled && tooltipsEnabled();
- const visible = () => isOpen() && enabled();
+ const tokens = () => {
+ const value = props.hotkey;
+ return value == null ? [] : Array.isArray(value) ? value : [value];
+ };
+ const shortcuts = () => {
+ const value = props.shortcut;
+ return value == null ? [] : Array.isArray(value) ? value : [value];
+ };
return (
- <KobalteTooltip
- open={visible()}
- onOpenChange={(isOpen) => {
- setOpen(isOpen && enabled());
- }}
- placement={props.placement ?? 'bottom'}
- ignoreSafeArea={true}
- overflowPadding={16}
- fitViewport={true}
- openDelay={400}
- closeDelay={0}
- flip={true}
- gutter={4}
- disabled={!enabled()}
+ <TooltipRoot
+ disabled={props.disabled}
+ open={props.open}
+ placement={props.placement}
>
- <KobalteTooltip.Trigger
- ref={(ref) => {
- setTriggerRef(ref);
- }}
+ <TooltipTrigger
class={cn('inline-flex items-center', props.class)}
tabIndex={props.tabIndex}
as={props.as ?? 'div'}
>
{props.children}
- </KobalteTooltip.Trigger>
- <Show when={visible()}>
- <KobalteTooltip.Portal>
- <KobalteTooltip.Content class="pointer-events-none! z-tool-tip max-w-[calc(100vw-32px)]">
- <Surface class={tooltipClasses()} depth={3}>
- <div class="flex flex-row items-center gap-2">
- <div class="text-xs">{props.label}</div>
- <Show when={hasHotkey()}>
- <div class="flex items-center gap-1 ml-auto">
- <For each={tokens()}>
- {(token, ndx) => (
- <>
- <Hotkey token={token} theme="subtle" />
- <Show when={ndx() < tokens().length - 1}>
- <span class="text-ink-extra-muted">then</span>
- </Show>
- </>
- )}
- </For>
- <For each={shortcuts()}>
- {(shortcut, ndx) => (
- <>
- <Hotkey shortcut={shortcut} theme="subtle" />
- <Show when={ndx() < shortcuts().length - 1}>
- <span class="text-ink-extra-muted">then</span>
- </Show>
- </>
- )}
- </For>
- </div>
- </Show>
+ </TooltipTrigger>
+ <KobalteTooltip.Portal>
+ <TooltipContent>
+ <div class="flex items-center gap-2">
+ <div class="text-xs">{props.label}</div>
+ <Show when={tokens().length > 0 || shortcuts().length > 0}>
+ <div class="ml-auto flex items-center gap-1">
+ <For each={tokens()}>
+ {(token, index) => (
+ <>
+ <Hotkey token={token} theme="subtle" />
+ <Show when={index() < tokens().length - 1}>
+ <span class="text-ink-extra-muted">then</span>
+ </Show>
+ </>
+ )}
+ </For>
+ <For each={shortcuts()}>
+ {(shortcut, index) => (
+ <>
+ <Hotkey shortcut={shortcut} theme="subtle" />
+ <Show when={index() < shortcuts().length - 1}>
+ <span class="text-ink-extra-muted">then</span>
+ </Show>
+ </>
+ )}
+ </For>
</div>
- </Surface>
- </KobalteTooltip.Content>
- </KobalteTooltip.Portal>
- </Show>
- </KobalteTooltip>
+ </Show>
+ </div>
+ </TooltipContent>
+ </KobalteTooltip.Portal>
+ </TooltipRoot>
);
}
+
+export const Tooltip = Object.assign(TooltipComponent, {
+ Root: TooltipRoot,
+ Trigger: TooltipTrigger,
+ Portal: KobalteTooltip.Portal,
+ Content: TooltipContent,
+});
diff --git a/apps/web/src/components/ui/components/Tour/Tour.docs.tsx b/apps/web/src/components/ui/components/Tour/Tour.docs.tsx
index abfcd4b35f..d2d7eb4b0e 100644
--- a/apps/web/src/components/ui/components/Tour/Tour.docs.tsx
+++ b/apps/web/src/components/ui/components/Tour/Tour.docs.tsx
@@ -56,7 +56,7 @@ function PopoverDemo() {
const [open, setOpen] = createSignal(false);
return (
<div class="flex items-center gap-2">
- <Button variant="outline" onClick={() => setOpen(true)}>
+ <Button variant="secondary" onClick={() => setOpen(true)}>
Start tour
</Button>
<Button variant="ghost" ref={tourTarget(DEMO.search)}>
@@ -98,7 +98,7 @@ function EntryDemo() {
const [shown, setShown] = createSignal(false);
return (
<div class="flex items-center gap-2">
- <Button variant="outline" onClick={() => setOpen(true)}>
+ <Button variant="secondary" onClick={() => setOpen(true)}>
Start tour
</Button>
<Button
diff --git a/apps/web/src/components/ui/components/Tour/Tour.tsx b/apps/web/src/components/ui/components/Tour/Tour.tsx
index fb79540dfb..75bbb897e5 100644
--- a/apps/web/src/components/ui/components/Tour/Tour.tsx
+++ b/apps/web/src/components/ui/components/Tour/Tour.tsx
@@ -586,13 +586,17 @@ function TourPrevious(props: TourButtonProps) {
const [local, others] = splitProps(props, ['children']);
return (
<Button
+ variant="ghost"
+ aria-label="Previous step"
+ tooltip="Previous step"
size="icon-sm"
- label="Previous step"
disabled={tour.isFirst()}
{...others}
onClick={tour.previous}
>
- {local.children ?? <CaretLeftIcon />}
+ {local.children ?? (
+ <CaretLeftIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
);
}
@@ -606,14 +610,20 @@ function TourNext(props: TourButtonProps & { doneLabel?: JSX.Element }) {
local.children === undefined && !(tour.isLast() && local.doneLabel);
return (
<Button
+ variant="primary"
+ aria-label={iconOnly() ? 'Next step' : undefined}
+ tooltip={iconOnly() ? 'Next step' : undefined}
size="icon-sm"
- label={iconOnly() ? 'Next step' : undefined}
{...others}
onClick={tour.next}
>
<Show
when={tour.isLast() && local.doneLabel}
- fallback={local.children ?? <CaretRightIcon />}
+ fallback={
+ local.children ?? (
+ <CaretRightIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ )
+ }
>
{local.doneLabel}
</Show>
@@ -627,12 +637,16 @@ function TourClose(props: TourButtonProps) {
// Text children name the button; only the icon form needs a label.
return (
<Button
+ variant="ghost"
+ aria-label={local.children === undefined ? 'Dismiss tour' : undefined}
+ tooltip={local.children === undefined ? 'Dismiss tour' : undefined}
size="icon-sm"
- label={local.children === undefined ? 'Dismiss tour' : undefined}
{...others}
onClick={tour.dismiss}
>
- {local.children ?? <XIcon />}
+ {local.children ?? (
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
);
}
diff --git a/apps/web/src/components/ui/foundations/controls.docs.tsx b/apps/web/src/components/ui/foundations/controls.docs.tsx
index f51e9f15d4..240b1e9d1a 100644
--- a/apps/web/src/components/ui/foundations/controls.docs.tsx
+++ b/apps/web/src/components/ui/foundations/controls.docs.tsx
@@ -7,6 +7,7 @@ import PlusIcon from '@icon/system/regular/plus.svg';
import SidebarIcon from '@icon/system/regular/sidebar-simple.svg';
import SortIcon from '@icon/system/regular/sort-ascending.svg';
import BoardIcon from '@icon/system/regular/squares-four.svg';
+import { ButtonGroup } from '@ui';
import { createSignal, For } from 'solid-js';
import { Button } from '../components/Button';
import { Tabs } from '../components/Tabs';
@@ -32,37 +33,52 @@ function HeaderDemo() {
/>
<div class="ml-auto flex shrink-0 items-center gap-2">
<HeaderActionGroup label="Task filters">
- <Button size="icon-md" label="Filter tasks">
- <FilterIcon />
- </Button>
- <Button size="icon-md" label="Sort tasks">
- <SortIcon />
- </Button>
+ <ButtonGroup.Button
+ aria-label="Filter tasks"
+ tooltip="Filter tasks"
+ size="icon-sm"
+ >
+ <FilterIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Sort tasks"
+ tooltip="Sort tasks"
+ size="icon-sm"
+ >
+ <SortIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
</HeaderActionGroup>
<HeaderActionGroup label="Task layout">
- <Button
- size="icon-md"
- label="List"
+ <ButtonGroup.Button
+ aria-label="List"
+ tooltip="List"
+ size="icon-sm"
aria-pressed={layout() === 'list'}
onClick={() => setLayout('list')}
>
- <ListIcon />
- </Button>
- <Button
- size="icon-md"
- label="Board"
+ <ListIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Board"
+ tooltip="Board"
+ size="icon-sm"
aria-pressed={layout() === 'board'}
onClick={() => setLayout('board')}
>
- <BoardIcon />
- </Button>
+ <BoardIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
</HeaderActionGroup>
- <Button variant="outline" size="md">
- <PlusIcon />
+ <Button variant="secondary" size="md">
+ <PlusIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
New
</Button>
- <Button variant="outline" size="icon-md" label="Search tasks">
- <SearchIcon />
+ <Button
+ aria-label="Search tasks"
+ tooltip="Search tasks"
+ variant="secondary"
+ size="icon-md"
+ >
+ <SearchIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</div>
@@ -86,13 +102,14 @@ function SelectedDemo() {
onChange={setValue}
/>
<Button
- variant="outline"
+ aria-label={open() ? 'Hide details' : 'Show details'}
+ tooltip={open() ? 'Hide details' : 'Show details'}
+ variant="secondary"
size="icon-md"
- label={open() ? 'Hide details' : 'Show details'}
aria-pressed={open()}
onClick={() => setOpen(!open())}
>
- <SidebarIcon />
+ <SidebarIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
);
@@ -117,16 +134,17 @@ function SizesDemo() {
value="team"
onChange={() => {}}
/>
- <Button variant="outline" size={size}>
- <PlusIcon />
+ <Button variant="secondary" size={size}>
+ <PlusIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
New
</Button>
<Button
- variant="outline"
+ aria-label="Search"
+ tooltip="Search"
+ variant="secondary"
size={size === 'sm' ? 'icon-sm' : 'icon-md'}
- label="Search"
>
- <SearchIcon />
+ <SearchIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
)}
diff --git a/apps/web/src/components/ui/foundations/surfaces.docs.tsx b/apps/web/src/components/ui/foundations/surfaces.docs.tsx
index a3deb4b5a4..752ad2ed63 100644
--- a/apps/web/src/components/ui/foundations/surfaces.docs.tsx
+++ b/apps/web/src/components/ui/foundations/surfaces.docs.tsx
@@ -82,8 +82,8 @@ function ControlsOnDepthDemo() {
<Panel depth={depth}>
<Panel.Body class="flex flex-wrap gap-2 p-3">
<Button variant="ghost">Ghost</Button>
- <Button variant="outline">Outline</Button>
- <Button variant="accent">Accent</Button>
+ <Button variant="secondary">Outline</Button>
+ <Button variant="primary">Primary</Button>
<Button variant="danger">Danger</Button>
</Panel.Body>
</Panel>
diff --git a/apps/web/src/components/ui/index.ts b/apps/web/src/components/ui/index.ts
index 8d8aa75f9e..4250b6a566 100644
--- a/apps/web/src/components/ui/index.ts
+++ b/apps/web/src/components/ui/index.ts
@@ -23,13 +23,16 @@ export {
} from './components/Badge';
export type {
ButtonClassOptions,
+ ButtonFinish,
ButtonProps,
ButtonSize,
+ ButtonTooltip,
+ ButtonTooltipOptions,
ButtonVariant,
ButtonVariantProps,
} from './components/Button';
export { Button, buttonClasses, buttonVariants } from './components/Button';
-export { ButtonGroup } from './components/ButtonGroup';
+export { ButtonGroup, type ButtonGroupProps } from './components/ButtonGroup';
export type {
CalendarMonthMenuProps,
CalendarMonthSelectorProps,
diff --git a/apps/web/src/components/ui/utils/button-activation.ts b/apps/web/src/components/ui/utils/button-activation.ts
new file mode 100644
index 0000000000..5900010bd2
--- /dev/null
+++ b/apps/web/src/components/ui/utils/button-activation.ts
@@ -0,0 +1,75 @@
+import { callHandler } from '@kobalte/utils';
+import type { JSX } from 'solid-js';
+
+type ClickEvent = Parameters<
+ JSX.EventHandler<HTMLButtonElement, MouseEvent>
+>[0];
+type AuxClickEvent = Parameters<
+ JSX.EventHandler<HTMLButtonElement, PointerEvent>
+>[0];
+type KeyEvent = Parameters<
+ JSX.EventHandler<HTMLButtonElement, KeyboardEvent>
+>[0];
+type Handlers = Pick<
+ JSX.ButtonHTMLAttributes<HTMLButtonElement>,
+ 'onClick' | 'onAuxClick' | 'onKeyDown' | 'onKeyUp'
+>;
+
+function hasNativeActivation(element: HTMLElement): boolean {
+ if (element.tagName === 'BUTTON') return true;
+ if (element.tagName === 'A') return element.hasAttribute('href');
+ if (element.tagName !== 'INPUT') return false;
+ return ['button', 'submit', 'reset', 'image', 'file', 'color'].includes(
+ (element as HTMLInputElement).type
+ );
+}
+
+/** Kobalte supplies disabled semantics; non-native actions still need activation guards. */
+export function createButtonActivation(
+ unavailable: () => boolean,
+ handlers: Handlers
+) {
+ function blockUnavailable(event: Event): boolean {
+ if (!unavailable()) return false;
+ event.preventDefault();
+ event.stopPropagation();
+ return true;
+ }
+
+ function handleKey(
+ event: KeyEvent,
+ handler: Handlers['onKeyDown'],
+ activateOn: 'Enter' | ' '
+ ) {
+ const activationKey = event.key === 'Enter' || event.key === ' ';
+ if (activationKey && blockUnavailable(event)) return;
+ callHandler(event, handler);
+ if (
+ !activationKey ||
+ event.defaultPrevented ||
+ event.target !== event.currentTarget
+ )
+ return;
+ if (hasNativeActivation(event.currentTarget)) return;
+
+ // Non-native actions press on Enter and release on Space, like native buttons.
+ if (event.key === ' ') event.preventDefault();
+ if (event.key !== activateOn) return;
+ event.preventDefault();
+ event.currentTarget.click();
+ }
+
+ return {
+ onClick: (event: ClickEvent) => {
+ if (blockUnavailable(event)) return;
+ callHandler(event, handlers.onClick);
+ },
+ onAuxClick: (event: AuxClickEvent) => {
+ if (blockUnavailable(event)) return;
+ callHandler(event, handlers.onAuxClick);
+ },
+ onKeyDown: (event: KeyEvent) =>
+ handleKey(event, handlers.onKeyDown, 'Enter'),
+ onKeyUp: (event: KeyEvent) => handleKey(event, handlers.onKeyUp, ' '),
+ };
+}
diff --git a/apps/web/src/components/ui/utils/button-finishes.ts b/apps/web/src/components/ui/utils/button-finishes.ts
new file mode 100644
index 0000000000..c05826850e
--- /dev/null
+++ b/apps/web/src/components/ui/utils/button-finishes.ts
@@ -0,0 +1,6 @@
+// Reuse shared elevation with Button edge colors on desktop and glass on touch.
+// Pressed actions and open popup triggers flatten without moving the control.
+export const raisedButtonStyles = [
+ 'not-touch:button-elevated touch:glass',
+ 'not-touch:not-data-disabled:active:shadow-none not-touch:aria-pressed:shadow-none not-touch:popup-open:shadow-none',
+].join(' ');
diff --git a/apps/web/src/components/ui/utils/control-sizes.ts b/apps/web/src/components/ui/utils/control-sizes.ts
new file mode 100644
index 0000000000..782d0fc7b6
--- /dev/null
+++ b/apps/web/src/components/ui/utils/control-sizes.ts
@@ -0,0 +1,35 @@
+/** Shared frame and content sizes let tab labels fill their clickable surface. */
+export const labeledControlFrames = {
+ xs: 'min-h-6',
+ sm: 'min-h-7',
+ md: 'min-h-8',
+ lg: 'min-h-10',
+ xl: 'min-h-12',
+} as const;
+
+export type LabeledControlSize = keyof typeof labeledControlFrames;
+
+export const labeledControlContents = {
+ xs: 'px-2 py-0.5 text-xs',
+ sm: 'px-2 py-0.5 text-sm',
+ md: 'px-2 py-0.5 text-sm',
+ lg: 'px-4 py-1 text-base',
+ xl: 'px-4 py-2 text-xl',
+} as const satisfies Record<LabeledControlSize, string>;
+
+/** Button applies the same frame and content sizing to one element. */
+export const labeledControlSizes = {
+ xs: `${labeledControlFrames.xs} ${labeledControlContents.xs}`,
+ sm: `${labeledControlFrames.sm} ${labeledControlContents.sm}`,
+ md: `${labeledControlFrames.md} ${labeledControlContents.md}`,
+ lg: `${labeledControlFrames.lg} ${labeledControlContents.lg}`,
+ xl: `${labeledControlFrames.xl} ${labeledControlContents.xl}`,
+} as const;
+
+export const iconControlSizes = {
+ xs: 'size-6 min-h-0 shrink-0 aspect-square p-0 text-xs',
+ sm: 'size-7 min-h-0 shrink-0 aspect-square p-0 text-sm',
+ md: 'size-8 min-h-0 shrink-0 aspect-square p-0 text-sm',
+ lg: 'size-10 min-h-0 shrink-0 aspect-square p-0 text-base',
+ xl: 'size-12 min-h-0 shrink-0 aspect-square p-0 text-xl',
+} as const;
diff --git a/apps/web/src/components/ui/utils/variants.ts b/apps/web/src/components/ui/utils/variants.ts
index 162b23695d..0ecc2d2ea3 100644
--- a/apps/web/src/components/ui/utils/variants.ts
+++ b/apps/web/src/components/ui/utils/variants.ts
@@ -3,7 +3,10 @@ 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>;
+ -readonly [Group in keyof Groups]?: Extract<
+ keyof Groups[Group],
+ string
+ > | null;
};
/** Extracts the inferred variant selections accepted by a variant helper. */
@@ -18,6 +21,7 @@ export type VariantProps<VariantHelper> = VariantHelper extends (
*
* Variant names and values are inferred from `groups`. Classes are merged with
* `cn`, so selected variants can override conflicting classes from the base.
+ * An explicit null omits a variant group instead of applying its default.
*/
export function createVariants<const Groups extends VariantGroups>(
base: string,
@@ -25,14 +29,15 @@ export function createVariants<const Groups extends VariantGroups>(
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>;
+ const selected = selection as Record<string, string | null | undefined>;
+ const fallback = defaults as Record<string, string | null | undefined>;
return cn(
base,
Object.entries(groups).map(([group, values]) => {
- const value = selected[group] ?? fallback[group];
- return value === undefined ? undefined : values[value];
+ const value =
+ selected[group] === undefined ? fallback[group] : selected[group];
+ return value == null ? undefined : values[value];
})
);
};
diff --git a/apps/web/src/components/view-shell/ListDropdowns.test.tsx b/apps/web/src/components/view-shell/ListDropdowns.test.tsx
index 9e8afd13e4..c21285c5e2 100644
--- a/apps/web/src/components/view-shell/ListDropdowns.test.tsx
+++ b/apps/web/src/components/view-shell/ListDropdowns.test.tsx
@@ -6,7 +6,7 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import { createSignal, For, type JSX, type ParentProps } from 'solid-js';
+import { createSignal, For, type JSX } from 'solid-js';
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import { SearchableMultiSelect } from '../../features/next-soup/soup-view/filters-bar/searchable-multi-select';
import { Dropdown } from '../ui/components/Dropdown';
@@ -15,13 +15,12 @@ import { ListFilterCountBadge, ListFilterDropdown } from './ListDropdowns';
// Exercise the actual menus/comboboxes without initializing the app UI barrel.
vi.mock('@ui', async () => ({
+ ...(await import('../ui/components/Button')),
+ ...(await import('../ui/components/ButtonGroup')),
...(await import('../ui/utils/classname')),
...(await import('../ui/components/Dropdown')),
...(await import('../ui/components/Layer')),
}));
-vi.mock('../ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
vi.mock('@core/mobile/isTouchDevice', () => ({ isTouchDevice: () => false }));
vi.mock('@core/mobile/inputModality', () => ({ isModality: () => false }));
// jsdom has no viewport measurements. Keep the real Kobalte options and events.
diff --git a/apps/web/src/components/view-shell/ListDropdowns.tsx b/apps/web/src/components/view-shell/ListDropdowns.tsx
index 745007dc0a..dbc54a4a8c 100644
--- a/apps/web/src/components/view-shell/ListDropdowns.tsx
+++ b/apps/web/src/components/view-shell/ListDropdowns.tsx
@@ -11,7 +11,7 @@ import ListIcon from '@icon/system/regular/list-bullets.svg';
import SortIcon from '@icon/system/regular/sort-ascending.svg';
import GroupIcon from '@icon/system/regular/stack.svg';
import { Key } from '@solid-primitives/keyed';
-import { cn, Dropdown } from '@ui';
+import { Button, ButtonGroup, type ButtonSize, cn, Dropdown } from '@ui';
import { batch, createSignal, For, type JSX, Show } from 'solid-js';
import { AiFilterInput, type AiFilterInputProps } from './AiFilterInput';
@@ -27,6 +27,7 @@ export type ListControlOption<TId extends string> = {
type ListDropdownOpenProps = {
open?: boolean;
onOpenChange?: (open: boolean) => void;
+ grouped?: boolean;
};
type SingleSelectDropdownProps<TId extends string> = {
@@ -35,6 +36,7 @@ type SingleSelectDropdownProps<TId extends string> = {
value: TId;
options: ListControlOption<TId>[];
onChange: (value: TId) => void;
+ size?: ButtonSize;
triggerRef?: (element: HTMLButtonElement) => void;
class?: string;
contentClass?: string;
@@ -50,11 +52,13 @@ function SingleSelectDropdown<TId extends string>(
placement="bottom-end"
>
<Dropdown.Trigger
+ aria-label={props.label}
+ tooltip={props.label}
+ as={props.grouped ? ButtonGroup.Button : Button}
ref={props.triggerRef}
variant="ghost"
- size="icon-md"
+ size={props.size ?? (props.grouped ? 'icon-sm' : 'icon-md')}
class={props.class}
- label={props.label}
>
{props.icon}
</Dropdown.Trigger>
@@ -74,7 +78,7 @@ function SingleSelectDropdown<TId extends string>(
<Show when={option.icon}>
<span
aria-hidden="true"
- class="flex size-3.5 shrink-0 items-center justify-center [&_svg]:size-3.5"
+ class="flex size-3.5 shrink-0 items-center justify-center"
>
{option.icon?.()}
</span>
@@ -111,21 +115,21 @@ const VIEW_LAYOUT_OPTIONS: ListControlOption<ViewLayout>[] = [
get label() {
return t('viewMenus.layoutList');
},
- icon: () => <ListIcon />,
+ icon: () => <ListIcon class="size-3.5" />,
},
{
id: 'board',
get label() {
return t('viewMenus.layoutBoard');
},
- icon: () => <BoardIcon />,
+ icon: () => <BoardIcon class="size-3.5" />,
},
{
id: 'gantt',
get label() {
return t('viewMenus.layoutGantt');
},
- icon: () => <GanttIcon />,
+ icon: () => <GanttIcon class="size-3.5" />,
},
];
@@ -141,12 +145,15 @@ export function ViewLayoutDropdown(props: ViewLayoutDropdownProps) {
<Show
when={props.value === 'gantt'}
fallback={
- <Show when={props.value === 'board'} fallback={<ListIcon />}>
- <BoardIcon />
+ <Show
+ when={props.value === 'board'}
+ fallback={<ListIcon class="size-4" />}
+ >
+ <BoardIcon class="size-4" />
</Show>
}
>
- <GanttIcon />
+ <GanttIcon class="size-4" />
</Show>
}
/>
@@ -167,7 +174,7 @@ export function ListSortDropdown<TId extends string>(
<SingleSelectDropdown
{...props}
label={props.label ?? t('viewMenus.sortList')}
- icon={<SortIcon />}
+ icon={<SortIcon class="size-4" />}
/>
);
}
@@ -186,7 +193,7 @@ export function ListGroupDropdown<TId extends string>(
<SingleSelectDropdown
{...props}
label={props.label ?? t('viewMenus.groupList')}
- icon={<GroupIcon />}
+ icon={<GroupIcon class="size-4" />}
/>
);
}
@@ -232,6 +239,7 @@ export type ListFilterDropdownProps<
customTrigger?: JSX.Element;
triggerRef?: (element: HTMLButtonElement) => void;
label?: string;
+ size?: ButtonSize;
activeCount?: number;
clearLabel?: string;
class?: string;
@@ -266,6 +274,11 @@ export function ListFilterDropdown<
props.onOpenChange?.(open);
if (props.open === undefined) setInternalOpen(open);
};
+ const triggerSize = () => {
+ if (props.size) return props.size;
+ if (props.activeCount) return props.grouped ? 'sm' : 'md';
+ return props.grouped ? 'icon-sm' : 'icon-md';
+ };
const isGroupActive = (group: ListFilterGroup<TGroupId, TOptionId>) =>
props.isGroupActive?.(group.id) ??
@@ -320,13 +333,15 @@ export function ListFilterDropdown<
when={props.customTrigger}
fallback={
<Dropdown.Trigger
+ aria-label={props.label ?? t('viewMenus.filterList')}
+ tooltip={props.label ?? t('viewMenus.filterList')}
+ as={props.grouped ? ButtonGroup.Button : Button}
ref={props.triggerRef}
variant="ghost"
- size={props.activeCount ? 'md' : 'icon-md'}
+ size={triggerSize()}
class={props.class}
- label={props.label ?? t('viewMenus.filterList')}
>
- <FilterIcon />
+ <FilterIcon class="size-4 shrink-0" />
<Show when={props.activeCount}>
<span class="flex min-w-4 h-4 items-center justify-center rounded-full bg-accent px-1 text-xxs font-medium leading-none text-surface">
{props.activeCount}
diff --git a/apps/web/src/components/view-shell/ListHeader.tsx b/apps/web/src/components/view-shell/ListHeader.tsx
index a3930b32de..df08d68c63 100644
--- a/apps/web/src/components/view-shell/ListHeader.tsx
+++ b/apps/web/src/components/view-shell/ListHeader.tsx
@@ -56,10 +56,11 @@ export function ListHeaderSearch(props: {
when={expanded()}
fallback={
<Button
+ aria-label={props.label}
+ tooltip={props.label}
ref={trigger}
- variant="outline"
+ variant="secondary"
size="icon-md"
- label={props.label}
aria-expanded="false"
onClick={focus}
>
diff --git a/apps/web/src/components/view-shell/MobileFilterDrawer.tsx b/apps/web/src/components/view-shell/MobileFilterDrawer.tsx
index f752783e36..3dc817bc7c 100644
--- a/apps/web/src/components/view-shell/MobileFilterDrawer.tsx
+++ b/apps/web/src/components/view-shell/MobileFilterDrawer.tsx
@@ -64,14 +64,13 @@ function Root(props: MobileFilterDrawerProps) {
as={Button}
aria-label={props.triggerLabel ?? 'Open filters'}
variant="ghost"
- size="sm"
- depth={3}
+ size="icon-md"
class={cn(
- 'island bg-chrome pointer-events-auto relative z-10 size-10 shrink-0 rounded-full [&_svg]:size-6',
+ 'island bg-chrome pointer-events-auto relative z-10 size-10 shrink-0 rounded-full',
props.class
)}
>
- <SlidersHorizontalIcon />
+ <SlidersHorizontalIcon class="size-6 shrink-0" />
<Show when={props.activeCount > 0}>
<span class="pointer-events-none absolute -top-0.5 right-0 z-10 flex size-4 translate-x-1/2 items-center justify-center rounded-full bg-accent text-xxs font-medium leading-none text-surface">
{props.activeCount}
diff --git a/apps/web/src/components/view-shell/SearchBar.tsx b/apps/web/src/components/view-shell/SearchBar.tsx
index d8f98bd83f..81aed0e420 100644
--- a/apps/web/src/components/view-shell/SearchBar.tsx
+++ b/apps/web/src/components/view-shell/SearchBar.tsx
@@ -138,14 +138,15 @@ export function SearchBar(props: SearchBarProps) {
}
>
<Button
+ aria-label={local.onClose ? 'Close search' : 'Clear search'}
+ tooltip={local.onClose ? 'Close search' : 'Clear search'}
type="button"
- size={local.size === 'sm' ? 'icon-xs' : 'sm'}
- square
- label={local.onClose ? 'Close search' : 'Clear search'}
+ variant="ghost"
+ size="icon-xs"
onPointerDown={(event) => event.preventDefault()}
onClick={() => (local.onClose ?? clear)()}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</TextField>
diff --git a/apps/web/src/components/view-shell/ViewCreateButton.tsx b/apps/web/src/components/view-shell/ViewCreateButton.tsx
index 90c4455114..23ce261241 100644
--- a/apps/web/src/components/view-shell/ViewCreateButton.tsx
+++ b/apps/web/src/components/view-shell/ViewCreateButton.tsx
@@ -22,7 +22,8 @@ export function ViewCreateButton(
return (
<Button
{...rest}
- variant="outline"
+ variant="secondary"
+ finish="raised"
size="md"
class={cn(
sidebar() &&
diff --git a/apps/web/src/components/view-shell/ViewShell.test.tsx b/apps/web/src/components/view-shell/ViewShell.test.tsx
index 35e442da37..628f908210 100644
--- a/apps/web/src/components/view-shell/ViewShell.test.tsx
+++ b/apps/web/src/components/view-shell/ViewShell.test.tsx
@@ -33,11 +33,9 @@ vi.mock('@solid-primitives/resize-observer', () => ({
vi.mock('@ui', async () => ({
...(await import('../ui/utils/classname')),
...(await import('../ui/utils/press')),
- Button: (
- props: JSX.ButtonHTMLAttributes<HTMLButtonElement> & { label?: string }
- ) => (
+ Button: (props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) => (
<button
- aria-label={props.label}
+ aria-label={props['aria-label']}
aria-expanded={props['aria-expanded']}
onClick={props.onClick}
onMouseDown={props.onMouseDown}
diff --git a/apps/web/src/components/view-shell/ViewShell.tsx b/apps/web/src/components/view-shell/ViewShell.tsx
index c71424667d..327f1d7088 100644
--- a/apps/web/src/components/view-shell/ViewShell.tsx
+++ b/apps/web/src/components/view-shell/ViewShell.tsx
@@ -11,6 +11,7 @@ import { Resize } from '@core/component/Resize';
import { registerHotkey } from '@core/hotkey/hotkeys';
import { TOKENS } from '@core/hotkey/tokens';
import SidebarIcon from '@icon/system/regular/sidebar-simple.svg';
+import CloseIcon from '@icon/system/regular/x.svg';
import { createWritableMemo } from '@solid-primitives/memo';
import { mergeRefs } from '@solid-primitives/refs';
import { createElementSize } from '@solid-primitives/resize-observer';
@@ -20,6 +21,7 @@ import { tourTarget } from '@ui/components/Tour';
import {
type Accessor,
batch,
+ type ComponentProps,
createComputed,
createContext,
createSignal,
@@ -549,7 +551,16 @@ function Aside(props: ViewShellAsideProps) {
}
/** Keep split close available in both docked and overlay navigation. */
-export const ViewSidebarCloseButton = SplitPanel.CloseButton;
+export function ViewSidebarCloseButton(
+ props: ComponentProps<typeof SplitPanel.CloseButton>
+) {
+ const [local, rest] = splitProps(props, ['children', 'size']);
+ return (
+ <SplitPanel.CloseButton {...rest} size={local.size ?? 'icon-xs'}>
+ {local.children ?? <CloseIcon class="size-4" />}
+ </SplitPanel.CloseButton>
+ );
+}
/** Safe outside a shell so block preview headers can share this control. */
export function ViewSidebarToggle(props: { action: 'collapse' | 'expand' }) {
@@ -562,11 +573,20 @@ export function ViewSidebarToggle(props: { action: 'collapse' | 'expand' }) {
(props.action === 'expand'
? ws.aside.isCollapsed() || ws.aside.isOverlay()
: !ws.aside.isCollapsed());
+ // Show and Hide are separate actions, not a persistently pressed toggle.
return (
<Show when={visible()}>
<Button
+ aria-label={
+ props.action === 'expand' ? 'Show navigation' : 'Hide navigation'
+ }
+ tooltip={{
+ content:
+ props.action === 'expand' ? 'Show navigation' : 'Hide navigation',
+ hotkey: TOKENS.workspace.toggleNavigation,
+ }}
variant="ghost"
- size="icon-sm"
+ size="icon-xs"
class={cn(
'shrink-0 touch:hidden',
props.action === 'collapse' && 'ml-auto',
@@ -574,11 +594,6 @@ export function ViewSidebarToggle(props: { action: 'collapse' | 'expand' }) {
ws?.aside.isOverlay() &&
'motion-safe:animate-[dialog-overlay-open_60ms_ease-out_80ms_both]'
)}
- label={
- props.action === 'expand' ? 'Show navigation' : 'Hide navigation'
- }
- hotkey={TOKENS.workspace.toggleNavigation}
- aria-expanded={props.action !== 'expand'}
ref={(element) => {
if (props.action === 'expand') toggleTarget(element);
}}
diff --git a/apps/web/src/components/view-shell/ViewSidebar.tsx b/apps/web/src/components/view-shell/ViewSidebar.tsx
index b464b3ad1a..7b67f64ad7 100644
--- a/apps/web/src/components/view-shell/ViewSidebar.tsx
+++ b/apps/web/src/components/view-shell/ViewSidebar.tsx
@@ -82,7 +82,7 @@ function Header(
{local.actions}
<Show when={!isTouchDevice() && local.search}>
<Control
- label={local.searchLabel ?? 'Search'}
+ aria-label={local.searchLabel ?? 'Search'}
aria-expanded={searchOpen()}
onClick={toggleSearch}
>
@@ -192,9 +192,9 @@ function Control(props: ButtonProps) {
return (
<Button
variant="ghost"
- size="icon-sm"
+ size="icon-xs"
{...rest}
- class={cn('size-(--sidebar-control-size) shrink-0', local.class)}
+ class={cn('shrink-0', local.class)}
data-view-sidebar-control=""
/>
);
@@ -325,7 +325,7 @@ function TreeItem(props: {
<span class="absolute right-(--sidebar-action-inset) top-1/2 flex -translate-y-1/2">
<Control
class="rounded-md"
- label={`${props.expanded ? 'Collapse' : 'Expand'} ${props.label}`}
+ aria-label={`${props.expanded ? 'Collapse' : 'Expand'} ${props.label}`}
aria-expanded={props.expanded}
onClick={props.onToggle}
>
@@ -368,6 +368,7 @@ function Action(props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) {
const [local, rest] = splitProps(props, ['children', 'class']);
return (
<Button
+ variant="secondary"
type="button"
{...rest}
class={cn(
diff --git a/apps/web/src/features/access-requests/components/AccessLevelSelect.tsx b/apps/web/src/features/access-requests/components/AccessLevelSelect.tsx
index 49922d59bf..709a326c24 100644
--- a/apps/web/src/features/access-requests/components/AccessLevelSelect.tsx
+++ b/apps/web/src/features/access-requests/components/AccessLevelSelect.tsx
@@ -13,7 +13,7 @@ export function AccessLevelSelect(props: {
return (
<Dropdown>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
disabled={props.disabled}
aria-label={props.label}
>
diff --git a/apps/web/src/features/access-requests/views/DirectAccessInvite.tsx b/apps/web/src/features/access-requests/views/DirectAccessInvite.tsx
index 8c5ad47baa..315572981e 100644
--- a/apps/web/src/features/access-requests/views/DirectAccessInvite.tsx
+++ b/apps/web/src/features/access-requests/views/DirectAccessInvite.tsx
@@ -34,7 +34,7 @@ export function DirectAccessInvite(props: {
</TextField>
<Button
type="submit"
- variant="strong"
+ variant="primary"
disabled={
props.source.busy() ||
!props.source.state()?.canReview ||
diff --git a/apps/web/src/features/access-requests/views/PermissionRequestsView.tsx b/apps/web/src/features/access-requests/views/PermissionRequestsView.tsx
index ce9cf127af..3fcc787346 100644
--- a/apps/web/src/features/access-requests/views/PermissionRequestsView.tsx
+++ b/apps/web/src/features/access-requests/views/PermissionRequestsView.tsx
@@ -34,7 +34,7 @@ function ReviewRow(props: { request: AccessRequest; source: SharingSource }) {
/>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.source.busy()}
onClick={() => fireAndForget(resolve(level()), 'access-requests')}
>
diff --git a/apps/web/src/features/access-requests/views/RequestAccessView.tsx b/apps/web/src/features/access-requests/views/RequestAccessView.tsx
index f6a0edbe64..1e0881a4e5 100644
--- a/apps/web/src/features/access-requests/views/RequestAccessView.tsx
+++ b/apps/web/src/features/access-requests/views/RequestAccessView.tsx
@@ -63,7 +63,7 @@ export function RequestAccessView(props: {
/>
</div>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={
props.source.busy() ||
diff --git a/apps/web/src/features/agent-interactions/components/LiveElicitation.tsx b/apps/web/src/features/agent-interactions/components/LiveElicitation.tsx
index df7af60ce9..92c852e8c0 100644
--- a/apps/web/src/features/agent-interactions/components/LiveElicitation.tsx
+++ b/apps/web/src/features/agent-interactions/components/LiveElicitation.tsx
@@ -219,7 +219,7 @@ export function QuestionActions(props: {
<Match when={form(props.question)}>
{(question) => (
<Button
- variant="cta"
+ variant="primary"
size="xs"
disabled={props.locked}
onClick={() => submit(question().draft)}
@@ -231,7 +231,7 @@ export function QuestionActions(props: {
<Match when={url(props.question)}>
{(question) => (
<Button
- variant="cta"
+ variant="primary"
size="xs"
disabled={props.locked}
onClick={() =>
@@ -246,7 +246,7 @@ export function QuestionActions(props: {
);
const decline = (
<Button
- variant="outline"
+ variant="secondary"
size="xs"
disabled={props.locked}
onClick={() => respond({ action: 'decline' })}
diff --git a/apps/web/src/features/agent-interactions/components/PermissionOptions.tsx b/apps/web/src/features/agent-interactions/components/PermissionOptions.tsx
index 6955eaef82..98081c5c07 100644
--- a/apps/web/src/features/agent-interactions/components/PermissionOptions.tsx
+++ b/apps/web/src/features/agent-interactions/components/PermissionOptions.tsx
@@ -62,11 +62,11 @@ export function PermissionOptions(props: PermissionOptionsProps) {
<Dropdown placement="top-end">
<Dropdown.Trigger
size="md"
- variant="outline"
+ variant="secondary"
disabled={props.disabled}
>
More options
- <CaretDown />
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content class="w-80 max-w-[calc(100vw-2rem)]">
<Dropdown.Group class="max-h-64 overflow-y-auto">
@@ -96,7 +96,7 @@ export function PermissionOptions(props: PermissionOptionsProps) {
<Button
type="button"
size="md"
- variant="strong"
+ variant="primary"
tooltip={option().name}
disabled={props.disabled}
onClick={() => props.onSelect(option().id)}
diff --git a/apps/web/src/features/agent-reviews/components/import-plan-card.tsx b/apps/web/src/features/agent-reviews/components/import-plan-card.tsx
index 781424f7fc..71bf05205d 100644
--- a/apps/web/src/features/agent-reviews/components/import-plan-card.tsx
+++ b/apps/web/src/features/agent-reviews/components/import-plan-card.tsx
@@ -305,7 +305,7 @@ function PlanContents(
<Show when={props.onReload}>
{(reload) => (
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={props.working}
onClick={() => reload()()}
@@ -430,7 +430,7 @@ function PlanContents(
Dismiss
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={!props.editable || props.count === 0}
onClick={() => props.onApprove()}
diff --git a/apps/web/src/features/agent-reviews/components/review-navigation.tsx b/apps/web/src/features/agent-reviews/components/review-navigation.tsx
index 95cd06e91f..6c14f630f4 100644
--- a/apps/web/src/features/agent-reviews/components/review-navigation.tsx
+++ b/apps/web/src/features/agent-reviews/components/review-navigation.tsx
@@ -54,18 +54,22 @@ export function ReviewNavigation(props: {
class="ml-auto flex shrink-0 items-center gap-0.5"
>
<Button
+ variant="ghost"
+ aria-label="Previous draft"
+ tooltip="Previous draft"
size="icon-sm"
- label="Previous draft"
disabled={props.disabled || props.index === 0}
onClick={() =>
fireAndForget(props.onNavigate(props.index - 1), 'agent-reviews')
}
>
- <CaretLeft />
+ <CaretLeft class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ variant="ghost"
+ aria-label={`Choose draft, ${props.index + 1} of ${props.items.length}`}
+ tooltip={`Choose draft, ${props.index + 1} of ${props.items.length}`}
size="sm"
- label={`Choose draft, ${props.index + 1} of ${props.items.length}`}
aria-haspopup="dialog"
aria-expanded={open()}
disabled={props.disabled}
@@ -77,14 +81,16 @@ export function ReviewNavigation(props: {
<CaretDown class="size-3" />
</Button>
<Button
+ variant="ghost"
+ aria-label="Next draft"
+ tooltip="Next draft"
size="icon-sm"
- label="Next draft"
disabled={props.disabled || props.index === props.items.length - 1}
onClick={() =>
fireAndForget(props.onNavigate(props.index + 1), 'agent-reviews')
}
>
- <CaretRight />
+ <CaretRight class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</nav>
</header>
@@ -121,6 +127,7 @@ export function ReviewNavigation(props: {
>
{(item) => (
<Button
+ variant="ghost"
fullWidth
class="h-auto min-h-14 justify-start gap-3 rounded-lg px-3 py-2 text-left whitespace-normal touch:min-h-14"
aria-current={
@@ -159,7 +166,7 @@ export function ReviewNavigation(props: {
</div>
</Panel.Body>
<Panel.Footer class="justify-end p-3">
- <Button size="sm" onClick={() => setOpen(false)}>
+ <Button variant="ghost" size="sm" onClick={() => setOpen(false)}>
Done
</Button>
</Panel.Footer>
diff --git a/apps/web/src/features/agent-reviews/views/review-stack.tsx b/apps/web/src/features/agent-reviews/views/review-stack.tsx
index 7e01e601b7..e0d2190c07 100644
--- a/apps/web/src/features/agent-reviews/views/review-stack.tsx
+++ b/apps/web/src/features/agent-reviews/views/review-stack.tsx
@@ -229,7 +229,7 @@ export function ReviewStack(props: {
<Show when={controller.stale() || controller.error()}>
<div class="mb-3 flex flex-wrap items-center gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={working()}
onClick={() => fireAndForget(reload(), 'agent-reviews')}
@@ -324,7 +324,7 @@ export function ReviewStack(props: {
{progress()}
</span>
<Button
- variant="strong"
+ variant="secondary"
size="sm"
class="ml-auto"
disabled={locked() || pending() === 0}
diff --git a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
index 68ba5300e9..d13a8226ce 100644
--- a/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
+++ b/apps/web/src/features/agents-view/components/AgentsSidebar.tsx
@@ -342,7 +342,7 @@ export function AgentsSidebar(props: AgentsSidebarProps) {
/>
<Show when={isTouchDevice()}>
<CollapsibleSection.Action
- label="Search conversations"
+ aria-label="Search conversations"
aria-pressed={searchOpen()}
class={cn(searchOpen() && 'bg-active text-ink')}
onClick={() => (searchOpen() ? closeSearch() : openSearch())}
@@ -351,7 +351,7 @@ export function AgentsSidebar(props: AgentsSidebarProps) {
</CollapsibleSection.Action>
</Show>
<CollapsibleSection.Action
- label="Show hidden routine runs"
+ aria-label="Show hidden routine runs"
aria-pressed={props.showUnlistedRuns}
class={cn(props.showUnlistedRuns && 'bg-active text-ink')}
onClick={() =>
diff --git a/apps/web/src/features/agents-view/components/ChatComposer.tsx b/apps/web/src/features/agents-view/components/ChatComposer.tsx
index c6e96674bc..6d8a5fb89f 100644
--- a/apps/web/src/features/agents-view/components/ChatComposer.tsx
+++ b/apps/web/src/features/agents-view/components/ChatComposer.tsx
@@ -471,10 +471,11 @@ export function ChatComposer(props: {
when={canSendNext()}
fallback={
<Button
- variant="strong"
+ aria-label="Stop"
+ tooltip="Stop"
+ variant="secondary"
class="touch:glass touch:bg-chrome touch:text-ink touch:data-disabled:bg-chrome"
- size="icon-composer"
- label="Stop"
+ size="icon-md"
disabled={disabled()}
onClick={() => props.session?.onStop?.()}
>
@@ -487,8 +488,10 @@ export function ChatComposer(props: {
class="touch:bg-transparent touch:text-ink touch:data-disabled:bg-transparent"
intent="flush"
aria-label="Flush queued messages"
- tooltip="Flush queued messages"
- shortcut="Enter"
+ tooltip={{
+ content: 'Flush queued messages',
+ shortcut: 'Enter',
+ }}
onClick={sendNext}
/>
</Show>
diff --git a/apps/web/src/features/agents-view/components/ModelSelector.tsx b/apps/web/src/features/agents-view/components/ModelSelector.tsx
index 019537b20b..c57617472f 100644
--- a/apps/web/src/features/agents-view/components/ModelSelector.tsx
+++ b/apps/web/src/features/agents-view/components/ModelSelector.tsx
@@ -4,6 +4,7 @@ import {
type ModelRowProps,
} from '@core/component/AI/component/input/ModelCatalogPicker';
import { modelLabel } from '@core/component/AI/constant/model-label';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
import type { Component, JSX } from 'solid-js';
export type ModelChoice = {
@@ -39,7 +40,8 @@ export function ModelSelector(props: {
triggerLabel={props.label}
placeholder={modelLabel(props.model)}
triggerSize="md"
- triggerClass="min-w-0 max-w-full gap-[5.625px] rounded-full border-0 bg-transparent hover:bg-hover px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder [&_svg]:size-[15px]"
+ triggerClass="min-w-0 max-w-full gap-[5.625px] rounded-full border-0 bg-transparent hover:bg-hover px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder"
+ contentClass="w-[min(42rem,calc(100vw-2rem))] rounded-2xl border-0"
ariaLabel="Model"
placement="top-end"
disabled={props.disabled}
@@ -67,7 +69,7 @@ export function SessionModelSelector(props: AgentModelSelectorProps) {
shown(),
props.options.find((option) => option.id === shown())?.name
),
- props.effortLabel,
+ isTouchDevice() ? props.effortLabel : undefined,
]
.filter(Boolean)
.join(' · ')}
diff --git a/apps/web/src/features/agents-view/components/Topbar.tsx b/apps/web/src/features/agents-view/components/Topbar.tsx
index 08a75a8fc6..bb59f793ef 100644
--- a/apps/web/src/features/agents-view/components/Topbar.tsx
+++ b/apps/web/src/features/agents-view/components/Topbar.tsx
@@ -15,12 +15,13 @@ export function Topbar(props: {
<ViewShell.TopBar class="touch:flex">
<Show when={props.onBack}>
<Button
+ aria-label="Back to conversations"
+ tooltip="Back to conversations"
variant="ghost"
size="icon-md"
- label="Back to conversations"
onClick={props.onBack}
>
- <ArrowLeft />
+ <ArrowLeft class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<div class="flex min-w-0 items-center gap-1">
diff --git a/apps/web/src/features/agents-view/views/AgentPicker.tsx b/apps/web/src/features/agents-view/views/AgentPicker.tsx
index 9ad5301539..d1ac850c3d 100644
--- a/apps/web/src/features/agents-view/views/AgentPicker.tsx
+++ b/apps/web/src/features/agents-view/views/AgentPicker.tsx
@@ -223,9 +223,8 @@ function DesktopAgentPicker(props: AgentPickerProps) {
<Dropdown.Item
closeOnSelect
class={buttonClasses({
- variant: 'strong',
+ variant: 'secondary',
size: 'sm',
- glass: false,
class: 'w-auto gap-1.5 data-highlighted:overlay-hover',
})}
onSelect={() => {
diff --git a/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx b/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx
index d9062d75df..e0963338c4 100644
--- a/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx
+++ b/apps/web/src/features/agents-view/views/MobileAgentPicker.tsx
@@ -130,9 +130,10 @@ export function MobileAgentPicker(props: AgentPickerProps) {
<div class="flex items-center gap-2 px-4 pb-3">
<Show when={browsing() || showAll()}>
<Button
+ aria-label={showAll() ? 'Back to Suggested' : 'Back to agents'}
+ tooltip={showAll() ? 'Back to Suggested' : 'Back to agents'}
variant="ghost"
size="icon-md"
- label={showAll() ? 'Back to Suggested' : 'Back to agents'}
onClick={() => {
if (showAll()) {
setShowAll(false);
@@ -141,7 +142,7 @@ export function MobileAgentPicker(props: AgentPickerProps) {
} else browse();
}}
>
- <ArrowLeft />
+ <ArrowLeft class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<h2 class="min-w-0 flex-1 truncate font-medium">
@@ -288,13 +289,14 @@ export function MobileAgentPicker(props: AgentPickerProps) {
</MobileDrawer.Item>
<Show when={!agent.unavailableReason}>
<Button
+ aria-label={`Models for ${agent.name}`}
+ tooltip={`Models for ${agent.name}`}
variant="ghost"
size="icon-md"
class="mr-1 size-11 shrink-0"
- label={`Models for ${agent.name}`}
onClick={() => browse(agent)}
>
- <CaretRight />
+ <CaretRight class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -317,9 +319,8 @@ export function MobileAgentPicker(props: AgentPickerProps) {
</Show>
<div class="flex justify-end px-4 pt-1">
<Button
- variant="strong"
+ variant="secondary"
size="sm"
- glass={false}
class="gap-1.5"
onClick={() => {
changeOpen(false);
diff --git a/apps/web/src/features/agents-view/views/RepositoryPicker.tsx b/apps/web/src/features/agents-view/views/RepositoryPicker.tsx
index e9021620b7..e213c3eae3 100644
--- a/apps/web/src/features/agents-view/views/RepositoryPicker.tsx
+++ b/apps/web/src/features/agents-view/views/RepositoryPicker.tsx
@@ -280,9 +280,8 @@ export function RepositoryPicker(props: {
<div class="flex items-center justify-between gap-2 px-2 py-2 text-xs text-ink-muted">
Couldn't load your repositories.
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
onClick={() => props.onRetryRepositories()}
>
Retry
@@ -300,9 +299,8 @@ export function RepositoryPicker(props: {
repositories your coders should work on.
<Show when={props.onConnectGitHub}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
class="self-start"
onClick={() => props.onConnectGitHub?.()}
>
@@ -432,9 +430,8 @@ export function RepositoryPicker(props: {
<div class="flex items-center justify-between gap-2 px-2 py-2 text-xs text-ink-muted">
Couldn't load this repository's branches.
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
onClick={() => props.onRetryBranches()}
>
Retry
diff --git a/apps/web/src/features/auth/EmailAuth.tsx b/apps/web/src/features/auth/EmailAuth.tsx
index 2f0c710ae9..3c00045880 100644
--- a/apps/web/src/features/auth/EmailAuth.tsx
+++ b/apps/web/src/features/auth/EmailAuth.tsx
@@ -354,7 +354,7 @@ function EmailLinkCallback(props: Pick<EmailAuthParams, 'successPath'>) {
few minutes to sync after you return.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
navigateAfterLink(stringParam(searchParams.link_id))
diff --git a/apps/web/src/features/billing-lab/views/billing-lab.tsx b/apps/web/src/features/billing-lab/views/billing-lab.tsx
index 4876e9c1cd..5daee7cc78 100644
--- a/apps/web/src/features/billing-lab/views/billing-lab.tsx
+++ b/apps/web/src/features/billing-lab/views/billing-lab.tsx
@@ -210,9 +210,10 @@ export function BillingLabView(props: {
</p>
</div>
<Button
- variant="outline"
+ aria-label="Reset scenario"
+ tooltip="Reset scenario"
+ variant="secondary"
size="sm"
- label="Reset scenario"
onClick={() => {
lab.selectScenario(lab.state().scenario);
setPaymentError(undefined);
@@ -389,7 +390,7 @@ export function BillingLabView(props: {
<ControlSection title="Time travel">
<div class="grid grid-cols-2 gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={lab.pending()}
onClick={() => lab.advance(1)}
@@ -397,7 +398,7 @@ export function BillingLabView(props: {
+1 day
</Button>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={lab.pending()}
onClick={() => lab.advance(7)}
@@ -406,7 +407,7 @@ export function BillingLabView(props: {
</Button>
</div>
<Button
- variant="accent"
+ variant="primary"
size="sm"
disabled={lab.pending()}
onClick={lab.renew}
@@ -440,7 +441,7 @@ export function BillingLabView(props: {
}
/>
</label>
- <Button variant="outline" size="sm" onClick={lab.exhaust}>
+ <Button variant="secondary" size="sm" onClick={lab.exhaust}>
Exhaust included usage
</Button>
<label class="flex flex-col gap-2 text-xs">
@@ -464,7 +465,7 @@ export function BillingLabView(props: {
</ControlSection>
<ControlSection title="Dialogs & requests">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() => lab.setLimitOpen(true)}
>
@@ -581,7 +582,7 @@ export function BillingLabView(props: {
Cancel
</Button>
<Button
- variant="accent"
+ variant="primary"
disabled={lab.pending()}
onClick={() => fireAndForget(completePayment(), 'billing-lab')}
>
diff --git a/apps/web/src/features/block-agent/component/AgentComposer.tsx b/apps/web/src/features/block-agent/component/AgentComposer.tsx
index bdcbc626d2..0f53018d06 100644
--- a/apps/web/src/features/block-agent/component/AgentComposer.tsx
+++ b/apps/web/src/features/block-agent/component/AgentComposer.tsx
@@ -250,7 +250,7 @@ export function AgentComposer(props: {
{queuedItems().length} queued
</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="touch:min-h-11"
aria-label="Send next queued message now"
diff --git a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
index 358bcba833..cf78e0ae7c 100644
--- a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
+++ b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
@@ -199,7 +199,7 @@ export function AgentSplitHeader(props: {
<For each={tools}>
{(tool) => (
<Show when={!tool.condition || tool.condition()}>
- <ToolButton tool={tool} />
+ <ToolButton tool={tool} grouped />
</Show>
)}
</For>
diff --git a/apps/web/src/features/block-agent/component/ArchivedSessionFooter.tsx b/apps/web/src/features/block-agent/component/ArchivedSessionFooter.tsx
index 949d786b69..633e6148d6 100644
--- a/apps/web/src/features/block-agent/component/ArchivedSessionFooter.tsx
+++ b/apps/web/src/features/block-agent/component/ArchivedSessionFooter.tsx
@@ -23,7 +23,7 @@ export function ArchivedSessionFooter(props: { sessionId: string }) {
</p>
</div>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={pending()}
onClick={unarchive}
diff --git a/apps/web/src/features/block-agent/ui/AgentInput.tsx b/apps/web/src/features/block-agent/ui/AgentInput.tsx
index 293b42776a..6069cfdb42 100644
--- a/apps/web/src/features/block-agent/ui/AgentInput.tsx
+++ b/apps/web/src/features/block-agent/ui/AgentInput.tsx
@@ -456,9 +456,10 @@ export function AgentInput(props: AgentInputProps) {
}
>
<Button
- variant={isTouchDevice() ? 'ghost' : 'strong'}
- size="icon-composer"
- label="Stop"
+ aria-label="Stop"
+ tooltip="Stop"
+ variant={isTouchDevice() ? 'ghost' : 'secondary'}
+ size="icon-md"
disabled={props.disabled || props.readOnly}
onClick={() => props.onStop?.()}
class={
@@ -476,8 +477,10 @@ export function AgentInput(props: AgentInputProps) {
appearance="composer"
intent="flush"
aria-label="Flush queued messages"
- tooltip="Flush queued messages"
- shortcut="Enter"
+ tooltip={{
+ content: 'Flush queued messages',
+ shortcut: 'Enter',
+ }}
onClick={sendNext}
disabled={!canSendNext()}
/>
diff --git a/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx b/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx
index aa9661f6ad..093d519644 100644
--- a/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx
+++ b/apps/web/src/features/block-agent/ui/AgentModelSelector.tsx
@@ -47,7 +47,7 @@ export function AgentModelSelector(props: AgentModelSelectorProps) {
shown() ?? undefined,
props.options.find((option) => option.id === shown())?.name
),
- props.effortLabel,
+ isTouchDevice() ? props.effortLabel : undefined,
]
.filter(Boolean)
.join(' · ');
diff --git a/apps/web/src/features/block-agent/ui/FailureNoticeCard.tsx b/apps/web/src/features/block-agent/ui/FailureNoticeCard.tsx
index 81dd287086..2711ec25e3 100644
--- a/apps/web/src/features/block-agent/ui/FailureNoticeCard.tsx
+++ b/apps/web/src/features/block-agent/ui/FailureNoticeCard.tsx
@@ -42,7 +42,7 @@ export function FailureNoticeCard(props: FailureNoticeCardProps) {
{(link) => (
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
class="gap-1.5"
onClick={() => props.onOpenLink(link().url)}
diff --git a/apps/web/src/features/block-agent/ui/QueuedPrompts.test.tsx b/apps/web/src/features/block-agent/ui/QueuedPrompts.test.tsx
index 3727e240a5..a0eb6395ad 100644
--- a/apps/web/src/features/block-agent/ui/QueuedPrompts.test.tsx
+++ b/apps/web/src/features/block-agent/ui/QueuedPrompts.test.tsx
@@ -46,12 +46,12 @@ vi.mock('@core/component/LexicalMarkdown/builder/MarkdownShell', () => ({
vi.mock('@ui', () => ({
Surface: (props: { children?: JSX.Element }) => props.children,
Button: (props: {
- label?: string;
+ 'aria-label'?: string;
disabled?: boolean;
onClick?: () => void;
}) => (
<button
- aria-label={props.label}
+ aria-label={props['aria-label']}
disabled={props.disabled}
onClick={props.onClick}
/>
diff --git a/apps/web/src/features/block-agent/ui/QueuedPrompts.tsx b/apps/web/src/features/block-agent/ui/QueuedPrompts.tsx
index 28e7a8abec..0e527cbcc0 100644
--- a/apps/web/src/features/block-agent/ui/QueuedPrompts.tsx
+++ b/apps/web/src/features/block-agent/ui/QueuedPrompts.tsx
@@ -242,9 +242,9 @@ function QueuedRow(props: QueuedRowProps) {
</Show>
<Show when={props.onSteer}>
<Button
+ aria-label="Steer"
variant="ghost"
size="xs"
- label="Steer"
tooltip="Interrupt the current turn and send this message next"
disabled={props.disabled}
onClick={() => props.onSteer?.()}
@@ -254,9 +254,10 @@ function QueuedRow(props: QueuedRowProps) {
</Button>
</Show>
<Button
+ aria-label="Remove queued message"
+ tooltip="Remove queued message"
variant="ghost"
size="icon-sm"
- label="Remove queued message"
disabled={props.disabled}
onClick={() => props.onRemove()}
class="shrink-0"
diff --git a/apps/web/src/features/block-agent/ui/ToolApprovalCard.tsx b/apps/web/src/features/block-agent/ui/ToolApprovalCard.tsx
index c713559f81..050dc521fb 100644
--- a/apps/web/src/features/block-agent/ui/ToolApprovalCard.tsx
+++ b/apps/web/src/features/block-agent/ui/ToolApprovalCard.tsx
@@ -68,7 +68,7 @@ export function ToolApprovalCard(props: ToolApprovalCardProps) {
<Button
type="button"
size="md"
- variant="outline"
+ variant="secondary"
disabled={props.disabled}
onClick={() => props.onCancel()}
>
@@ -91,7 +91,7 @@ export function ToolApprovalCard(props: ToolApprovalCardProps) {
<Button
type="button"
size="md"
- variant="outline"
+ variant="secondary"
disabled={props.disabled}
onClick={() => props.onApproveAlways()}
>
@@ -101,7 +101,7 @@ export function ToolApprovalCard(props: ToolApprovalCardProps) {
<Button
type="button"
size="md"
- variant="strong"
+ variant="primary"
disabled={props.disabled}
onClick={() => props.onApprove()}
>
diff --git a/apps/web/src/features/block-agent/ui/ToolErrorCard.tsx b/apps/web/src/features/block-agent/ui/ToolErrorCard.tsx
index ee09bc51a3..769ac75379 100644
--- a/apps/web/src/features/block-agent/ui/ToolErrorCard.tsx
+++ b/apps/web/src/features/block-agent/ui/ToolErrorCard.tsx
@@ -106,7 +106,6 @@ export function ToolErrorCard(props: ToolErrorCardProps) {
type="button"
variant="ghost"
size="sm"
- noTouchResize
class="shrink-0 px-1 text-ink-extra-muted hover:text-ink-muted"
aria-label={copied() ? 'Copied' : 'Copy error'}
onMouseDown={(event) => event.preventDefault()}
diff --git a/apps/web/src/features/block-ai/ai-block.tsx b/apps/web/src/features/block-ai/ai-block.tsx
index 9af85e7121..13e46522ab 100644
--- a/apps/web/src/features/block-ai/ai-block.tsx
+++ b/apps/web/src/features/block-ai/ai-block.tsx
@@ -291,8 +291,8 @@ function DownloadOnly(props: { onDownload: () => void }): JSX.Element {
return (
<div class="flex size-full flex-col items-center justify-center gap-3 p-6 text-ink-muted text-sm">
Illustrator files can't be edited here yet.
- <Button variant="outline" size="sm" onClick={props.onDownload}>
- <DownloadSimple />
+ <Button variant="secondary" size="sm" onClick={props.onDownload}>
+ <DownloadSimple class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Download
</Button>
</div>
diff --git a/apps/web/src/features/block-ai/components/main-menu.tsx b/apps/web/src/features/block-ai/components/main-menu.tsx
index dd83a91700..a230e9d09d 100644
--- a/apps/web/src/features/block-ai/components/main-menu.tsx
+++ b/apps/web/src/features/block-ai/components/main-menu.tsx
@@ -28,16 +28,16 @@ export function MainMenu(props: { items: (MenuItem | 'divider')[] }) {
}}
>
<Button
+ aria-label="Main menu"
variant="ghost"
size="icon-md"
- label="Main menu"
tooltip={open() ? undefined : 'Main menu'}
aria-haspopup="menu"
aria-expanded={open()}
data-testid="ai-main-menu"
onClick={() => setOpen((o) => !o)}
>
- <List />
+ <List class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Show when={open()}>
<div
diff --git a/apps/web/src/features/block-ai/components/notices.tsx b/apps/web/src/features/block-ai/components/notices.tsx
index b2224261f2..3cf5ade3a3 100644
--- a/apps/web/src/features/block-ai/components/notices.tsx
+++ b/apps/web/src/features/block-ai/components/notices.tsx
@@ -24,7 +24,7 @@ export function SessionNotice(props: {
<WarningCircle class="size-3.5 shrink-0 text-warning" />
<span class="min-w-0 flex-1">{props.message}</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="ai-session-action"
onClick={() => props.onAction()}
diff --git a/apps/web/src/features/block-ai/components/paint-swatch.tsx b/apps/web/src/features/block-ai/components/paint-swatch.tsx
index c7bcaf3b9c..cecad7b74b 100644
--- a/apps/web/src/features/block-ai/components/paint-swatch.tsx
+++ b/apps/web/src/features/block-ai/components/paint-swatch.tsx
@@ -97,7 +97,7 @@ export function PaintSwatch(props: {
onChange={(hex, live) => props.onChange?.(hex.slice(0, 6), live)}
/>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid={props.testId ? `${props.testId}-none` : undefined}
onClick={() => props.onChange?.(null, false)}
diff --git a/apps/web/src/features/block-ai/components/properties-panel.tsx b/apps/web/src/features/block-ai/components/properties-panel.tsx
index 20ab03e23c..efcd8758a9 100644
--- a/apps/web/src/features/block-ai/components/properties-panel.tsx
+++ b/apps/web/src/features/block-ai/components/properties-panel.tsx
@@ -176,9 +176,9 @@ function IconButton(props: {
}) {
return (
<Button
+ aria-label={props.label}
variant="ghost"
size="icon-sm"
- label={props.label}
tooltip={props.label}
data-testid={props.testId}
disabled={props.disabled}
@@ -711,7 +711,7 @@ export function PropertiesPanel(props: {
<div class="flex flex-wrap gap-1">
<Show when={m().can.group}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="ai-action-group"
onClick={() => a.onGroup()}
@@ -721,7 +721,7 @@ export function PropertiesPanel(props: {
</Show>
<Show when={m().can.ungroup}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="ai-action-ungroup"
onClick={() => a.onUngroup()}
@@ -731,7 +731,7 @@ export function PropertiesPanel(props: {
</Show>
<Show when={m().can.clip}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="ai-action-clip"
onClick={() => a.onClip()}
@@ -741,7 +741,7 @@ export function PropertiesPanel(props: {
</Show>
<Show when={m().can.release}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="ai-action-release"
onClick={() => a.onRelease()}
@@ -751,7 +751,7 @@ export function PropertiesPanel(props: {
</Show>
<Show when={m().can.outline}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="ai-action-outline"
onClick={() => a.onOutline()}
diff --git a/apps/web/src/features/block-ai/components/status-bar.tsx b/apps/web/src/features/block-ai/components/status-bar.tsx
index 7fbd824307..a90c41429d 100644
--- a/apps/web/src/features/block-ai/components/status-bar.tsx
+++ b/apps/web/src/features/block-ai/components/status-bar.tsx
@@ -84,26 +84,26 @@ export function StatusBar(props: {
>
<Show when={props.editable}>
<Button
+ aria-label="Undo"
variant="ghost"
size="icon-md"
- label="Undo"
tooltip={`Undo · ${mod()}Z`}
disabled={!props.canUndo}
data-testid="ai-undo"
onClick={() => props.onUndo()}
>
- <ArrowUUpLeft />
+ <ArrowUUpLeft class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Redo"
variant="ghost"
size="icon-md"
- label="Redo"
tooltip={`Redo · ${props.mac ? '⇧⌘Z' : 'Ctrl+Shift+Z'}`}
disabled={!props.canRedo}
data-testid="ai-redo"
onClick={() => props.onRedo()}
>
- <ArrowUUpRight />
+ <ArrowUUpRight class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<span
class="flex size-8 items-center justify-center text-ink-muted"
diff --git a/apps/web/src/features/block-ai/components/tool-bar.tsx b/apps/web/src/features/block-ai/components/tool-bar.tsx
index 7feeb25822..e93480999a 100644
--- a/apps/web/src/features/block-ai/components/tool-bar.tsx
+++ b/apps/web/src/features/block-ai/components/tool-bar.tsx
@@ -71,13 +71,13 @@ export function ToolBar(props: {
const Icon = ICONS[t.tool];
return (
<Button
+ aria-label={t.key ? `${t.label} (${t.key})` : t.label}
variant="ghost"
size="icon-md"
aria-pressed={props.tool === t.tool}
class={
props.tool === t.tool ? 'bg-accent/15 text-accent' : undefined
}
- label={t.key ? `${t.label} (${t.key})` : t.label}
tooltip={t.key ? `${t.label} · ${t.key}` : t.label}
data-testid={`ai-tool-${t.tool}`}
onClick={() => props.onTool(t.tool)}
diff --git a/apps/web/src/features/block-ai/views/artboards-panel.tsx b/apps/web/src/features/block-ai/views/artboards-panel.tsx
index 795d2a3eb9..f20558966e 100644
--- a/apps/web/src/features/block-ai/views/artboards-panel.tsx
+++ b/apps/web/src/features/block-ai/views/artboards-panel.tsx
@@ -57,15 +57,15 @@ export function ArtboardsPanel(props: { viewer: AiViewer; editor: AiEditor }) {
{viewer.artboards().length} artboards
</span>
<Button
+ aria-label="New artboard"
variant="ghost"
size="icon-sm"
- label="New artboard"
tooltip="New artboard"
data-testid="ai-artboard-new"
disabled={!editor.enabled()}
onClick={add}
>
- <Plus />
+ <Plus class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="min-h-0 flex-1 overflow-y-auto py-1">
diff --git a/apps/web/src/features/block-ai/views/layers-panel.tsx b/apps/web/src/features/block-ai/views/layers-panel.tsx
index 4c48005489..457ab31eca 100644
--- a/apps/web/src/features/block-ai/views/layers-panel.tsx
+++ b/apps/web/src/features/block-ai/views/layers-panel.tsx
@@ -182,26 +182,26 @@ export function LayersPanel(props: { viewer: AiViewer; editor: AiEditor }) {
{viewer.rows().filter((r) => r.depth === 0).length} layers
</span>
<Button
+ aria-label="New layer"
variant="ghost"
size="icon-sm"
- label="New layer"
tooltip="New layer"
data-testid="ai-layer-new"
disabled={!editor.enabled()}
onClick={() => fireAndForget(editor.newLayer(), 'ai-editor')}
>
- <Plus />
+ <Plus class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Delete selection"
variant="ghost"
size="icon-sm"
- label="Delete selection"
tooltip="Delete selection"
data-testid="ai-layer-delete"
disabled={!editor.enabled() || viewer.selected().length === 0}
onClick={deleteSelected}
>
- <Trash />
+ <Trash class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div
diff --git a/apps/web/src/features/block-call/component/CallRecording/CallRecordingBody.tsx b/apps/web/src/features/block-call/component/CallRecording/CallRecordingBody.tsx
index 8e99f16151..2638323136 100644
--- a/apps/web/src/features/block-call/component/CallRecording/CallRecordingBody.tsx
+++ b/apps/web/src/features/block-call/component/CallRecording/CallRecordingBody.tsx
@@ -151,6 +151,7 @@ export function CallRecordingBody(props: {
<SidePanel.HeaderActions>
<HeaderActionGroup label="Actions">
<AskMacroButton
+ grouped
entity={{
type: 'document',
id: props.callId,
diff --git a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
index fd5b924d90..aac7107481 100644
--- a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
+++ b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
@@ -34,7 +34,7 @@ import IconShared from '@icon/share.svg';
import DownloadSimple from '@icon/system/regular/download-simple.svg';
import PhoneCallIcon from '@icon/system/regular/phone-call.svg';
import type { CallRecord } from '@service-call/client';
-import { Button } from '@ui';
+import { ButtonGroup } from '@ui';
import { Show } from 'solid-js';
import { callRecordingDownloadSource } from '../../queries/recording-download';
import { useCallAgain } from '../use-call-again';
@@ -126,8 +126,9 @@ export function CallRecordingSplitHeader(props: { record: CallRecord }) {
name: callName(),
fileType: 'call',
}),
- buttonComponent: () => (
+ buttonComponent: (control) => (
<ChatWithAgentButton
+ grouped={control.grouped}
entity={{
type: 'document',
id: blockId,
@@ -178,16 +179,15 @@ export function CallRecordingSplitHeader(props: { record: CallRecord }) {
<div class="order-[900] flex items-center">
<HeaderActionGroup label="Call actions">
<HeaderIsland>
- <Button
- depth={2}
- variant="outline"
- size={isTouchDevice() ? 'icon-xs' : 'icon-md'}
+ <ButtonGroup.Button
+ variant="secondary"
+ size={isTouchDevice() ? 'icon-xs' : 'icon-sm'}
class={isTouchDevice() ? 'bg-surface' : undefined}
tooltip="Call Again"
onClick={callAgain}
>
<PhoneCallIcon class="size-4" />
- </Button>
+ </ButtonGroup.Button>
</HeaderIsland>
</HeaderActionGroup>
</div>
diff --git a/apps/web/src/features/block-call/views/CallDetailView.tsx b/apps/web/src/features/block-call/views/CallDetailView.tsx
index fbcbdebbbf..9dbf63f7a5 100644
--- a/apps/web/src/features/block-call/views/CallDetailView.tsx
+++ b/apps/web/src/features/block-call/views/CallDetailView.tsx
@@ -81,6 +81,7 @@ export function CallDetailActions(props: {
<Show when={!isMobile() && !props.record.isActive && canCallAgain()}>
<HeaderActionGroup label="Call actions">
<HeaderActionButton
+ grouped
label="Call Again"
icon={<PhoneCallIcon class="size-3.5 touch:size-4" />}
onClick={callAgain}
@@ -176,7 +177,7 @@ export function CallDetailContent(props: {
<div class="flex flex-col items-center gap-3 text-sm">
<span>This call recording could not be displayed.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(props.query.refetch(), 'call-detail')
diff --git a/apps/web/src/features/block-canvas/components/arrange-controls.tsx b/apps/web/src/features/block-canvas/components/arrange-controls.tsx
index f184f39e3e..c7ee1d3c6c 100644
--- a/apps/web/src/features/block-canvas/components/arrange-controls.tsx
+++ b/apps/web/src/features/block-canvas/components/arrange-controls.tsx
@@ -7,10 +7,9 @@ import AlignTop from '@icon/system/regular/align-top-simple.svg';
import ArrowsHorizontal from '@icon/system/regular/arrows-horizontal.svg';
import ArrowsVertical from '@icon/system/regular/arrows-vertical.svg';
import type { Alignment } from '@macro-inc/graphics';
-import { Button, ButtonGroup } from '@ui';
+import { ButtonGroup } from '@ui';
import { For, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
-import { INSPECTOR_CONTROL_FRAME_CLASS } from './inspector-control-frame';
export function CanvasAlignmentControls(props: {
count: number;
@@ -38,21 +37,23 @@ export function CanvasAlignmentControls(props: {
>
{(alignments) => (
<ButtonGroup
+ finish="raised"
+ variant="secondary"
size="icon-sm"
- class={`w-full data-[orientation=horizontal]:rounded-lg ${INSPECTOR_CONTROL_FRAME_CLASS}`}
+ class="w-full data-[orientation=horizontal]:rounded-lg"
>
<For each={alignments}>
{([alignment, icon]) => (
<>
- <Button
+ <ButtonGroup.Button
+ aria-label={`Align ${alignment}`}
+ tooltip={`Align ${alignment}`}
fullWidth
- class="bg-transparent"
- label={`Align ${alignment}`}
disabled={props.count < 2}
onClick={() => props.onAlign(alignment)}
>
<Dynamic component={icon} />
- </Button>
+ </ButtonGroup.Button>
</>
)}
</For>
@@ -62,23 +63,27 @@ export function CanvasAlignmentControls(props: {
</div>
<Show when={props.count >= 3}>
<ButtonGroup
+ finish="raised"
+ variant="secondary"
size="icon-sm"
- class={`data-[orientation=horizontal]:rounded-lg ${INSPECTOR_CONTROL_FRAME_CLASS}`}
+ class="data-[orientation=horizontal]:rounded-lg"
>
- <Button
- label="Distribute horizontal"
+ <ButtonGroup.Button
+ aria-label="Distribute horizontal"
+ tooltip="Distribute horizontal"
disabled={props.count < 3}
onClick={() => props.onDistribute('horizontal')}
>
- <ArrowsHorizontal />
- </Button>
- <Button
- label="Distribute vertical"
+ <ArrowsHorizontal class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Distribute vertical"
+ tooltip="Distribute vertical"
disabled={props.count < 3}
onClick={() => props.onDistribute('vertical')}
>
- <ArrowsVertical />
- </Button>
+ <ArrowsVertical class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
</ButtonGroup>
</Show>
</div>
diff --git a/apps/web/src/features/block-canvas/components/selection-layout-inspector.tsx b/apps/web/src/features/block-canvas/components/selection-layout-inspector.tsx
index 5f5cb7c4a1..af2f67f6ae 100644
--- a/apps/web/src/features/block-canvas/components/selection-layout-inspector.tsx
+++ b/apps/web/src/features/block-canvas/components/selection-layout-inspector.tsx
@@ -9,7 +9,6 @@ import { Show } from 'solid-js';
import type { LayoutField } from '../core/selection-layout';
import type { InspectorNumberScrub } from '../primitives/create-inspector-preview';
import { CanvasAlignmentControls } from './arrange-controls';
-import { INSPECTOR_CONTROL_FRAME_CLASS } from './inspector-control-frame';
import { InspectorNumberField } from './inspector-number-field';
import { InspectorSection } from './inspector-section';
@@ -69,33 +68,35 @@ export function SelectionLayoutInspector(props: {
onScrub={() => props.onScrub('rotation')}
/>
<ButtonGroup
+ finish="raised"
+ variant="secondary"
size="icon-sm"
- class={`w-full data-[orientation=horizontal]:rounded-lg ${INSPECTOR_CONTROL_FRAME_CLASS}`}
+ class="w-full data-[orientation=horizontal]:rounded-lg"
>
- <Button
+ <ButtonGroup.Button
+ aria-label="Rotate 90°"
+ tooltip="Rotate 90°"
fullWidth
- class="bg-transparent"
- label="Rotate 90°"
onClick={() => props.onTransform('rotate90')}
>
- <ArrowClockwise />
- </Button>
- <Button
+ <ArrowClockwise class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Flip horizontal"
+ tooltip="Flip horizontal"
fullWidth
- class="bg-transparent"
- label="Flip horizontal"
onClick={() => props.onTransform('flipX')}
>
- <ArrowsHorizontal />
- </Button>
- <Button
+ <ArrowsHorizontal class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Flip vertical"
+ tooltip="Flip vertical"
fullWidth
- class="bg-transparent"
- label="Flip vertical"
onClick={() => props.onTransform('flipY')}
>
- <ArrowsVertical />
- </Button>
+ <ArrowsVertical class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
</ButtonGroup>
</div>
</InspectorSection>
@@ -123,14 +124,21 @@ export function SelectionLayoutInspector(props: {
onScrub={() => props.onScrub('height')}
/>
<Button
+ variant="ghost"
+ aria-label="Lock aspect ratio"
+ tooltip="Lock aspect ratio"
size="icon-sm"
- label="Lock aspect ratio"
aria-pressed={props.lockAspectRatio}
class="aria-pressed:bg-active aria-pressed:text-ink"
onClick={() => props.onLockAspectRatio(!props.lockAspectRatio)}
>
- <Show when={props.lockAspectRatio} fallback={<LockOpen />}>
- <Lock />
+ <Show
+ when={props.lockAspectRatio}
+ fallback={
+ <LockOpen class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ >
+ <Lock class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
</div>
diff --git a/apps/web/src/features/block-canvas/views/asset-picker.tsx b/apps/web/src/features/block-canvas/views/asset-picker.tsx
index c0aa6ee648..de1439ffde 100644
--- a/apps/web/src/features/block-canvas/views/asset-picker.tsx
+++ b/apps/web/src/features/block-canvas/views/asset-picker.tsx
@@ -171,7 +171,7 @@ export function CanvasAssetPicker(props: {
</div>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
onClick={() => fileInput?.click()}
>
Add files
diff --git a/apps/web/src/features/block-canvas/views/canvas-toolbars.tsx b/apps/web/src/features/block-canvas/views/canvas-toolbars.tsx
index 3ac7a2428f..0d2d3e3aaa 100644
--- a/apps/web/src/features/block-canvas/views/canvas-toolbars.tsx
+++ b/apps/web/src/features/block-canvas/views/canvas-toolbars.tsx
@@ -60,10 +60,10 @@ export function CanvasDrawingToolbar(props: {
>
{(tool) => (
<Toolbar.Button
- label={`${tool.label} tool`}
- shortcut={tool.key}
+ aria-label={`${tool.label} tool`}
+ tooltip={{ content: `${tool.label} tool`, shortcut: tool.key }}
aria-pressed={props.tool === tool.id}
- variant={props.tool === tool.id ? 'cta' : 'ghost'}
+ variant={props.tool === tool.id ? 'primary' : 'ghost'}
onClick={() => props.onTool(tool.id)}
>
<Dynamic component={tool.icon} />
@@ -74,9 +74,12 @@ export function CanvasDrawingToolbar(props: {
<Show when={!props.readOnly && props.onAttach}>
<Toolbar.Divider />
<Toolbar.Button
- label="Attach"
- shortcut="i"
- tooltipDisabled={props.attachOpen}
+ aria-label="Attach"
+ tooltip={{
+ content: 'Attach',
+ disabled: props.attachOpen,
+ shortcut: 'i',
+ }}
aria-expanded={props.attachOpen ?? false}
aria-haspopup="menu"
onClick={(event) => {
@@ -102,28 +105,30 @@ export function CanvasHistoryControls(props: {
<Show when={hasHistory()}>
<div class="flex items-center" role="group" aria-label="Canvas history">
<Button
+ variant="ghost"
+ aria-label="Undo"
+ tooltip={{ content: 'Undo', hotkey: TOKENS.canvas.undo }}
size="icon-xs"
- label="Undo"
- hotkey={TOKENS.canvas.undo}
disabled={!props.state.session().canUndo}
onClick={() => {
props.state.editor.undo();
props.onFocusCanvas();
}}
>
- <Undo />
+ <Undo class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ variant="ghost"
+ aria-label="Redo"
+ tooltip={{ content: 'Redo', hotkey: TOKENS.canvas.redo }}
size="icon-xs"
- label="Redo"
- hotkey={TOKENS.canvas.redo}
disabled={!props.state.session().canRedo}
onClick={() => {
props.state.editor.redo();
props.onFocusCanvas();
}}
>
- <Redo />
+ <Redo class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
@@ -159,9 +164,10 @@ function CanvasZoomMenu(props: ParentProps<CanvasZoomProps>) {
return (
<Dropdown placement="bottom-end">
<Dropdown.Trigger
+ aria-label="Zoom options"
+ tooltip="Zoom options"
variant="ghost"
size="sm"
- label="Zoom options"
class="gap-1.5 tabular-nums"
>
<output aria-label="Zoom level">
@@ -220,13 +226,18 @@ export function CanvasZoomToolbar(props: CanvasZoomProps) {
<Toolbar size="icon-sm" aria-label="Canvas zoom">
<Toolbar.Group>
<Toolbar.Button
- label="Zoom out"
+ aria-label="Zoom out"
+ tooltip="Zoom out"
onClick={() => props.onZoom(1 / 1.2)}
>
<Minus />
</Toolbar.Button>
<CanvasZoomMenu {...props} />
- <Toolbar.Button label="Zoom in" onClick={() => props.onZoom(1.2)}>
+ <Toolbar.Button
+ aria-label="Zoom in"
+ tooltip="Zoom in"
+ onClick={() => props.onZoom(1.2)}
+ >
<Plus />
</Toolbar.Button>
</Toolbar.Group>
diff --git a/apps/web/src/features/block-canvas/views/canvas-view.tsx b/apps/web/src/features/block-canvas/views/canvas-view.tsx
index 8ca885be82..89740c0de3 100644
--- a/apps/web/src/features/block-canvas/views/canvas-view.tsx
+++ b/apps/web/src/features/block-canvas/views/canvas-view.tsx
@@ -431,6 +431,7 @@ export function CanvasView(props: {
<Show when={selectedImage()}>
<div class="flex flex-col gap-2 p-3">
<Button
+ variant="ghost"
size="sm"
disabled={imageActionsDisabled()}
onClick={() =>
@@ -440,10 +441,11 @@ export function CanvasView(props: {
)
}
>
- <Copy />
+ <Copy class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Copy image
</Button>
<Button
+ variant="ghost"
size="sm"
disabled={imageActionsDisabled()}
onClick={() =>
@@ -453,7 +455,7 @@ export function CanvasView(props: {
)
}
>
- <DownloadSimple />
+ <DownloadSimple class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Save image
</Button>
</div>
diff --git a/apps/web/src/features/block-code/component/CodeSearchPanel.tsx b/apps/web/src/features/block-code/component/CodeSearchPanel.tsx
index 16ac38796c..cfc90f60de 100644
--- a/apps/web/src/features/block-code/component/CodeSearchPanel.tsx
+++ b/apps/web/src/features/block-code/component/CodeSearchPanel.tsx
@@ -179,12 +179,18 @@ export function CodeSearchPanel(props: CodeSearchPanelProps) {
<div class="flex min-w-0 items-center gap-1">
<Show when={canReplace()}>
<Button
+ variant="ghost"
size="icon-sm"
tooltip={replaceOpen() ? 'Hide replace' : 'Show replace'}
onClick={() => setReplaceOpen(!replaceOpen())}
>
- <Show when={replaceOpen()} fallback={<CaretRight />}>
- <CaretDown />
+ <Show
+ when={replaceOpen()}
+ fallback={
+ <CaretRight class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ >
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
</Show>
@@ -229,23 +235,28 @@ export function CodeSearchPanel(props: CodeSearchPanelProps) {
</span>
<Button
+ variant="ghost"
size="icon-sm"
- tooltip="Previous match"
- shortcut="shift+enter"
+ tooltip={{ content: 'Previous match', shortcut: 'shift+enter' }}
onClick={() => findPrevious(props.view)}
>
- <CaretUp />
+ <CaretUp class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ variant="ghost"
size="icon-sm"
- tooltip="Next match"
- shortcut="enter"
+ tooltip={{ content: 'Next match', shortcut: 'enter' }}
onClick={() => findNext(props.view)}
>
- <CaretDown />
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
- <Button size="icon-sm" tooltip="Close find" onClick={close}>
- <X />
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ tooltip="Close find"
+ onClick={close}
+ >
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
@@ -267,18 +278,20 @@ export function CodeSearchPanel(props: CodeSearchPanelProps) {
/>
</Surface>
<Button
+ variant="ghost"
size="icon-sm"
tooltip="Replace"
onClick={() => replaceNext(props.view)}
>
- <ReplaceIcon />
+ <ReplaceIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ variant="ghost"
size="icon-sm"
tooltip="Replace all"
onClick={() => replaceAll(props.view)}
>
- <ReplaceAllIcon />
+ <ReplaceAllIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
diff --git a/apps/web/src/features/block-code/component/TopBar.tsx b/apps/web/src/features/block-code/component/TopBar.tsx
index 376d9a5909..ea95e50fd9 100644
--- a/apps/web/src/features/block-code/component/TopBar.tsx
+++ b/apps/web/src/features/block-code/component/TopBar.tsx
@@ -92,8 +92,12 @@ export const TopBar: Component<{
label: 'Ask Macro',
icon: ChatWithAgentIcon,
action: () => openChatWithAgent(chatEntity()),
- buttonComponent: () => (
- <ChatWithAgentButton entity={chatEntity()} label="Ask Macro" />
+ buttonComponent: (control) => (
+ <ChatWithAgentButton
+ grouped={control.grouped}
+ entity={chatEntity()}
+ label="Ask Macro"
+ />
),
},
{
diff --git a/apps/web/src/features/block-database/component/Block.tsx b/apps/web/src/features/block-database/component/Block.tsx
index fed22f389f..173ceea6b2 100644
--- a/apps/web/src/features/block-database/component/Block.tsx
+++ b/apps/web/src/features/block-database/component/Block.tsx
@@ -364,7 +364,7 @@ const Block: Component = () => {
: 'Please try opening it again.'}
</p>
<Button
- variant="outline"
+ variant="secondary"
onClick={() => {
reset();
fireAndForget(detailQuery.refetch(), 'database-view');
@@ -388,7 +388,7 @@ const Block: Component = () => {
It may be unavailable, or you may no longer have access.
</p>
<Button
- variant="outline"
+ variant="secondary"
onClick={() =>
fireAndForget(detailQuery.refetch(), 'database-view')
}
@@ -427,6 +427,7 @@ const Block: Component = () => {
{databaseOpMessage(failure(), 'this view')}
</span>
<Button
+ variant="primary"
size="sm"
onClick={() =>
creations.retry(shown().view.id)
@@ -435,6 +436,7 @@ const Block: Component = () => {
Retry
</Button>
<Button
+ variant="ghost"
size="sm"
onClick={() => {
creations.discard(shown().view.id);
diff --git a/apps/web/src/features/block-database/component/TopBar.tsx b/apps/web/src/features/block-database/component/TopBar.tsx
index 5159bab864..5deee678b8 100644
--- a/apps/web/src/features/block-database/component/TopBar.tsx
+++ b/apps/web/src/features/block-database/component/TopBar.tsx
@@ -16,7 +16,6 @@ import { toast } from '@core/component/Toast/Toast';
import { ShareTrigger } from '@core/component/TopBar/ShareButton';
import { useShareModal } from '@core/component/TopBar/shareModal';
import { enableForms } from '@core/constant/featureFlags';
-import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { useGetPermissions } from '@core/signal/permissions';
import { fireAndForget } from '@core/util/fireAndForget';
import type { DatabaseEntity } from '@entity';
@@ -24,7 +23,7 @@ import SparkleIcon from '@icon/system/regular/sparkle.svg';
import type { DatabaseDetail } from '@service-storage/generated/schemas/databaseDetail';
import type { TableDetail } from '@service-storage/generated/schemas/tableDetail';
import { getEntityGraphqlClient } from '@service-storage/graphql-soup';
-import { Button } from '@ui';
+import { ButtonGroup } from '@ui';
import type { ResultAsync } from 'neverthrow';
import { lazy, Show, Suspense } from 'solid-js';
import { DatabaseTitle } from '../../database/components/database-title';
@@ -183,9 +182,9 @@ export function TopBar(props: {
<Show when={props.detail}>
<SplitHeaderRight>
<HeaderActionGroup label="Database actions">
- <Button
+ <ButtonGroup.Button
variant="ghost"
- size={isTouchDevice() ? 'sm' : 'md'}
+ size="sm"
class="gap-1.5 touch:px-2 touch:text-xs"
disabled={props.openingChat}
aria-label="Database AI"
@@ -194,7 +193,7 @@ export function TopBar(props: {
>
<SparkleIcon class="size-4" />
<span>AI</span>
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
</SplitHeaderRight>
</Show>
diff --git a/apps/web/src/features/block-database/component/WebhooksDialog.tsx b/apps/web/src/features/block-database/component/WebhooksDialog.tsx
index f01b139116..d351ffef9d 100644
--- a/apps/web/src/features/block-database/component/WebhooksDialog.tsx
+++ b/apps/web/src/features/block-database/component/WebhooksDialog.tsx
@@ -112,8 +112,9 @@ export function WebhooksDialog(props: {
onFocus={(event) => event.currentTarget.select()}
/>
<CopyButton
- variant="outline"
- label="Copy webhook URL"
+ aria-label="Copy webhook URL"
+ tooltip="Copy webhook URL"
+ variant="secondary"
onClick={() => copy(url())}
>
<CopyIcon />
@@ -129,9 +130,10 @@ export function WebhooksDialog(props: {
<div class="flex items-center justify-between">
Example
<CopyButton
+ aria-label="Copy example"
+ tooltip="Copy example"
size="sm"
variant="ghost"
- label="Copy example"
onClick={() => copy(curl())}
>
<CopyIcon />
@@ -164,9 +166,10 @@ export function WebhooksDialog(props: {
{new Date(webhook.createdAt).toLocaleDateString()}
</span>
<Button
+ aria-label="Delete webhook"
+ tooltip="Delete webhook"
variant="ghost"
size="icon-sm"
- label="Delete webhook"
onClick={() =>
fireAndForget(remove(webhook), 'database-webhooks')
}
@@ -184,7 +187,7 @@ export function WebhooksDialog(props: {
</Button>
<Button
type="button"
- variant="accent"
+ variant="primary"
disabled={pending()}
onClick={() => fireAndForget(create(), 'database-webhooks')}
>
diff --git a/apps/web/src/features/block-database/views/database-page-actions.tsx b/apps/web/src/features/block-database/views/database-page-actions.tsx
index c3506a59ec..7461265dc8 100644
--- a/apps/web/src/features/block-database/views/database-page-actions.tsx
+++ b/apps/web/src/features/block-database/views/database-page-actions.tsx
@@ -161,10 +161,11 @@ export function DatabasePageActions(props: {
</Show>
<Dropdown>
<Dropdown.Trigger
+ aria-label="Database actions"
+ tooltip="Database actions"
ref={menuButton}
variant="ghost"
size="icon-sm"
- label="Database actions"
>
<DotsThreeIcon class="size-5" />
</Dropdown.Trigger>
diff --git a/apps/web/src/features/block-email/EmailThreadHostView.tsx b/apps/web/src/features/block-email/EmailThreadHostView.tsx
index 553a988dbd..e2c29664a2 100644
--- a/apps/web/src/features/block-email/EmailThreadHostView.tsx
+++ b/apps/web/src/features/block-email/EmailThreadHostView.tsx
@@ -12,6 +12,7 @@ import {
import { HeaderActionGroup } from '@components/app/HeaderActionGroup';
import { SidePanel } from '@components/app/side-panel';
import { useSplitLayout } from '@components/app/split-layout/layout';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { fireAndForget } from '@core/util/fireAndForget';
import { buildMentionMarkdownString } from '@macro-inc/lexical-core';
import type { Accessor, JSX } from 'solid-js';
@@ -97,16 +98,22 @@ function ThreadActions(props: { title: string; onCreateTask: () => void }) {
const context = useEmailThreadState();
return (
<SidePanel.HeaderActions>
- <HeaderActionGroup label="Actions">
+ <HeaderActionGroup label="Actions" size="md">
<Show when={context.thread()?.db_id}>
{(id) => (
<AskMacroButton
+ grouped
+ size={isTouchDevice() ? undefined : 'icon-md'}
entity={{ type: 'email', id: id(), name: props.title }}
/>
)}
</Show>
<Show when={context.thread()?.db_id}>
- <EmailTaskButton onClick={props.onCreateTask} />
+ <EmailTaskButton
+ grouped
+ size={isTouchDevice() ? undefined : 'icon-md'}
+ onClick={props.onCreateTask}
+ />
</Show>
</HeaderActionGroup>
</SidePanel.HeaderActions>
diff --git a/apps/web/src/features/block-email/component/EmailTaskButton.tsx b/apps/web/src/features/block-email/component/EmailTaskButton.tsx
index 91f65c4960..83298ae1b8 100644
--- a/apps/web/src/features/block-email/component/EmailTaskButton.tsx
+++ b/apps/web/src/features/block-email/component/EmailTaskButton.tsx
@@ -1,12 +1,22 @@
import { HeaderActionButton } from '@components/app/HeaderActionButton';
import TaskIcon from '@icon/system/regular/list-checks.svg';
-export function EmailTaskButton(props: { onClick: () => void }) {
+import type { ButtonSize } from '@ui';
+
+export function EmailTaskButton(props: {
+ onClick: () => void;
+ grouped?: boolean;
+ size?: ButtonSize;
+}) {
return (
<HeaderActionButton
+ grouped={props.grouped}
+ size={props.size}
tooltip="Create task"
label="Create task"
onClick={props.onClick}
- icon={<TaskIcon />}
+ icon={
+ <TaskIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
/>
);
}
diff --git a/apps/web/src/features/block-email/component/EmailThreadControls.tsx b/apps/web/src/features/block-email/component/EmailThreadControls.tsx
index 09328cb07b..1fdd7d3548 100644
--- a/apps/web/src/features/block-email/component/EmailThreadControls.tsx
+++ b/apps/web/src/features/block-email/component/EmailThreadControls.tsx
@@ -4,11 +4,12 @@ import CheckBoldIcon from '@icon/system/bold/check-bold.svg?component-solid';
import CheckIcon from '@icon/system/regular/check.svg';
import EnvelopeSimpleIcon from '@icon/system/regular/envelope-simple.svg';
import EnvelopeSimpleOpenIcon from '@icon/system/regular/envelope-simple-open.svg';
-import { Button } from '@ui';
+import { Button, ButtonGroup } from '@ui';
import { type JSX, Show } from 'solid-js';
export function EmailThreadControls(props: {
reminder?: JSX.Element;
+ grouped?: boolean;
isOwnThread: boolean;
isDone: boolean;
isUnread: boolean;
@@ -16,6 +17,7 @@ export function EmailThreadControls(props: {
onToggleDone: () => void;
onToggleUnread: () => void;
}) {
+ const Control = props.grouped ? ButtonGroup.Button : Button;
return (
<>
{props.reminder}
@@ -24,14 +26,16 @@ export function EmailThreadControls(props: {
starts as Mark as unread; marking unread flips it to a bold
accent closed envelope that re-marks the thread read. */}
<Show when={props.isOwnThread}>
- <Button
- size="icon-md"
- label={props.isUnread ? 'Mark as read' : 'Mark as unread'}
- hotkey={
- props.isUnread
+ <Control
+ variant="ghost"
+ aria-label={props.isUnread ? 'Mark as read' : 'Mark as unread'}
+ tooltip={{
+ content: props.isUnread ? 'Mark as read' : 'Mark as unread',
+ hotkey: props.isUnread
? TOKENS.entity.action.markRead
- : TOKENS.entity.action.markUnread
- }
+ : TOKENS.entity.action.markUnread,
+ }}
+ size="icon-md"
onClick={props.onToggleUnread}
// Keep focus (and the hotkey scope cmd-K reads) in the thread
// content: focusing the header would hide its commands.
@@ -43,17 +47,19 @@ export function EmailThreadControls(props: {
>
<EnvelopeSimpleIcon class="size-4 text-accent" />
</Show>
- </Button>
+ </Control>
</Show>
<Show when={props.isOwnThread && props.canToggleDone}>
- <Button
- size="icon-md"
- label={props.isDone ? 'Mark as not done' : 'Mark done'}
- hotkey={
- props.isDone
+ <Control
+ variant="ghost"
+ aria-label={props.isDone ? 'Mark as not done' : 'Mark done'}
+ tooltip={{
+ content: props.isDone ? 'Mark as not done' : 'Mark done',
+ hotkey: props.isDone
? TOKENS.entity.action.markNotDone
- : TOKENS.entity.action.markDone
- }
+ : TOKENS.entity.action.markDone,
+ }}
+ size="icon-md"
onClick={props.onToggleDone}
// Same focus-preservation as the read-state toggle above.
onMouseDown={(e) => e.preventDefault()}
@@ -61,7 +67,7 @@ export function EmailThreadControls(props: {
<Show when={props.isDone} fallback={<CheckIcon class="size-4" />}>
<CheckBoldIcon class="size-4 text-accent" />
</Show>
- </Button>
+ </Control>
</Show>
</Show>
</>
diff --git a/apps/web/src/features/block-email/component/EmailThreadHeaderActions.tsx b/apps/web/src/features/block-email/component/EmailThreadHeaderActions.tsx
index 9a8e5bb3e7..479fb2dfe9 100644
--- a/apps/web/src/features/block-email/component/EmailThreadHeaderActions.tsx
+++ b/apps/web/src/features/block-email/component/EmailThreadHeaderActions.tsx
@@ -12,13 +12,17 @@ export function EmailThreadControlGroups(props: {
}) {
return (
<div class="flex items-center gap-2 touch:hidden">
- <HeaderActionGroup label="Email actions">
- <EmailThreadControls {...props.controls} />
+ <HeaderActionGroup label="Email actions" size="md">
+ <EmailThreadControls grouped {...props.controls} />
</HeaderActionGroup>
<Show when={props.navigation}>
{(navigation) => (
- <HeaderActionGroup label="Item navigation">
- <ListNavigationButtons navigation={navigation()} class="gap-0" />
+ <HeaderActionGroup label="Item navigation" size="md">
+ <ListNavigationButtons
+ navigation={navigation()}
+ size="md"
+ class="gap-0"
+ />
</HeaderActionGroup>
)}
</Show>
@@ -32,30 +36,17 @@ export function EmailThreadHeaderActions(props: {
share?: JSX.Element;
}) {
return (
- <div class="ml-auto flex shrink-0 items-center gap-2 touch:gap-1 @max-[900px]/split-header:[&_[data-header-action]]:w-8 @max-[900px]/split-header:[&_[data-header-action]]:p-0 @max-[900px]/split-header:[&_[data-header-action-label]]:hidden">
+ <div class="ml-auto flex shrink-0 items-center gap-2 touch:gap-1">
{props.controls}
- <Show
- when={!isTouchDevice()}
- fallback={<SidePanel.HeaderActionsOutlet />}
- >
- <HeaderActionGroup
- label="Actions"
- class="has-[[data-side-panel-header-actions]:empty]:hidden [&_[data-header-action]]:size-8 [&_[data-header-action]]:p-0 [&_[data-header-action-label]]:hidden"
- >
- <SidePanel.HeaderActionsOutlet />
- </HeaderActionGroup>
- </Show>
+ <SidePanel.HeaderActionsOutlet />
<Show when={props.share}>
<Show when={!isTouchDevice()} fallback={props.share}>
- <HeaderActionGroup
- label="Sharing"
- class="[&_[data-header-action]]:w-auto! [&_[data-header-action]]:px-3! [&_[data-header-action-label]]:inline!"
- >
+ <HeaderActionGroup label="Sharing" size="md">
{props.share}
</HeaderActionGroup>
</Show>
</Show>
- <SidePanel.Toggle />
+ <SidePanel.Toggle size="md" />
</div>
);
}
diff --git a/apps/web/src/features/block-email/component/TopBar.tsx b/apps/web/src/features/block-email/component/TopBar.tsx
index 295f00567a..0ec5c08492 100644
--- a/apps/web/src/features/block-email/component/TopBar.tsx
+++ b/apps/web/src/features/block-email/component/TopBar.tsx
@@ -72,6 +72,7 @@ export function TopBar(props: EmailThreadToolsOptions) {
share={
<Show when={ENABLE_EMAIL_SHARING}>
<ShareTrigger
+ size="md"
onClick={openShare}
id={props.id}
blockType="email"
diff --git a/apps/web/src/features/block-email/component/useEmailThreadTools.tsx b/apps/web/src/features/block-email/component/useEmailThreadTools.tsx
index 35ec98bc79..b2c46b03c7 100644
--- a/apps/web/src/features/block-email/component/useEmailThreadTools.tsx
+++ b/apps/web/src/features/block-email/component/useEmailThreadTools.tsx
@@ -27,6 +27,7 @@ import { ENABLE_EMAIL_SHARING } from '@core/constant/featureFlags';
import { useUserId } from '@core/context/user';
import { TOKENS } from '@core/hotkey/tokens';
import { getActiveCommandByToken, runCommand } from '@core/hotkey/utils';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { fireAndForget } from '@core/util/fireAndForget';
import { buildEntityData } from '@entity';
import IconShared from '@icon/share.svg';
@@ -324,10 +325,11 @@ export function useEmailThreadTools(props: EmailThreadToolsOptions) {
);
},
condition: () => !!emailCtx.thread()?.db_id,
- buttonComponent: () => {
+ buttonComponent: (control) => {
const id = emailCtx.thread()?.db_id;
return id ? (
<ChatWithAgentButton
+ grouped={control.grouped}
entity={{ type: 'email', id, name: props.title }}
/>
) : null;
@@ -348,6 +350,7 @@ export function useEmailThreadTools(props: EmailThreadToolsOptions) {
const entity = emailEntity();
return entity && isOwnThread() ? (
<EmailReminderStatus
+ grouped={!isTouchDevice()}
entity={entity}
onSaved={async () => {
const navigation = props.listNavigation;
diff --git a/apps/web/src/features/block-fig/components/libraries-dialog.tsx b/apps/web/src/features/block-fig/components/libraries-dialog.tsx
index 43465467ab..219b61ca95 100644
--- a/apps/web/src/features/block-fig/components/libraries-dialog.tsx
+++ b/apps/web/src/features/block-fig/components/libraries-dialog.tsx
@@ -82,13 +82,14 @@ export function LibrariesDialog(props: {
Libraries
</Dialog.Title>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-sm"
- label="Close"
tabIndex={-1}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</div>
<section class="flex flex-col gap-2">
@@ -112,7 +113,7 @@ export function LibrariesDialog(props: {
</div>
<Show when={props.canEdit}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="fig-library-publish"
disabled={
diff --git a/apps/web/src/features/block-fig/components/library-updates.tsx b/apps/web/src/features/block-fig/components/library-updates.tsx
index d9ea1ff640..8984bc4288 100644
--- a/apps/web/src/features/block-fig/components/library-updates.tsx
+++ b/apps/web/src/features/block-fig/components/library-updates.tsx
@@ -39,7 +39,7 @@ export function LibraryUpdatesNotice(props: {
</div>
<p class="text-ink-muted">{updateSummary(props.updates)}</p>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="self-start"
data-testid="fig-library-updates-review"
@@ -83,13 +83,14 @@ export function LibraryUpdatesDialog(props: {
Library updates
</Dialog.Title>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-sm"
- label="Close"
tabIndex={-1}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</div>
<For each={libraries()}>
@@ -152,7 +153,7 @@ export function LibraryUpdatesDialog(props: {
<Show when={props.canEdit}>
<div class="flex justify-end">
<Button
- variant="cta"
+ variant="primary"
size="sm"
data-testid="fig-library-update-all"
disabled={props.updating || props.updates.length === 0}
diff --git a/apps/web/src/features/block-fig/components/publish-dialog.tsx b/apps/web/src/features/block-fig/components/publish-dialog.tsx
index 059f3d7e35..0c102f3fb7 100644
--- a/apps/web/src/features/block-fig/components/publish-dialog.tsx
+++ b/apps/web/src/features/block-fig/components/publish-dialog.tsx
@@ -64,13 +64,14 @@ export function PublishDialog(props: {
Publish library
</Dialog.Title>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-sm"
- label="Close"
tabIndex={-1}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</div>
<textarea
@@ -124,7 +125,7 @@ export function PublishDialog(props: {
Cancel
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
data-testid="fig-publish-confirm"
disabled={props.publishing || props.status.changes.length === 0}
diff --git a/apps/web/src/features/block-fig/components/review-buttons.tsx b/apps/web/src/features/block-fig/components/review-buttons.tsx
index 3106335f16..b0b0b3be93 100644
--- a/apps/web/src/features/block-fig/components/review-buttons.tsx
+++ b/apps/web/src/features/block-fig/components/review-buttons.tsx
@@ -17,6 +17,7 @@ export function CommentButton(props: {
{(c) => (
<div class="relative">
<Button
+ aria-label="Comment (C)"
variant="ghost"
size="icon-md"
aria-pressed={c().active}
@@ -25,12 +26,11 @@ export function CommentButton(props: {
? 'rounded-lg bg-accent text-accent-contrast'
: 'rounded-lg'
}
- label="Comment (C)"
tooltip="Comment · C"
data-testid="fig-tool-comment"
onClick={() => c().onToggle()}
>
- <ChatCircle />
+ <ChatCircle class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Show when={c().unread > 0}>
<span
@@ -49,14 +49,14 @@ export function CommentButton(props: {
export function PresentButton(props: { mac: boolean; onPresent: () => void }) {
return (
<Button
+ aria-label="Present"
variant="ghost"
size="icon-md"
- label="Present"
tooltip={`Present · ${props.mac ? '⌥⌘↵' : 'Ctrl+Alt+Enter'}`}
data-testid="fig-present-button"
onClick={() => props.onPresent()}
>
- <Play />
+ <Play class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
diff --git a/apps/web/src/features/block-fig/components/session-notice.tsx b/apps/web/src/features/block-fig/components/session-notice.tsx
index 85c5f41d40..21cc092e22 100644
--- a/apps/web/src/features/block-fig/components/session-notice.tsx
+++ b/apps/web/src/features/block-fig/components/session-notice.tsx
@@ -21,7 +21,7 @@ export function SessionNotice(props: {
<WarningCircle class="size-3.5 shrink-0 text-warning" />
<span class="min-w-0 flex-1">{props.message}</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="fig-session-action"
onClick={() => props.onAction()}
diff --git a/apps/web/src/features/block-fig/fig-block.tsx b/apps/web/src/features/block-fig/fig-block.tsx
index b7f524bab1..5ed3618bad 100644
--- a/apps/web/src/features/block-fig/fig-block.tsx
+++ b/apps/web/src/features/block-fig/fig-block.tsx
@@ -329,8 +329,8 @@ function DownloadOnly(props: { onDownload: () => void }): JSX.Element {
return (
<div class="flex size-full flex-col items-center justify-center gap-3 p-6 text-ink-muted text-sm">
Figma files can't be previewed here yet.
- <Button variant="outline" size="sm" onClick={props.onDownload}>
- <DownloadSimple />
+ <Button variant="secondary" size="sm" onClick={props.onDownload}>
+ <DownloadSimple class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Download
</Button>
</div>
diff --git a/apps/web/src/features/block-form/components/builder/booking-card.tsx b/apps/web/src/features/block-form/components/builder/booking-card.tsx
index b6614a8ddd..90972018c8 100644
--- a/apps/web/src/features/block-form/components/builder/booking-card.tsx
+++ b/apps/web/src/features/block-form/components/builder/booking-card.tsx
@@ -33,7 +33,7 @@ export function BookingLinkMenu(props: {
trigger: JSX.Element;
triggerLabel?: string;
triggerClass?: string;
- triggerVariant: 'outline' | 'ghost';
+ triggerVariant: 'outline' | 'secondary' | 'ghost';
disabled?: boolean;
onChoose: (target: FormBookingTarget) => void;
onCreate: () => void;
diff --git a/apps/web/src/features/block-form/components/builder/booking-link-dialog.tsx b/apps/web/src/features/block-form/components/builder/booking-link-dialog.tsx
index 66f7ec29e6..0c099fb457 100644
--- a/apps/web/src/features/block-form/components/builder/booking-link-dialog.tsx
+++ b/apps/web/src/features/block-form/components/builder/booking-link-dialog.tsx
@@ -72,7 +72,7 @@ export function BookingLinkDialog(props: {
</Match>
</Switch>
</div>
- <Button variant="outline" onClick={props.onCreate}>
+ <Button variant="secondary" onClick={props.onCreate}>
<ArrowSquareOut class="size-4" />
Create a booking link
</Button>
diff --git a/apps/web/src/features/block-form/components/builder/builder-chrome.tsx b/apps/web/src/features/block-form/components/builder/builder-chrome.tsx
index 97894a55dc..eb4cf05568 100644
--- a/apps/web/src/features/block-form/components/builder/builder-chrome.tsx
+++ b/apps/web/src/features/block-form/components/builder/builder-chrome.tsx
@@ -147,7 +147,7 @@ export function HiddenColumns(props: {
</span>
<span class="text-xs text-ink-muted">{column.label}</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() => props.onAdd(column.id)}
>
@@ -184,7 +184,7 @@ export function ConversionNotice(props: {
answer that fits, and the current column keeps all of them.
</p>
<div class="flex gap-2">
- <Button size="sm" variant="strong" onClick={props.onConvert}>
+ <Button size="sm" variant="secondary" onClick={props.onConvert}>
Convert into a new question
</Button>
<Button size="sm" variant="ghost" onClick={props.onDismiss}>
diff --git a/apps/web/src/features/block-form/components/builder/question-footer.tsx b/apps/web/src/features/block-form/components/builder/question-footer.tsx
index a7c64bf057..48ac1b48f6 100644
--- a/apps/web/src/features/block-form/components/builder/question-footer.tsx
+++ b/apps/web/src/features/block-form/components/builder/question-footer.tsx
@@ -28,20 +28,22 @@ export function QuestionFooter(props: {
return (
<div class="mt-1 flex items-center gap-1 border-t border-edge-divider pt-2">
<Button
+ aria-label="Duplicate question"
+ tooltip="Duplicate question"
variant="ghost"
size="icon-sm"
- label="Duplicate question"
onClick={props.onDuplicate}
>
- <Copy />
+ <Copy class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Remove from form (keeps the column)"
+ tooltip="Remove from form (keeps the column)"
variant="ghost"
size="icon-sm"
- label="Remove from form (keeps the column)"
onClick={props.onRemove}
>
- <Trash />
+ <Trash class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Dropdown>
<Dropdown.Trigger
@@ -49,7 +51,7 @@ export function QuestionFooter(props: {
size="icon-sm"
aria-label="More question actions"
>
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content class="w-60">
<Dropdown.Group>
diff --git a/apps/web/src/features/block-form/components/builder/section-card.tsx b/apps/web/src/features/block-form/components/builder/section-card.tsx
index 1cf36f4cd6..9d185eedcf 100644
--- a/apps/web/src/features/block-form/components/builder/section-card.tsx
+++ b/apps/web/src/features/block-form/components/builder/section-card.tsx
@@ -21,7 +21,7 @@ export function SectionMenu(props: {
return (
<Dropdown>
<Dropdown.Trigger variant="ghost" size="icon-sm" aria-label={props.label}>
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content class="w-52">
<Dropdown.Item disabled={!props.canMoveUp} onSelect={props.onMoveUp}>
@@ -209,7 +209,7 @@ export function GateCard(props: {
? 'A rule checks a question that is no longer before this gate. Responses are refused until it is fixed.'
: `${props.brokenRules} rules check questions that are no longer before this gate. Responses are refused until they are fixed.`}
</span>
- <Button variant="outline" size="sm" onClick={props.onRepair}>
+ <Button variant="secondary" size="sm" onClick={props.onRepair}>
Remove broken rules
</Button>
</div>
@@ -241,7 +241,7 @@ export function GateCard(props: {
when={props.editingRules}
fallback={
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="self-start"
onClick={props.onEditRules}
diff --git a/apps/web/src/features/block-form/components/builder/type-menu.tsx b/apps/web/src/features/block-form/components/builder/type-menu.tsx
index 7c9a488363..cf00698c25 100644
--- a/apps/web/src/features/block-form/components/builder/type-menu.tsx
+++ b/apps/web/src/features/block-form/components/builder/type-menu.tsx
@@ -93,7 +93,7 @@ export function TypeMenu(props: {
return (
<Dropdown>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
size="sm"
disabled={props.disabled}
aria-label={`Question type: ${props.label}`}
@@ -132,7 +132,7 @@ export function AddQuestionMenu(props: {
return (
<Dropdown>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
size="md"
class={`w-full justify-start gap-2 ${props.triggerClass ?? ''}`}
ref={props.triggerRef}
diff --git a/apps/web/src/features/block-form/components/poll/poll-composer.tsx b/apps/web/src/features/block-form/components/poll/poll-composer.tsx
index 19db4187af..e664ad897e 100644
--- a/apps/web/src/features/block-form/components/poll/poll-composer.tsx
+++ b/apps/web/src/features/block-form/components/poll/poll-composer.tsx
@@ -91,10 +91,11 @@ export function PollComposer(props: {
/>
<Show when={options().length > 2}>
<Button
+ aria-label={`Remove option ${index + 1}`}
+ tooltip={`Remove option ${index + 1}`}
type="button"
variant="ghost"
size="icon-sm"
- label={`Remove option ${index + 1}`}
onClick={() => {
setOptions((current) =>
current.filter((_, at) => at !== index)
@@ -102,7 +103,7 @@ export function PollComposer(props: {
focusOption(Math.min(index, options().length - 1));
}}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</li>
@@ -120,7 +121,7 @@ export function PollComposer(props: {
</Show>
<Button
type="button"
- variant="outline"
+ variant="secondary"
class="h-10 w-full justify-start border-dashed text-ink-muted"
disabled={options().length >= 20}
onClick={() => {
@@ -168,7 +169,7 @@ export function PollComposer(props: {
</Button>
<Button
type="submit"
- variant="cta"
+ variant="primary"
size="sm"
disabled={!ready() || props.pending}
aria-busy={props.pending}
diff --git a/apps/web/src/features/block-form/components/respond/respond-screens.tsx b/apps/web/src/features/block-form/components/respond/respond-screens.tsx
index 7c93cc1518..e5e33f811e 100644
--- a/apps/web/src/features/block-form/components/respond/respond-screens.tsx
+++ b/apps/web/src/features/block-form/components/respond/respond-screens.tsx
@@ -126,7 +126,7 @@ export function StopScreen(props: {
: 'Nothing you entered was submitted.'}
</p>
<div class="flex flex-wrap gap-2 pt-1">
- <Button variant="strong" size="sm" onClick={props.onCheckAnswers}>
+ <Button variant="secondary" size="sm" onClick={props.onCheckAnswers}>
Check my answers
</Button>
<Show when={props.onMessageOwner}>
@@ -273,7 +273,7 @@ export function Confirmation(props: {
</Show>
{props.notice}
<Show when={props.canEdit}>
- <Button variant="strong" size="sm" onClick={props.onEdit}>
+ <Button variant="secondary" size="sm" onClick={props.onEdit}>
Edit my response
</Button>
</Show>
diff --git a/apps/web/src/features/block-form/components/share/audience-panel.tsx b/apps/web/src/features/block-form/components/share/audience-panel.tsx
index 6aa237f430..530b2391f4 100644
--- a/apps/web/src/features/block-form/components/share/audience-panel.tsx
+++ b/apps/web/src/features/block-form/components/share/audience-panel.tsx
@@ -47,7 +47,7 @@ export function AudiencePanel(props: {
<p class="text-xs text-ink-muted">Only the owner can change this.</p>
</Show>
<CopyButton
- variant="outline"
+ variant="secondary"
class="self-start"
onClick={async () => {
try {
diff --git a/apps/web/src/features/block-form/form-block.tsx b/apps/web/src/features/block-form/form-block.tsx
index e154d33877..5b69b43c03 100644
--- a/apps/web/src/features/block-form/form-block.tsx
+++ b/apps/web/src/features/block-form/form-block.tsx
@@ -143,7 +143,9 @@ function FormBlockContent(props: {
fallback={
<HeaderActionButton
label="Publish"
- icon={<PaperPlaneTilt />}
+ icon={
+ <PaperPlaneTilt class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
onClick={openShare}
/>
}
@@ -204,6 +206,7 @@ function FormBlockContent(props: {
>
<HeaderActionGroup label="Form actions">
<HeaderActionButton
+ grouped
label="Preview"
icon={<Eye class="size-3.5" />}
disabled={preview.opening()}
diff --git a/apps/web/src/features/block-form/form-link-sharing.tsx b/apps/web/src/features/block-form/form-link-sharing.tsx
index ee9c7a93a8..21810b1344 100644
--- a/apps/web/src/features/block-form/form-link-sharing.tsx
+++ b/apps/web/src/features/block-form/form-link-sharing.tsx
@@ -30,7 +30,7 @@ export function FormLinkSharing(props: {
<Show when={props.detail.access !== 'view'}>
<div class="flex justify-end border-t border-edge-muted pt-3">
<CopyButton
- variant="outline"
+ variant="secondary"
onClick={() => copy(props.editorLink, { silent: true })}
>
<Copy class="size-4" />
diff --git a/apps/web/src/features/block-form/form-respond-page.tsx b/apps/web/src/features/block-form/form-respond-page.tsx
index c23999cb47..dd60caa1da 100644
--- a/apps/web/src/features/block-form/form-respond-page.tsx
+++ b/apps/web/src/features/block-form/form-respond-page.tsx
@@ -110,7 +110,7 @@ function FormRespondContent(props: { formId: string }) {
Preview · responses won’t be saved
</span>
<Button
- variant="outline"
+ variant="secondary"
onClick={() =>
navigate(
`/form/${encodeURIComponent(props.formId)}`
diff --git a/apps/web/src/features/block-form/views/builder-view.tsx b/apps/web/src/features/block-form/views/builder-view.tsx
index f6b912f704..e2a2ec5cac 100644
--- a/apps/web/src/features/block-form/views/builder-view.tsx
+++ b/apps/web/src/features/block-form/views/builder-view.tsx
@@ -510,7 +510,7 @@ function BuilderCanvas(
trigger: JSX.Element;
triggerLabel?: string;
triggerClass: string;
- triggerVariant: 'outline' | 'ghost';
+ triggerVariant: 'outline' | 'secondary' | 'ghost';
selected?: FormBookingTarget;
onChoose: (target: FormBookingTarget) => void;
}) => (
@@ -569,7 +569,7 @@ function BuilderCanvas(
databaseLink={
<>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class={badgeTriggerClasses({
variant: 'outline',
@@ -740,7 +740,7 @@ function BuilderCanvas(
<InsertionPoint betweenSections>
<Dropdown>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
size="sm"
class="h-6 shrink-0 bg-surface px-2"
aria-label={`Insert before ${sectionName(layout(), sectionId)}`}
@@ -877,7 +877,7 @@ function BuilderCanvas(
trigger: 'Change',
triggerLabel: 'Change booking link',
triggerClass: 'shrink-0',
- triggerVariant: 'outline',
+ triggerVariant: 'secondary',
selected:
current().bookingTarget ?? undefined,
onChoose: (target) =>
@@ -1025,7 +1025,7 @@ function BuilderCanvas(
aria-label="Add to form"
>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="h-14 flex-1 justify-start gap-2 rounded-xl px-5"
disabled={props.detail.tableGone}
@@ -1035,7 +1035,7 @@ function BuilderCanvas(
Add section
</Button>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="h-14 flex-1 justify-start gap-2 rounded-xl px-5"
disabled={props.detail.tableGone}
@@ -1046,7 +1046,7 @@ function BuilderCanvas(
</Button>
<Show when={booking() || context.booking.available()}>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="h-14 flex-1 justify-start gap-2 rounded-xl px-5"
disabled={props.detail.tableGone}
@@ -1158,7 +1158,7 @@ function BuilderCanvas(
<For each={relationTables()}>
{(relation) => (
<Button
- variant="outline"
+ variant="secondary"
class="justify-start"
onClick={() => {
const current = pending();
diff --git a/apps/web/src/features/block-form/views/form-card-view.tsx b/apps/web/src/features/block-form/views/form-card-view.tsx
index 6579ef60d0..2b2b4d7997 100644
--- a/apps/web/src/features/block-form/views/form-card-view.tsx
+++ b/apps/web/src/features/block-form/views/form-card-view.tsx
@@ -129,7 +129,7 @@ export function FormCardView(props: {
<Show
when={poll() || !props.narrow}
fallback={
- <Button variant="outline" size="sm" onClick={props.onOpen}>
+ <Button variant="secondary" size="sm" onClick={props.onOpen}>
Open the form to respond
</Button>
}
diff --git a/apps/web/src/features/block-form/views/form-page-view.tsx b/apps/web/src/features/block-form/views/form-page-view.tsx
index 198b1ff84b..b7674c6fc5 100644
--- a/apps/web/src/features/block-form/views/form-page-view.tsx
+++ b/apps/web/src/features/block-form/views/form-page-view.tsx
@@ -53,7 +53,7 @@ export function FormLoadFailureView(props: {
</Match>
<Match when={props.failure.kind === 'failed'}>
<p class="font-medium text-ink">This form couldn’t be opened</p>
- <Button variant="outline" onClick={props.onRetry}>
+ <Button variant="secondary" onClick={props.onRetry}>
Try again
</Button>
</Match>
diff --git a/apps/web/src/features/block-form/views/respond-view.tsx b/apps/web/src/features/block-form/views/respond-view.tsx
index 29fc508775..14ef073b66 100644
--- a/apps/web/src/features/block-form/views/respond-view.tsx
+++ b/apps/web/src/features/block-form/views/respond-view.tsx
@@ -209,7 +209,7 @@ export function RespondView(props: {
}
footer={
<Button
- variant="outline"
+ variant="secondary"
class="self-start"
onClick={() => {
respond.restartPreview();
@@ -236,7 +236,7 @@ export function RespondView(props: {
/>
<Show when={step().preview}>
<Button
- variant="outline"
+ variant="secondary"
class="self-start"
onClick={() => {
respond.restartPreview();
@@ -283,7 +283,7 @@ export function RespondView(props: {
Your saved response couldn’t be loaded.
</p>
<Button
- variant="outline"
+ variant="secondary"
class="self-start"
disabled={unavailable().retrying}
aria-busy={unavailable().retrying}
@@ -308,7 +308,7 @@ export function RespondView(props: {
Nothing you entered was submitted. Try again in a moment.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="mt-2 self-start"
onClick={() => fireAndForget(retry(), 'form-respond')}
@@ -385,7 +385,7 @@ export function RespondView(props: {
<>
<Show when={confirmation().booking}>
<Button
- variant="cta"
+ variant="primary"
class="self-start"
onClick={() => {
respond.openBooking();
@@ -611,7 +611,7 @@ export function RespondView(props: {
</Show>
<Button
type="submit"
- variant="cta"
+ variant="primary"
size="md"
disabled={answering().submitting || answering().uploading}
aria-busy={answering().submitting}
diff --git a/apps/web/src/features/block-form/views/share-tab-view.tsx b/apps/web/src/features/block-form/views/share-tab-view.tsx
index 78c5e37e4b..4e2132ead2 100644
--- a/apps/web/src/features/block-form/views/share-tab-view.tsx
+++ b/apps/web/src/features/block-form/views/share-tab-view.tsx
@@ -211,7 +211,7 @@ export function ShareTabView(props: {
Posting the form in a channel lets its members respond.
</span>
</div>
- <Button variant="outline" size="sm" onClick={props.onOpenShare}>
+ <Button variant="secondary" size="sm" onClick={props.onOpenShare}>
Manage access
</Button>
</div>
diff --git a/apps/web/src/features/block-image/component/TopBar.tsx b/apps/web/src/features/block-image/component/TopBar.tsx
index 5d7dc47188..1d6feea927 100644
--- a/apps/web/src/features/block-image/component/TopBar.tsx
+++ b/apps/web/src/features/block-image/component/TopBar.tsx
@@ -78,8 +78,12 @@ export function TopBar() {
label: 'Ask Macro',
icon: ChatWithAgentIcon,
action: () => openChatWithAgent(chatEntity()),
- buttonComponent: () => (
- <ChatWithAgentButton entity={chatEntity()} label="Ask Macro" />
+ buttonComponent: (control) => (
+ <ChatWithAgentButton
+ grouped={control.grouped}
+ entity={chatEntity()}
+ label="Ask Macro"
+ />
),
},
{
diff --git a/apps/web/src/features/block-md/comments/CommentThreadDrawer.tsx b/apps/web/src/features/block-md/comments/CommentThreadDrawer.tsx
index 11e6e2122f..3cb26fc588 100644
--- a/apps/web/src/features/block-md/comments/CommentThreadDrawer.tsx
+++ b/apps/web/src/features/block-md/comments/CommentThreadDrawer.tsx
@@ -230,7 +230,6 @@ export function CommentThreadDrawer() {
<div class="flex shrink-0 items-center justify-center gap-2 pb-1">
<Button
size="icon-sm"
- depth={3}
variant="ghost"
aria-label="Previous comment thread"
disabled={pagerIndex() <= 0}
@@ -243,7 +242,6 @@ export function CommentThreadDrawer() {
</span>
<Button
size="icon-sm"
- depth={3}
variant="ghost"
aria-label="Next comment thread"
disabled={pagerIndex() >= orderedThreadIds().length - 1}
diff --git a/apps/web/src/features/block-md/component/ComposeSkill.tsx b/apps/web/src/features/block-md/component/ComposeSkill.tsx
index 2173e3f627..db14c5e5a9 100644
--- a/apps/web/src/features/block-md/component/ComposeSkill.tsx
+++ b/apps/web/src/features/block-md/component/ComposeSkill.tsx
@@ -373,24 +373,26 @@ export function ComposeSkill(props: ComposeSkillProps) {
<div class="flex-1 flex items-center">
<Show when={splitPanel?.handle.isPopover()}>
<Button
+ variant="ghost"
onMouseDown={handleContinueInSplit}
disabled={isCreating()}
tabIndex={-1}
tooltip="Continue editing in split"
size="icon-sm"
>
- <ArrowsOutIcon />
+ <ArrowsOutIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
<Show when={splitPanel?.handle.isPopover()}>
<Button
+ variant="ghost"
onMouseDown={handleClose}
tabIndex={-1}
tooltip="Close"
size="icon-sm"
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -435,8 +437,7 @@ export function ComposeSkill(props: ComposeSkillProps) {
<Button
onClick={handleCreateSkill}
disabled={title().trim().length === 0 || isCreating()}
- variant="strong"
- depth={3}
+ variant="secondary"
class="gap-3"
>
Create Skill
diff --git a/apps/web/src/features/block-md/component/ComposeTask.tsx b/apps/web/src/features/block-md/component/ComposeTask.tsx
index 3a0286fa66..f078d1d876 100644
--- a/apps/web/src/features/block-md/component/ComposeTask.tsx
+++ b/apps/web/src/features/block-md/component/ComposeTask.tsx
@@ -730,9 +730,10 @@ export function ComposeTask(props: ComposeTaskProps) {
disabled={isCreating()}
tabIndex={-1}
tooltip="Continue editing in split"
- size="icon-composer"
+ variant="ghost"
+ size="icon-md"
>
- <ArrowsOutIcon />
+ <ArrowsOutIcon class="size-4 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -742,10 +743,8 @@ export function ComposeTask(props: ComposeTaskProps) {
disabled={isCreating()}
tabIndex={-1}
tooltip="Clear Draft"
- size="sm"
- variant="outline"
- depth={3}
- class="bg-surface px-3"
+ size="xs"
+ variant="secondary"
>
Clear Draft
</Button>
@@ -755,9 +754,10 @@ export function ComposeTask(props: ComposeTaskProps) {
onMouseDown={handleClose}
tabIndex={-1}
tooltip="Close"
- size="icon-composer"
+ variant="ghost"
+ size="icon-md"
>
- <XIcon />
+ <XIcon class="size-4 shrink-0 pointer-events-none" />
</Button>
</Show>
</EntityComposer.Header>
@@ -778,6 +778,8 @@ export function ComposeTask(props: ComposeTaskProps) {
<TaskTitleAccessory>
<InlineTagsPill
docTags={composerTags}
+ variant="secondary"
+ size="xs"
showPlaceholder
class="shrink-0"
onActiveChange={handleTitleTagPickerActive}
@@ -826,7 +828,7 @@ export function ComposeTask(props: ComposeTaskProps) {
</Scroll>
</EntityComposer.Body>
- <div class="shrink-0 flex items-center py-2 -ml-1 touch:-ml-[3px]">
+ <div class="shrink-0 flex items-center py-2">
<input
ref={(el) => {
attachInputRef = el;
@@ -841,9 +843,10 @@ export function ComposeTask(props: ComposeTaskProps) {
onMouseDown={() => attachInputRef?.click()}
tabIndex={-1}
tooltip="Attach image or video"
- size="icon-composer"
+ variant="ghost"
+ size="icon-md"
>
- <PaperclipIcon />
+ <PaperclipIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
@@ -898,7 +901,12 @@ export function ComposeTask(props: ComposeTaskProps) {
)}
</For>
<Show when={tagLayoutMode() === 'bottom'}>
- <InlineTagsPill docTags={composerTags} showPlaceholder />
+ <InlineTagsPill
+ docTags={composerTags}
+ variant="secondary"
+ size="xs"
+ showPlaceholder
+ />
</Show>
<TaskComposerPropertyEditor
name={title()}
@@ -958,7 +966,8 @@ export function ComposeTask(props: ComposeTaskProps) {
label="Create More"
/>
<EntityComposer.Submit
- variant="strong"
+ variant="primary"
+ size="sm"
onClick={handleCreateTask}
disabled={title().trim().length === 0 || isCreating()}
hasContent={title().trim().length > 0}
diff --git a/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx b/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx
index ad1335710a..e05f7a6629 100644
--- a/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx
+++ b/apps/web/src/features/block-md/component/DispatchAgentMenu.tsx
@@ -20,7 +20,7 @@ import { storageServiceClient } from '@service-storage/client';
import type { MessageThread } from '@service-storage/messages';
import { createCallback } from '@solid-primitives/rootless';
import { makePersisted } from '@solid-primitives/storage';
-import { Button, ButtonGroup, CopyButton, Dropdown } from '@ui';
+import { ButtonGroup, CopyButton, Dropdown } from '@ui';
import { type Component, createSignal, For, type JSX, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { useMarkdownDocument } from '../context/markdown-document-context';
@@ -332,15 +332,19 @@ export function DispatchAgentButton(
return (
<Dropdown open={open()} onOpenChange={setOpen}>
<ButtonGroup
- variant="outline"
- size={props.showPrimaryLabel ? 'md' : 'icon-sm'}
+ finish="raised"
+ variant="secondary"
+ size={props.showPrimaryLabel ? 'sm' : 'icon-sm'}
+ class="border-0"
>
<Dynamic
- component={lastUsed().key === 'copy' ? CopyButton : Button}
- variant="ghost"
+ component={
+ lastUsed().key === 'copy' ? CopyButton : ButtonGroup.Button
+ }
+ {...(lastUsed().key === 'copy' ? { as: ButtonGroup.Button } : {})}
onClick={executeLastUsed}
tooltip={lastUsed().name}
- class="@max-[600px]/split-header:w-8 @max-[600px]/split-header:p-0"
+ class="@max-[600px]/split-header:w-7 @max-[600px]/split-header:p-0"
>
<Dynamic
component={lastUsed().buttonIcon ?? lastUsed().icon}
@@ -354,9 +358,11 @@ export function DispatchAgentButton(
</Dynamic>
<ButtonGroup.Divider />
<Dropdown.Trigger
- variant="ghost"
- size={props.showPrimaryLabel ? 'icon-md' : 'icon-sm'}
- label="Agent options"
+ as={ButtonGroup.Button}
+ aria-label="Agent options"
+ tooltip="Agent options"
+ variant="secondary"
+ size="icon-sm"
>
<CaretDown class="size-3.5!" />
</Dropdown.Trigger>
diff --git a/apps/web/src/features/block-md/component/FormatTools.tsx b/apps/web/src/features/block-md/component/FormatTools.tsx
index d0a3fb23cb..720e3f4671 100644
--- a/apps/web/src/features/block-md/component/FormatTools.tsx
+++ b/apps/web/src/features/block-md/component/FormatTools.tsx
@@ -227,11 +227,13 @@ const InlineFormatButton = (props: {
const isActive = () => isInlineFormatActive(props.selection(), props.format);
return (
<Button
- label={InlineLabels[props.format]}
- shortcut={InlineShortcuts[props.format]}
+ aria-label={InlineLabels[props.format]}
+ tooltip={{
+ content: InlineLabels[props.format],
+ shortcut: InlineShortcuts[props.format],
+ }}
size={props.size ?? 'icon-sm'}
- variant={isActive() ? 'accent' : 'ghost'}
- depth={3}
+ variant={isActive() ? 'primary' : 'ghost'}
onClick={(e: MouseEvent | KeyboardEvent) =>
props.onClick(e as MouseEvent)
}
@@ -281,10 +283,9 @@ export const ElementFormatButton = (props: {
<Button
tooltip={name}
size={props.size ?? 'icon-sm'}
- depth={3}
variant={
isElementFormatActive(props.selection(), props.format)
- ? 'accent'
+ ? 'primary'
: 'ghost'
}
onClick={(e: MouseEvent | KeyboardEvent) =>
@@ -523,14 +524,13 @@ export function FormatTools(props: {
return (
<Dropdown open={menuOpen()} onOpenChange={setMenuOpen}>
<Dropdown.Trigger
- variant={isActive() ? 'accent' : 'ghost'}
+ variant={isActive() ? 'primary' : 'ghost'}
size={buttonSize()}
- depth={3}
- tooltip={'Text Styles'}
+ tooltip="Text Styles"
disabled={buttonIsDisabled()}
tabIndex={-1}
>
- <TextAA />
+ <TextAA class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content
onCloseAutoFocus={() => {
@@ -586,14 +586,13 @@ export function FormatTools(props: {
return (
<Dropdown open={menuOpen()} onOpenChange={setMenuOpen}>
<Dropdown.Trigger
- variant={isActive() ? 'accent' : 'ghost'}
+ variant={isActive() ? 'primary' : 'ghost'}
size={buttonSize()}
- depth={3}
tooltip="Text Styles"
disabled={props.buttonIsDisabled()}
tabIndex={-1}
>
- <TextAA />
+ <TextAA class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Show when={!props.buttonIsDisabled()}>
<Dropdown.Content
@@ -642,11 +641,10 @@ export function FormatTools(props: {
(format) => !props.excludes?.includes(format)
)
)
- ? 'accent'
+ ? 'primary'
: 'ghost'
}
size={buttonSize()}
- depth={3}
tooltip={props.label ?? 'More Formats'}
disabled={buttonIsDisabled()}
tabIndex={-1}
@@ -690,11 +688,10 @@ export function FormatTools(props: {
<Dropdown.Trigger
variant={
hasActiveElementFormat(selection(), props.elements)
- ? 'accent'
+ ? 'primary'
: 'ghost'
}
size={buttonSize()}
- depth={3}
tooltip={props.label ?? 'More Formats'}
disabled={buttonIsDisabled()}
tabIndex={-1}
@@ -755,12 +752,11 @@ export function FormatTools(props: {
<Dropdown.Trigger
variant="ghost"
size={buttonSize()}
- depth={3}
tooltip="More formatting"
disabled={buttonIsDisabled()}
tabIndex={-1}
>
- <DotsThreeLarge />
+ <DotsThreeLarge class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Show when={!buttonIsDisabled()}>
<Dropdown.Content
@@ -822,7 +818,6 @@ export function FormatTools(props: {
variant="ghost"
size="sm"
class="gap-1"
- depth={3}
tooltip="Text style"
disabled={buttonIsDisabled()}
tabIndex={-1}
@@ -889,7 +884,6 @@ export function FormatTools(props: {
<Button
variant="ghost"
size={buttonSize()}
- depth={3}
onPointerDown={(e: PointerEvent) => e.preventDefault()}
onClick={(e) => {
if (!selection()?.hasLinks && props.onRequestLink) {
@@ -914,24 +908,22 @@ export function FormatTools(props: {
<Button
variant="ghost"
size={buttonSize()}
- depth={3}
tooltip="Merge cells"
onClick={handleMergeCells}
disabled={buttonIsDisabled()}
>
- <CornersIn />
+ <CornersIn class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Show when={selection()?.onSplittableCells}>
<Button
variant="ghost"
size={buttonSize()}
- depth={3}
tooltip="Split cell"
onClick={handleSplitCell}
disabled={buttonIsDisabled()}
>
- <CornersOut />
+ <CornersOut class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</Show>
@@ -1054,7 +1046,6 @@ export function FormatTools(props: {
<Button
variant="ghost"
size="icon-sm"
- depth={3}
onPointerDown={(e: PointerEvent) => e.preventDefault()}
onClick={handleLink}
tooltip={selection()?.hasLinks ? 'Remove Link' : 'Insert Link'}
@@ -1069,7 +1060,6 @@ export function FormatTools(props: {
<Button
variant="ghost"
size="icon-sm"
- depth={3}
tooltip="Comment"
onClick={(e) => {
e.preventDefault();
@@ -1078,7 +1068,7 @@ export function FormatTools(props: {
}}
disabled={commentButtonIsDisabled()}
>
- <ChatTeardrop />
+ <ChatTeardrop class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<VerticalBar />
@@ -1089,12 +1079,11 @@ export function FormatTools(props: {
<Dropdown.Trigger
variant="ghost"
size="icon-sm"
- depth={3}
tooltip="More"
disabled={buttonIsDisabled()}
tabIndex={-1}
>
- <PlusSquare />
+ <PlusSquare class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Show when={!buttonIsDisabled()}>
<Dropdown.Content
@@ -1165,7 +1154,6 @@ export function FormatTools(props: {
<Button
variant="ghost"
size="icon-sm"
- depth={3}
tooltip="Comment"
onClick={(e) => {
e.preventDefault();
@@ -1174,7 +1162,7 @@ export function FormatTools(props: {
}}
disabled={commentButtonIsDisabled()}
>
- <ChatTeardrop />
+ <ChatTeardrop class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</>
diff --git a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
index f1c5582c2e..9bb8f3e581 100644
--- a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
+++ b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx
@@ -54,6 +54,8 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (
return (
<PropertyValuePill
property={props.property}
+ variant="secondary"
+ size="xs"
showLabel={
props.property.propertyDefinitionId !== SYSTEM_PROPERTY_IDS.STATUS &&
props.property.propertyDefinitionId !== SYSTEM_PROPERTY_IDS.PRIORITY &&
@@ -89,8 +91,9 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (
hoverTrailingAction={
<Show when={canManage()}>
<Button
+ variant="ghost"
size="icon-sm"
- label="Unpin"
+ aria-label="Unpin"
disabled={removing()}
onClick={() =>
ctx.onPropertyUnpinned?.(
@@ -99,7 +102,7 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (
)
}
>
- <PushPinSlashIcon />
+ <PushPinSlashIcon class="size-3.5 shrink-0" />
</Button>
</Show>
}
diff --git a/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx b/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx
index 03ba610ce4..12b313084c 100644
--- a/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx
+++ b/apps/web/src/features/block-md/component/InlineTaskGithubPullRequests.tsx
@@ -174,13 +174,13 @@ function InlineTaskGithubPullRequestsContent(props: {
<For each={pullRequests()}>{(pr) => <PullRequestPill pr={pr} />}</For>
<Show when={!isWaitingForPullRequests() && pullRequests().length === 0}>
<CopyButton
- variant="outline"
+ variant="secondary"
size="sm"
- noTouchResize
- depth={2}
- tooltip="Copy branch name"
+ tooltip={{
+ content: 'Copy branch name',
+ hotkey: TOKENS.entity.action.copyBranchName,
+ }}
aria-label="Copy branch name"
- hotkey={TOKENS.entity.action.copyBranchName}
class={badgeTriggerClasses({
variant: 'outline',
size: 'sm',
diff --git a/apps/web/src/features/block-md/component/InlineTaskProperties.tsx b/apps/web/src/features/block-md/component/InlineTaskProperties.tsx
index 90c7142036..3d1303d8e9 100644
--- a/apps/web/src/features/block-md/component/InlineTaskProperties.tsx
+++ b/apps/web/src/features/block-md/component/InlineTaskProperties.tsx
@@ -176,7 +176,8 @@ export function InlineTaskProperties() {
<InlineFetchedEntityTagsPill
entityId={blockId}
entityType={entityType}
- class="bg-surface-2"
+ variant="secondary"
+ size="xs"
showAddButton={documentKind === 'document' && canEdit()}
/>
<For each={inlineProperties()}>
@@ -184,7 +185,6 @@ export function InlineTaskProperties() {
<InlinePropertyValue
property={property}
entityId={blockId}
- class="bg-surface-2 border border-edge"
canManage={
!property.propertyId.startsWith('pending:') ||
defaultDefinitionIds().includes(property.propertyDefinitionId)
@@ -200,7 +200,7 @@ export function InlineTaskProperties() {
)}
</For>
<Show when={documentKind === 'document' && canEdit()}>
- <AddPropertyButton class="gap-1.5 bg-surface-2" />
+ <AddPropertyButton variant="secondary" size="xs" class="gap-1.5" />
</Show>
<Show when={documentKind === 'task' && state.editor.md.progressStats}>
{(progressStats) => (
diff --git a/apps/web/src/features/block-md/component/MarkdownPopup.tsx b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
index fb5d04a5e3..78807eeaf4 100644
--- a/apps/web/src/features/block-md/component/MarkdownPopup.tsx
+++ b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
@@ -345,7 +345,6 @@ export function MarkdownPopup(props: {
>
<Button
size="icon-sm"
- depth={3}
variant="ghost"
tooltip="Stop AI edit"
onClick={() => cancelAiEdit(blockId)}
@@ -676,18 +675,13 @@ export function MarkdownPopup(props: {
<Toolbar ref={measureToolbar}>
{/* Selection actions: AI edit + create task. */}
<Show when={shouldShowEditWithAiButton()}>
- <Toolbar.Button
- size="sm"
- depth={3}
- onClick={() => setActivePrompt('ai')}
- >
+ <Toolbar.Button size="sm" onClick={() => setActivePrompt('ai')}>
AI edit
</Toolbar.Button>
</Show>
<Show when={shouldShowCreateTaskButton()}>
<Toolbar.Button
size="sm"
- depth={3}
tooltip={
convertsCheckboxes()
? 'Create a task for each checklist item'
@@ -719,7 +713,6 @@ export function MarkdownPopup(props: {
<Show when={shouldShowTableButton()}>
<Toolbar.Button
size="sm"
- depth={3}
tooltip="Convert list to table"
onClick={handleConvertListToTable}
>
@@ -730,21 +723,19 @@ export function MarkdownPopup(props: {
</Show>
<Show when={ENABLE_MARKDOWN_COMMENTS && canComment()}>
<Toolbar.Button
+ aria-label="Comment"
size="icon-sm"
- depth={3}
onClick={handleInsertComment}
tooltip="Comment"
- label="Comment"
>
<ChatTeardrop />
</Toolbar.Button>
</Show>
<Toolbar.Button
+ aria-label="Copy link to snippet"
size="icon-sm"
- depth={3}
onClick={() => fireAndForget(handleShare(), 'markdown-editor')}
tooltip="Copy link to snippet"
- label="Copy link to snippet"
>
<Dynamic
component={locationCopied() ? CheckIcon : LinkIcon}
@@ -813,7 +804,7 @@ export function MarkdownPopup(props: {
<Show when={activePrompt() === 'link'}>
<Button
size="icon-sm"
- variant="strong"
+ variant="secondary"
tooltip="Insert link"
disabled={!linkInput().trim()}
onClick={handleInsertLink}
diff --git a/apps/web/src/features/block-md/component/MediaSelector.tsx b/apps/web/src/features/block-md/component/MediaSelector.tsx
index 52ec83a8e8..ec3a90143d 100644
--- a/apps/web/src/features/block-md/component/MediaSelector.tsx
+++ b/apps/web/src/features/block-md/component/MediaSelector.tsx
@@ -119,14 +119,15 @@ export function MediaSelector(props: MediaSelectorProps) {
// TODO bring up to menu best practices, ie. fully focusable menu items, etc.
<Dropdown open={menuOpen()} onOpenChange={setMenuOpen}>
<Dropdown.Trigger
- label="Insert Media File"
+ aria-label="Insert Media File"
+ tooltip="Insert Media File"
variant="ghost"
size="icon-md"
disabled={props?.buttonIsDisabled?.() ?? false}
tabIndex={-1}
>
- <ImageIcon />
- <CaretDown />
+ <ImageIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ <CaretDown class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Show when={!props?.buttonIsDisabled?.()}>
<Dropdown.Content
diff --git a/apps/web/src/features/block-md/component/RecoverTaskDrafts.tsx b/apps/web/src/features/block-md/component/RecoverTaskDrafts.tsx
index bcaa4bdfd4..f50002730b 100644
--- a/apps/web/src/features/block-md/component/RecoverTaskDrafts.tsx
+++ b/apps/web/src/features/block-md/component/RecoverTaskDrafts.tsx
@@ -29,7 +29,7 @@ export function RecoverTaskDrafts(props: {
<For each={props.drafts}>
{(draft) => (
<Button
- variant="outline"
+ variant="secondary"
class="mt-2 max-w-full"
tooltip={draft.draft.title || 'Untitled task'}
disabled={pending().includes(draft.id)}
diff --git a/apps/web/src/features/block-md/component/TableInsert.tsx b/apps/web/src/features/block-md/component/TableInsert.tsx
index 56ee269595..df0ad932cd 100644
--- a/apps/web/src/features/block-md/component/TableInsert.tsx
+++ b/apps/web/src/features/block-md/component/TableInsert.tsx
@@ -161,7 +161,7 @@ export function TableInsert(
/>
</div>
<Button
- variant="outline"
+ variant="secondary"
disabled={!rows() || !cols()}
onClick={() => handleInsertTable(rows() ?? 0, cols() ?? 0)}
>
diff --git a/apps/web/src/features/block-md/component/TaskComposerPropertyEditor.tsx b/apps/web/src/features/block-md/component/TaskComposerPropertyEditor.tsx
index 2fb51234fe..6c7ed4a574 100644
--- a/apps/web/src/features/block-md/component/TaskComposerPropertyEditor.tsx
+++ b/apps/web/src/features/block-md/component/TaskComposerPropertyEditor.tsx
@@ -30,7 +30,11 @@ export function TaskComposerPropertyEditor(props: {
return (
<>
- <AddPropertyButton onClick={() => setOpen(true)} />
+ <AddPropertyButton
+ variant="secondary"
+ size="xs"
+ onClick={() => setOpen(true)}
+ />
<Show when={open()}>
<PropertyEditorDialog
isOpen={open()}
diff --git a/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsx b/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsx
index e9ee8d6652..ac252d6e56 100644
--- a/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsx
+++ b/apps/web/src/features/block-md/component/TaskDuplicateMatches.tsx
@@ -30,7 +30,6 @@ export function TaskDuplicateMatchPill() {
placement="bottom-start"
>
<Dropdown.Trigger
- depth={2}
class={cn(
'h-auto min-w-0 gap-1.5 border-failure/40 px-2 py-1 leading-tight',
'bg-failure/10 text-failure-ink shadow-none',
@@ -175,10 +174,9 @@ function TaskDuplicateMention(props: { match: TaskDuplicate }) {
function DismissDuplicateButton(props: { onDismiss: () => void }) {
return (
<Button
- depth={2}
- variant="outline"
- size="sm"
- class="h-6 shrink-0 px-2 text-xs"
+ variant="secondary"
+ size="xs"
+ class="shrink-0"
onClick={props.onDismiss}
>
Dismiss
@@ -189,10 +187,9 @@ function DismissDuplicateButton(props: { onDismiss: () => void }) {
function DismissAllButton(props: { onDismissAll: () => void }) {
return (
<Button
- depth={2}
- variant="outline"
- size="sm"
- class="mt-1 w-fit text-xs"
+ variant="secondary"
+ size="xs"
+ class="mt-1 w-fit"
onClick={props.onDismissAll}
>
Dismiss all
diff --git a/apps/web/src/features/block-md/component/TouchSelectionToolbar.tsx b/apps/web/src/features/block-md/component/TouchSelectionToolbar.tsx
index 2b682cfe80..998ef69a1b 100644
--- a/apps/web/src/features/block-md/component/TouchSelectionToolbar.tsx
+++ b/apps/web/src/features/block-md/component/TouchSelectionToolbar.tsx
@@ -397,24 +397,14 @@ export function TouchSelectionToolbar(props: {
<div class="flex w-max flex-row items-center" ref={measureRowRef}>
<For each={options()}>
{(option) => (
- <Button
- size="sm"
- class={optionButtonClass}
- depth={3}
- variant="ghost"
- >
+ <Button size="sm" class={optionButtonClass} variant="ghost">
{option.content()}
</Button>
)}
</For>
</div>
<div class="w-max" ref={measureArrowRef}>
- <Button
- size="icon-sm"
- class={arrowButtonClass}
- depth={3}
- variant="ghost"
- >
+ <Button size="icon-sm" class={arrowButtonClass} variant="ghost">
<CaretRightIcon class="size-4" />
</Button>
</div>
@@ -423,7 +413,6 @@ export function TouchSelectionToolbar(props: {
<Button
size="icon-sm"
class={arrowButtonClass}
- depth={3}
variant="ghost"
aria-label="Previous options"
onClick={() => page(-1)}
@@ -483,7 +472,6 @@ export function TouchSelectionToolbar(props: {
<Button
size="sm"
class={optionButtonClass}
- depth={3}
variant="ghost"
onClick={() => option.onSelect()}
>
@@ -502,7 +490,6 @@ export function TouchSelectionToolbar(props: {
<Button
size="icon-sm"
class={arrowButtonClass}
- depth={3}
variant="ghost"
aria-label="More options"
onClick={() => page(1)}
diff --git a/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx b/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx
index 060445c22b..45122c6225 100644
--- a/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx
+++ b/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx
@@ -71,6 +71,7 @@ export function MarkdownSidePanelSections() {
</Show>
<HeaderActionGroup label="Actions">
<AskMacroButton
+ grouped
entity={{
type: 'document',
id: documentId(),
diff --git a/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx b/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx
index 3aa52f7b3f..b67beebfde 100644
--- a/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx
+++ b/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx
@@ -128,7 +128,9 @@ export function useMarkdownDocumentTools() {
label: 'Chat',
icon: ChatWithAgentIcon,
action: () => openChatWithAgent(chatEntity()),
- buttonComponent: () => <ChatWithAgentButton entity={chatEntity()} />,
+ buttonComponent: (control) => (
+ <ChatWithAgentButton grouped={control.grouped} entity={chatEntity()} />
+ ),
},
{
group: 'sharing',
diff --git a/apps/web/src/features/block-md/history/HistoryToolbar.tsx b/apps/web/src/features/block-md/history/HistoryToolbar.tsx
index 32367b02ed..38c2579b75 100644
--- a/apps/web/src/features/block-md/history/HistoryToolbar.tsx
+++ b/apps/web/src/features/block-md/history/HistoryToolbar.tsx
@@ -49,7 +49,7 @@ export function HistoryToolbar(props: { onClose: () => void }) {
onClick={props.onClose}
aria-label="Close history"
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<div class="min-w-0 flex-1">
<h2 class="text-sm font-medium">Document history</h2>
@@ -68,7 +68,7 @@ export function HistoryToolbar(props: { onClose: () => void }) {
Current version
</Button>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={handleFork}
disabled={
diff --git a/apps/web/src/features/block-md/views/compose-document.tsx b/apps/web/src/features/block-md/views/compose-document.tsx
index e5252575d6..f15c42f442 100644
--- a/apps/web/src/features/block-md/views/compose-document.tsx
+++ b/apps/web/src/features/block-md/views/compose-document.tsx
@@ -149,25 +149,27 @@ export function ComposeDocument(props: ComposeDocumentProps) {
<div class="flex-1 flex items-center">
<Show when={panel.handle.isPopover()}>
<Button
+ variant="ghost"
onMouseDown={() =>
fireAndForget(submit(true), 'compose-document')
}
disabled={isCreating()}
tabIndex={-1}
tooltip="Continue editing in split"
- size="icon-composer"
+ size="icon-md"
>
- <ArrowsOutIcon />
+ <ArrowsOutIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
<Button
+ variant="ghost"
onClick={() => panel.handle.close()}
tabIndex={-1}
tooltip="Close"
- size="icon-composer"
+ size="icon-md"
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</EntityComposer.Header>
<DocumentFields
@@ -196,7 +198,7 @@ export function ComposeDocument(props: ComposeDocumentProps) {
ref={(button) => {
submitButton = button;
}}
- variant="strong"
+ variant="primary"
onClick={() => fireAndForget(submit(), 'compose-document')}
disabled={!title().trim() || isCreating()}
hasContent={!!title().trim()}
diff --git a/apps/web/src/features/block-pdf/component/MarkupToolbar.tsx b/apps/web/src/features/block-pdf/component/MarkupToolbar.tsx
index 91a55c61ba..b82bba6331 100644
--- a/apps/web/src/features/block-pdf/component/MarkupToolbar.tsx
+++ b/apps/web/src/features/block-pdf/component/MarkupToolbar.tsx
@@ -35,8 +35,9 @@ export function MarkupToolbar() {
<div class="flex flex-row items-center">
<Show when={canEdit()}>
<Button
+ aria-label="Text Box"
+ tooltip="Text Box"
size="icon-sm"
- label="Text Box"
variant="ghost"
onClick={() => {
pdf.markup.commands.beginPlacement(
@@ -44,28 +45,30 @@ export function MarkupToolbar() {
);
}}
>
- <Textbox />
+ <Textbox class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Signature"
+ tooltip="Signature"
size="icon-sm"
- label="Signature"
variant="ghost"
onClick={() =>
pdf.markup.commands.beginPlacement(PayloadMode.Signature)
}
>
- <Signature />
+ <Signature class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Button
+ aria-label="Comment"
+ tooltip="Comment"
size="icon-sm"
- label="Comment"
variant="ghost"
onClick={() => {
pdf.markup.commands.beginPlacement(PayloadMode.Thread);
}}
>
- <ChatTeardrop />
+ <ChatTeardrop class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Show
when={showCancel()}
@@ -74,8 +77,8 @@ export function MarkupToolbar() {
when={showDelete()}
fallback={
<div class="invisible">
- <Button size="icon-sm">
- <Cancel />
+ <Button variant="ghost" size="icon-sm">
+ <Cancel class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
}
@@ -90,7 +93,7 @@ export function MarkupToolbar() {
deletePlaceable(activePlaceableIndex_);
}}
>
- <Trash />
+ <Trash class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
}
@@ -103,7 +106,7 @@ export function MarkupToolbar() {
pdf.markup.commands.cancelPlacement();
}}
>
- <Cancel />
+ <Cancel class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
diff --git a/apps/web/src/features/block-pdf/component/PDFPopup.tsx b/apps/web/src/features/block-pdf/component/PDFPopup.tsx
index b1404edb50..c9886c0e43 100644
--- a/apps/web/src/features/block-pdf/component/PDFPopup.tsx
+++ b/apps/web/src/features/block-pdf/component/PDFPopup.tsx
@@ -102,7 +102,7 @@ export function PDFPopup(props: PDFPopupProps) {
props.highlightProps.removeHighlight();
}}
>
- <TrashIcon />
+ <TrashIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</Match>
@@ -122,7 +122,7 @@ export function PDFPopup(props: PDFPopupProps) {
props.commentProps.placeComment(e as MouseEvent)
}
>
- <ChatIcon />
+ <ChatIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -139,12 +139,12 @@ export function PDFPopup(props: PDFPopupProps) {
when={locationCopied()}
fallback={
<>
- <LinkIcon />
+ <LinkIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
Share
</>
}
>
- <CheckIcon class="text-success" />
+ <CheckIcon class="text-success size-3.5 touch:size-6 shrink-0 pointer-events-none" />
Copied
</Show>
</Button>
diff --git a/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx b/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx
index 73f774aeae..36a2ba070f 100644
--- a/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx
+++ b/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx
@@ -17,12 +17,13 @@ export function PdfTabsToggle() {
return (
<Show when={canEdit()}>
<Button
+ aria-label={pdf.tabs.isVisible() ? 'Hide Tabs' : 'Show Tabs'}
+ tooltip={pdf.tabs.isVisible() ? 'Hide Tabs' : 'Show Tabs'}
size="icon-sm"
- label={pdf.tabs.isVisible() ? 'Hide Tabs' : 'Show Tabs'}
variant="ghost"
onClick={pdf.tabs.commands.toggleVisibility}
>
- <Tabs />
+ <Tabs class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
);
diff --git a/apps/web/src/features/block-pdf/component/TopBar.tsx b/apps/web/src/features/block-pdf/component/TopBar.tsx
index b00132a23c..c5d1f44e14 100644
--- a/apps/web/src/features/block-pdf/component/TopBar.tsx
+++ b/apps/web/src/features/block-pdf/component/TopBar.tsx
@@ -143,8 +143,9 @@ export function TopBar() {
name: fileName(),
fileType,
}),
- buttonComponent: () => (
+ buttonComponent: (control) => (
<ChatWithAgentButton
+ grouped={control.grouped}
entity={{
type: 'document',
id: documentId,
diff --git a/apps/web/src/features/block-pdf/component/placeables/Signature.tsx b/apps/web/src/features/block-pdf/component/placeables/Signature.tsx
index 8bce0b8ddd..e65a224910 100644
--- a/apps/web/src/features/block-pdf/component/placeables/Signature.tsx
+++ b/apps/web/src/features/block-pdf/component/placeables/Signature.tsx
@@ -190,21 +190,23 @@ function SignatureEditor(props: SignatureEditorProps) {
/>
<div class="flex flex-row w-full justify-center items-center border-t border-edge">
<Button
+ aria-label="Use signature"
+ tooltip="Use signature"
variant="ghost"
size="icon-md"
- label="Use signature"
disabled={!hasStrokes()}
onClick={updatePlaceable}
>
- <Check />
+ <Check class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Cancel signature"
+ tooltip="Cancel signature"
variant="ghost"
size="icon-md"
- label="Cancel signature"
onClick={cancel}
>
- <Trash />
+ <Trash class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Dialog.Content>
diff --git a/apps/web/src/features/block-pdf/component/sidepanel/PdfSidePanelSections.tsx b/apps/web/src/features/block-pdf/component/sidepanel/PdfSidePanelSections.tsx
index 743d4117cc..d38ab1d4b0 100644
--- a/apps/web/src/features/block-pdf/component/sidepanel/PdfSidePanelSections.tsx
+++ b/apps/web/src/features/block-pdf/component/sidepanel/PdfSidePanelSections.tsx
@@ -29,6 +29,7 @@ function PdfHeaderActions() {
return (
<HeaderActionGroup label="Actions">
<AskMacroButton
+ grouped
entity={{
type: 'document',
id: documentId,
diff --git a/apps/web/src/features/block-pptx/components/animation-pane.tsx b/apps/web/src/features/block-pptx/components/animation-pane.tsx
index 7f7cc8fed9..e2a3c4e505 100644
--- a/apps/web/src/features/block-pptx/components/animation-pane.tsx
+++ b/apps/web/src/features/block-pptx/components/animation-pane.tsx
@@ -71,30 +71,31 @@ export function AnimationPane(props: {
<div class="flex h-9 items-center justify-between border-edge-muted border-b px-3">
<span class="font-semibold text-ink text-sm">Animation Pane</span>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="flex items-center gap-1 border-edge-muted border-b px-2 py-1.5">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
data-testid="pptx-animation-play"
disabled={animations().length === 0}
onClick={anim.preview}
>
- <Play />
+ <Play class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Play All
</Button>
<div class="flex-1" />
<Button
+ aria-label="Move earlier"
size="icon-sm"
variant="ghost"
- label="Move earlier"
tooltip="Move Earlier"
disabled={ro() || (anim.picked() ?? 0) === 0}
onClick={() => {
@@ -106,12 +107,12 @@ export function AnimationPane(props: {
);
}}
>
- <ArrowUp />
+ <ArrowUp class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Move later"
size="icon-sm"
variant="ghost"
- label="Move later"
tooltip="Move Later"
disabled={
ro() ||
@@ -127,7 +128,7 @@ export function AnimationPane(props: {
);
}}
>
- <ArrowDown />
+ <ArrowDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="min-h-0 flex-1 overflow-y-auto p-1" role="listbox">
diff --git a/apps/web/src/features/block-pptx/components/chart-controls.tsx b/apps/web/src/features/block-pptx/components/chart-controls.tsx
index 6118118e52..6e4d899240 100644
--- a/apps/web/src/features/block-pptx/components/chart-controls.tsx
+++ b/apps/web/src/features/block-pptx/components/chart-controls.tsx
@@ -420,12 +420,13 @@ export function ChartDataEditor(props: {
Edit chart data
</h2>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<Show when={chart() && !chart()!.editable}>
@@ -540,20 +541,20 @@ export function ChartDataEditor(props: {
<div class="flex items-center gap-2">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.readonly}
onClick={addRow}
>
- <Plus />
+ <Plus class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Category
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.readonly}
onClick={addSeries}
>
- <Plus />
+ <Plus class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Series
</Button>
<span class="flex-1 text-ink-muted text-xs">
@@ -564,7 +565,7 @@ export function ChartDataEditor(props: {
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
data-testid="pptx-chart-apply"
disabled={
props.readonly || busy() || (chart() ? !chart()!.editable : false)
@@ -650,7 +651,7 @@ export function ChartDesignTab(props: {
class="h-7 min-w-0 flex-1 rounded-md border border-edge-muted bg-input px-2 text-xs"
onKeyDown={(e) => e.stopPropagation()}
/>
- <Button size="xs" variant="outline" type="submit">
+ <Button size="xs" variant="secondary" type="submit">
Set
</Button>
</form>
@@ -684,8 +685,8 @@ export function ChartDesignTab(props: {
)}
</RibbonPopover>
<RibbonTextButton
- label="Data labels"
- variant={chart()?.dataLabels ? 'accent' : 'ghost'}
+ aria-label="Data labels"
+ variant={chart()?.dataLabels ? 'primary' : 'ghost'}
aria-pressed={!!chart()?.dataLabels}
disabled={ro()}
onClick={() =>
@@ -762,7 +763,7 @@ export function ChartDesignTab(props: {
</RibbonGroup>
<RibbonGroup label="Data">
<RibbonTextButton
- label="Edit data"
+ aria-label="Edit data"
disabled={ro()}
data-testid="pptx-chart-edit-data"
onClick={props.onEditData}
diff --git a/apps/web/src/features/block-pptx/components/comments-pane.tsx b/apps/web/src/features/block-pptx/components/comments-pane.tsx
index 6a25d9bc63..87236e86df 100644
--- a/apps/web/src/features/block-pptx/components/comments-pane.tsx
+++ b/apps/web/src/features/block-pptx/components/comments-pane.tsx
@@ -61,15 +61,15 @@ function MoreMenu(props: {
gutter={2}
>
<Popover.Trigger
+ aria-label={props.label}
+ tooltip={{ content: props.label, placement: 'top' }}
as={Button}
size="icon-sm"
variant="ghost"
- label={props.label}
- tooltipPlacement="top"
data-testid="pptx-comment-menu"
onClick={(e: MouseEvent) => e.stopPropagation()}
>
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Popover.Trigger>
<Popover.Portal>
<Popover.Content
@@ -109,9 +109,9 @@ function CommentBox(props: {
};
const send = (
<Button
+ aria-label={props.submitLabel}
size={props.compact ? 'icon-sm' : 'sm'}
- variant={props.compact ? 'ghost' : 'accent'}
- label={props.submitLabel}
+ variant={props.compact ? 'ghost' : 'primary'}
tooltip={`${props.submitLabel} (Ctrl+Enter)`}
disabled={!text().trim()}
data-testid={props.submitTestId}
@@ -120,7 +120,7 @@ function CommentBox(props: {
fireAndForget(submit(), 'pptx-editor');
}}
>
- <PaperPlaneRight />
+ <PaperPlaneRight class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
return (
@@ -435,24 +435,25 @@ export function CommentsPane(props: {
<span class="flex-1 font-semibold text-ink text-sm">Comments</span>
<Show when={!props.readonly}>
<Button
+ aria-label="New comment"
size="sm"
variant="ghost"
- label="New comment"
tooltip="New comment (Ctrl+Alt+M)"
data-testid="pptx-comments-new"
onClick={() => c.newComment()}
>
- <ChatText />
+ <ChatText class="size-3 touch:size-6 shrink-0 pointer-events-none" />
New
</Button>
</Show>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div
@@ -491,7 +492,7 @@ export function CommentsPane(props: {
<Show when={!props.readonly}>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
onClick={() => c.newComment()}
>
New comment
diff --git a/apps/web/src/features/block-pptx/components/effects-pane.tsx b/apps/web/src/features/block-pptx/components/effects-pane.tsx
index dc849a4566..470a832ca8 100644
--- a/apps/web/src/features/block-pptx/components/effects-pane.tsx
+++ b/apps/web/src/features/block-pptx/components/effects-pane.tsx
@@ -600,7 +600,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {
<div class="flex justify-end">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={ro()}
data-testid="pptx-pane-corrections-reset"
onClick={() =>
@@ -696,7 +696,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {
<div class="flex justify-end gap-1.5">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={ro()}
onClick={() =>
fireAndForget(c.fitPictures('fill'), 'pptx-editor')
@@ -706,7 +706,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={ro()}
onClick={() => fireAndForget(c.fitPictures('fit'), 'pptx-editor')}
>
@@ -717,7 +717,7 @@ export function PicturePaneSections(props: { env: RibbonEnv }) {
<div class="flex justify-end p-3">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={ro()}
data-testid="pptx-pane-picture-reset"
onClick={() => fireAndForget(c.resetPictures(true), 'pptx-editor')}
diff --git a/apps/web/src/features/block-pptx/components/equation-editor.tsx b/apps/web/src/features/block-pptx/components/equation-editor.tsx
index 3e2d52ad47..837a2c5a41 100644
--- a/apps/web/src/features/block-pptx/components/equation-editor.tsx
+++ b/apps/web/src/features/block-pptx/components/equation-editor.tsx
@@ -74,13 +74,14 @@ export function EquationEditorPanel(props: {
</span>
<span class="flex-1" />
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-xs"
variant="ghost"
- label="Close"
data-testid="pptx-equation-close"
onClick={() => eq.close()}
>
- <X />
+ <X class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<textarea
@@ -148,7 +149,7 @@ export function EquationEditorPanel(props: {
<span class="flex-1" />
<Button
size="xs"
- variant="cta"
+ variant="primary"
data-testid="pptx-equation-insert"
disabled={props.readonly || (isNew() && !eq.latex().trim())}
onClick={() => fireAndForget(eq.commit(), 'pptx-editor')}
diff --git a/apps/web/src/features/block-pptx/components/export-dialog.tsx b/apps/web/src/features/block-pptx/components/export-dialog.tsx
index d3430b616f..0a944f7b71 100644
--- a/apps/web/src/features/block-pptx/components/export-dialog.tsx
+++ b/apps/web/src/features/block-pptx/components/export-dialog.tsx
@@ -194,7 +194,7 @@ export function ExportDialog(props: {
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
data-testid="pptx-export-run"
disabled={!!progress() || indexes().length === 0}
onClick={() => fireAndForget(run(), 'pptx-export')}
@@ -203,13 +203,14 @@ export function ExportDialog(props: {
</Button>
</div>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
class="absolute top-3 right-3"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Dialog>
diff --git a/apps/web/src/features/block-pptx/components/find-replace.tsx b/apps/web/src/features/block-pptx/components/find-replace.tsx
index 7faf998c67..22b4a23b97 100644
--- a/apps/web/src/features/block-pptx/components/find-replace.tsx
+++ b/apps/web/src/features/block-pptx/components/find-replace.tsx
@@ -168,28 +168,31 @@ export function FindReplace(props: {
: ''}
</span>
<Button
+ aria-label="Previous"
+ tooltip="Previous"
size="icon-xs"
variant="ghost"
- label="Previous"
onClick={() => step(-1)}
>
- <CaretUp />
+ <CaretUp class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Next"
+ tooltip="Next"
size="icon-xs"
variant="ghost"
- label="Next"
onClick={() => step(1)}
>
- <CaretDown />
+ <CaretDown class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-xs"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<Show when={props.replace && !props.readonly}>
@@ -204,7 +207,7 @@ export function FindReplace(props: {
/>
<Button
size="xs"
- variant="outline"
+ variant="secondary"
disabled={matches().length === 0}
onClick={() => fireAndForget(replaceOne(), 'pptx-editor')}
>
@@ -212,7 +215,7 @@ export function FindReplace(props: {
</Button>
<Button
size="xs"
- variant="outline"
+ variant="secondary"
data-testid="pptx-replace-all"
disabled={matches().length === 0}
onClick={() => fireAndForget(replaceAll(), 'pptx-editor')}
diff --git a/apps/web/src/features/block-pptx/components/format-pane.tsx b/apps/web/src/features/block-pptx/components/format-pane.tsx
index 34c477f353..238e3d48d6 100644
--- a/apps/web/src/features/block-pptx/components/format-pane.tsx
+++ b/apps/web/src/features/block-pptx/components/format-pane.tsx
@@ -318,12 +318,13 @@ export function FormatPane(props: {
<div class="flex h-9 items-center justify-between border-edge-muted border-b px-3">
<span class="font-semibold text-ink text-sm">{title()}</span>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-xs"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<Show when={props.section !== 'background'}>
@@ -804,7 +805,7 @@ export function FormatPane(props: {
<div class="flex gap-2 p-3">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={ro()}
onClick={() => c.applyBackgroundToAll()}
>
diff --git a/apps/web/src/features/block-pptx/components/header-footer-dialog.tsx b/apps/web/src/features/block-pptx/components/header-footer-dialog.tsx
index 58e736ffab..e557ef6fa5 100644
--- a/apps/web/src/features/block-pptx/components/header-footer-dialog.tsx
+++ b/apps/web/src/features/block-pptx/components/header-footer-dialog.tsx
@@ -248,7 +248,7 @@ export function HeaderFooterDialog(props: {
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
data-testid="pptx-hf-apply"
disabled={ro()}
tooltip={
@@ -262,7 +262,7 @@ export function HeaderFooterDialog(props: {
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
data-testid="pptx-hf-apply-all"
disabled={ro()}
onClick={() => apply(true)}
@@ -271,13 +271,14 @@ export function HeaderFooterDialog(props: {
</Button>
</div>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
class="absolute top-3 right-3"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Dialog>
diff --git a/apps/web/src/features/block-pptx/components/link-dialog.tsx b/apps/web/src/features/block-pptx/components/link-dialog.tsx
index 8c23fa1bca..782c4f4ae5 100644
--- a/apps/web/src/features/block-pptx/components/link-dialog.tsx
+++ b/apps/web/src/features/block-pptx/components/link-dialog.tsx
@@ -326,7 +326,7 @@ export function LinkDialog(props: {
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
type="submit"
data-testid="pptx-link-ok"
disabled={!link()}
@@ -335,13 +335,14 @@ export function LinkDialog(props: {
</Button>
</div>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
class="absolute top-3 right-3"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</form>
</Dialog>
diff --git a/apps/web/src/features/block-pptx/components/presenter-view.tsx b/apps/web/src/features/block-pptx/components/presenter-view.tsx
index dc297febf8..207605d579 100644
--- a/apps/web/src/features/block-pptx/components/presenter-view.tsx
+++ b/apps/web/src/features/block-pptx/components/presenter-view.tsx
@@ -256,24 +256,29 @@ export function PresenterView(props: {
{formatElapsed(elapsed())}
</span>
<Button
+ aria-label={pausedAt() === null ? 'Pause timer' : 'Resume timer'}
variant="ghost"
size="icon-sm"
- label={pausedAt() === null ? 'Pause timer' : 'Resume timer'}
tooltip={pausedAt() === null ? 'Pause timer' : 'Resume timer'}
onClick={togglePause}
>
- <Show when={pausedAt() === null} fallback={<Play />}>
- <Pause />
+ <Show
+ when={pausedAt() === null}
+ fallback={
+ <Play class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ >
+ <Pause class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
<Button
+ aria-label="Restart timer"
variant="ghost"
size="icon-sm"
- label="Restart timer"
tooltip="Restart timer"
onClick={resetTimer}
>
- <ArrowCounterClockwise />
+ <ArrowCounterClockwise class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<span class="text-ink-muted tabular-nums">
{new Date(now()).toLocaleTimeString([], {
@@ -290,7 +295,7 @@ export function PresenterView(props: {
data-testid="pptx-presenter-audience-closed"
>
The audience window is closed.
- <Button variant="outline" size="sm" onClick={attach}>
+ <Button variant="secondary" size="sm" onClick={attach}>
Open audience window
</Button>
</span>
@@ -302,7 +307,7 @@ export function PresenterView(props: {
</span>
</Show>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="pptx-presenter-end"
onClick={show.exit}
@@ -363,13 +368,13 @@ export function PresenterView(props: {
</Panel>
<div class="flex items-center justify-center gap-2">
<Button
+ aria-label="Previous slide"
variant="ghost"
size="icon-sm"
- label="Previous slide"
tooltip="Previous slide (←)"
onClick={() => show.go(-1)}
>
- <CaretLeft />
+ <CaretLeft class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<span
class="min-w-24 text-center text-sm tabular-nums"
@@ -378,27 +383,27 @@ export function PresenterView(props: {
Slide {show.index() + 1} of {show.slides().length}
</span>
<Button
+ aria-label="Next slide"
variant="ghost"
size="icon-sm"
- label="Next slide"
tooltip="Next slide (→)"
data-testid="pptx-presenter-next-button"
onClick={() => show.go(1)}
>
- <CaretRight />
+ <CaretRight class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
- variant={grid() ? 'accent' : 'ghost'}
+ variant={grid() ? 'primary' : 'ghost'}
size="sm"
tooltip="See all slides (G)"
data-testid="pptx-presenter-grid-toggle"
onClick={() => setGrid((v) => !v)}
>
- <SquaresFour />
+ <SquaresFour class="size-3 touch:size-6 shrink-0 pointer-events-none" />
All slides
</Button>
<Button
- variant={show.screen() === 'black' ? 'accent' : 'ghost'}
+ variant={show.screen() === 'black' ? 'primary' : 'ghost'}
size="sm"
tooltip="Black or unblack the screen (B)"
onClick={() => show.toggleScreen('black')}
@@ -471,7 +476,11 @@ export function PresenterView(props: {
>
<div class="mb-3 flex items-center justify-between">
<h2 class="font-medium">All slides</h2>
- <Button variant="outline" size="sm" onClick={() => setGrid(false)}>
+ <Button
+ variant="secondary"
+ size="sm"
+ onClick={() => setGrid(false)}
+ >
Back
</Button>
</div>
diff --git a/apps/web/src/features/block-pptx/components/print-dialog.tsx b/apps/web/src/features/block-pptx/components/print-dialog.tsx
index e668033698..4be66da0bd 100644
--- a/apps/web/src/features/block-pptx/components/print-dialog.tsx
+++ b/apps/web/src/features/block-pptx/components/print-dialog.tsx
@@ -298,12 +298,13 @@ export function PrintDialog(props: {
Print
</h2>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<fieldset class="flex flex-col gap-1.5">
@@ -417,17 +418,17 @@ export function PrintDialog(props: {
disabled={pages().length === 0 || !!progress()}
onClick={() => fireAndForget(savePdf(), 'pptx-print')}
>
- <FilePdf />
+ <FilePdf class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Save as PDF
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
data-testid="pptx-print-go"
disabled={pages().length === 0 || !!progress()}
onClick={() => fireAndForget(print(), 'pptx-print')}
>
- <Printer />
+ <Printer class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Print
</Button>
</div>
diff --git a/apps/web/src/features/block-pptx/components/rename-layout-dialog.tsx b/apps/web/src/features/block-pptx/components/rename-layout-dialog.tsx
index 6a3b779e06..d66574ec0c 100644
--- a/apps/web/src/features/block-pptx/components/rename-layout-dialog.tsx
+++ b/apps/web/src/features/block-pptx/components/rename-layout-dialog.tsx
@@ -54,7 +54,7 @@ export function RenameLayoutDialog(props: {
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
type="submit"
data-testid="pptx-rename-layout-ok"
>
@@ -62,13 +62,14 @@ export function RenameLayoutDialog(props: {
</Button>
</div>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
class="absolute top-3 right-3"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</form>
</Dialog>
diff --git a/apps/web/src/features/block-pptx/components/ribbon/animations-tab.tsx b/apps/web/src/features/block-pptx/components/ribbon/animations-tab.tsx
index 3d03c27e16..d463f2310d 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/animations-tab.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/animations-tab.tsx
@@ -171,7 +171,7 @@ export function AnimationsTab() {
<>
<RibbonGroup label="Preview">
<RibbonTextButton
- label="Preview"
+ aria-label="Preview"
tooltip="Preview the slide's animations"
data-testid="pptx-animation-preview"
disabled={!env.slide()?.animations?.length}
@@ -304,8 +304,8 @@ export function AnimationsTab() {
)}
</RibbonPopover>
<RibbonTextButton
- label="Animation pane"
- variant={anim.pane() ? 'accent' : 'ghost'}
+ aria-label="Animation pane"
+ variant={anim.pane() ? 'primary' : 'ghost'}
aria-pressed={anim.pane()}
data-testid="pptx-animation-pane-toggle"
onClick={anim.togglePane}
@@ -379,7 +379,7 @@ export function AnimationsTab() {
}
/>
<RibbonButton
- label="Move earlier"
+ aria-label="Move earlier"
tooltip="Move Earlier"
data-testid="pptx-animation-earlier"
disabled={ro() || (anim.current() ?? 0) === 0}
@@ -395,7 +395,7 @@ export function AnimationsTab() {
<ArrowUp />
</RibbonButton>
<RibbonButton
- label="Move later"
+ aria-label="Move later"
tooltip="Move Later"
data-testid="pptx-animation-later"
disabled={
diff --git a/apps/web/src/features/block-pptx/components/ribbon/controls.tsx b/apps/web/src/features/block-pptx/components/ribbon/controls.tsx
index 13cacd5a4f..65a494d3f0 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/controls.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/controls.tsx
@@ -18,15 +18,14 @@ import {
} from 'solid-js';
import type { Swatch } from '../../core/palette';
-/** An icon button; `active` shows a pressed state. */
-export function RibbonButton(props: ButtonProps & { active?: boolean }) {
- const [local, rest] = splitProps(props, ['active', 'class']);
+/** An icon button; `aria-pressed` shows a pressed state. */
+export function RibbonButton(props: ButtonProps) {
+ const [local, rest] = splitProps(props, ['aria-pressed', 'class']);
return (
<Button
- variant={local.active ? 'accent' : 'ghost'}
+ variant={local['aria-pressed'] ? 'primary' : 'ghost'}
size="icon-sm"
- square
- aria-pressed={local.active === undefined ? undefined : local.active}
+ aria-pressed={local['aria-pressed']}
class={cn('size-7 rounded-md p-1', local.class)}
{...rest}
/>
@@ -39,8 +38,7 @@ export function RibbonTextButton(props: ButtonProps) {
return (
<Button
variant="ghost"
- size="sm"
- square
+ size="icon-sm"
class={cn('h-7 gap-1 rounded-md px-1.5 text-xs', local.class)}
{...rest}
/>
@@ -83,12 +81,11 @@ export function RibbonPopover(props: {
gutter={4}
>
<Popover.Trigger
+ aria-label={props.label}
as={Button}
variant="ghost"
- size="sm"
- square
+ size="icon-sm"
class="h-7 gap-0.5 rounded-md px-1.5 text-xs"
- label={props.label}
tooltip={props.label}
disabled={props.disabled}
data-testid={props.testId}
diff --git a/apps/web/src/features/block-pptx/components/ribbon/deck-setup-controls.tsx b/apps/web/src/features/block-pptx/components/ribbon/deck-setup-controls.tsx
index 504dac87c2..284ca4e8f2 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/deck-setup-controls.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/deck-setup-controls.tsx
@@ -61,7 +61,7 @@ export function HeaderFooterButtons() {
return (
<Show when={env.deckSetup}>
<RibbonTextButton
- label="Header & Footer"
+ aria-label="Header & Footer"
disabled={env.readonly()}
data-testid="pptx-insert-header-footer"
onClick={open}
@@ -70,7 +70,7 @@ export function HeaderFooterButtons() {
Header & Footer
</RibbonTextButton>
<RibbonTextButton
- label="Date & Time"
+ aria-label="Date & Time"
disabled={env.readonly()}
data-testid="pptx-insert-date-time"
onClick={open}
@@ -79,7 +79,7 @@ export function HeaderFooterButtons() {
Date & Time
</RibbonTextButton>
<RibbonTextButton
- label="Slide Number"
+ aria-label="Slide Number"
disabled={env.readonly()}
data-testid="pptx-insert-slide-number"
onClick={open}
diff --git a/apps/web/src/features/block-pptx/components/ribbon/equation-tab.tsx b/apps/web/src/features/block-pptx/components/ribbon/equation-tab.tsx
index bdf8fef3ea..c3d5cb6f7c 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/equation-tab.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/equation-tab.tsx
@@ -167,7 +167,7 @@ export function EquationTab(props: {
)}
</RibbonPopover>
<RibbonTextButton
- label="Linear format"
+ aria-label="Linear format"
tooltip="Edit the equation as linear (LaTeX) text"
data-testid="pptx-equation-linear"
disabled={props.readonly}
@@ -177,7 +177,7 @@ export function EquationTab(props: {
Linear
</RibbonTextButton>
<RibbonTextButton
- label="Display"
+ aria-label="Display"
tooltip="Put the equation on its own line (display) or inline"
aria-pressed={eq.display()}
class={eq.display() ? 'bg-accent-bg text-accent' : undefined}
diff --git a/apps/web/src/features/block-pptx/components/ribbon/home-tab.tsx b/apps/web/src/features/block-pptx/components/ribbon/home-tab.tsx
index 90d5cf8711..89ef159ca1 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/home-tab.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/home-tab.tsx
@@ -400,7 +400,7 @@ export function HomeTab() {
<>
<RibbonGroup label="Clipboard">
<RibbonButton
- label="Paste"
+ aria-label="Paste"
tooltip="Paste (⌘V)"
disabled={ro()}
onClick={env.paste}
@@ -408,21 +408,21 @@ export function HomeTab() {
<ClipboardIcon />
</RibbonButton>
<RibbonButton
- label="Cut"
+ aria-label="Cut"
tooltip="Cut (⌘X)"
disabled={ro()}
onClick={env.cut}
>
<Scissors />
</RibbonButton>
- <RibbonButton label="Copy" tooltip="Copy (⌘C)" onClick={env.copy}>
+ <RibbonButton aria-label="Copy" tooltip="Copy (⌘C)" onClick={env.copy}>
<CopyIcon />
</RibbonButton>
<RibbonButton
- label="Format Painter"
+ aria-label="Format Painter"
tooltip="Format Painter: click to paint once, double-click to keep painting (⇧⌘C / ⇧⌘V)"
disabled={ro() || env.selection().length === 0}
- active={env.formatPainter.active()}
+ aria-pressed={env.formatPainter.active()}
data-testid="pptx-format-painter"
onClick={() => {
if (env.formatPainter.active()) env.formatPainter.cancel();
@@ -437,7 +437,7 @@ export function HomeTab() {
</RibbonGroup>
<RibbonGroup label="Slides">
<RibbonTextButton
- label="New slide"
+ aria-label="New slide"
tooltip="New slide (⌘M)"
disabled={ro()}
data-testid="pptx-new-slide"
@@ -493,7 +493,7 @@ export function HomeTab() {
</RibbonPopover>
<SectionMenu />
<RibbonButton
- label="Duplicate slide"
+ aria-label="Duplicate slide"
tooltip="Duplicate slide"
disabled={ro()}
onClick={() => fireAndForget(c.duplicateSlide(), 'pptx-editor')}
@@ -501,7 +501,7 @@ export function HomeTab() {
<CopySimple />
</RibbonButton>
<RibbonButton
- label="Delete slide"
+ aria-label="Delete slide"
tooltip="Delete slide"
disabled={ro() || (env.deck()?.slides.length ?? 0) <= 1}
onClick={() => {
@@ -526,7 +526,7 @@ export function HomeTab() {
onPick={(size) => fireAndForget(c.setFontSize(size), 'pptx-editor')}
/>
<RibbonButton
- label="Increase font size"
+ aria-label="Increase font size"
tooltip="Increase font size (⇧⌘>)"
disabled={!text()}
onClick={() => fireAndForget(c.stepSize(1), 'pptx-editor')}
@@ -536,7 +536,7 @@ export function HomeTab() {
</span>
</RibbonButton>
<RibbonButton
- label="Decrease font size"
+ aria-label="Decrease font size"
tooltip="Decrease font size (⇧⌘<)"
disabled={!text()}
onClick={() => fireAndForget(c.stepSize(-1), 'pptx-editor')}
@@ -546,7 +546,7 @@ export function HomeTab() {
</span>
</RibbonButton>
<RibbonButton
- label="Clear formatting"
+ aria-label="Clear formatting"
tooltip="Clear all formatting"
disabled={!text()}
onClick={() => fireAndForget(c.clearFormatting(), 'pptx-editor')}
@@ -554,47 +554,47 @@ export function HomeTab() {
<Eraser />
</RibbonButton>
<RibbonButton
- label="Bold"
+ aria-label="Bold"
tooltip="Bold (⌘B)"
data-testid="pptx-bold"
disabled={!text()}
- active={text() && f().bold}
+ aria-pressed={text() && f().bold}
onClick={() => fireAndForget(c.toggle('bold'), 'pptx-editor')}
>
<TextB />
</RibbonButton>
<RibbonButton
- label="Italic"
+ aria-label="Italic"
tooltip="Italic (⌘I)"
disabled={!text()}
- active={text() && f().italic}
+ aria-pressed={text() && f().italic}
onClick={() => fireAndForget(c.toggle('italic'), 'pptx-editor')}
>
<TextItalic />
</RibbonButton>
<RibbonButton
- label="Underline"
+ aria-label="Underline"
tooltip="Underline (⌘U)"
disabled={!text()}
- active={text() && f().underline}
+ aria-pressed={text() && f().underline}
onClick={() => fireAndForget(c.toggle('underline'), 'pptx-editor')}
>
<TextUnderline />
</RibbonButton>
<RibbonButton
- label="Strikethrough"
+ aria-label="Strikethrough"
tooltip="Strikethrough"
disabled={!text()}
- active={text() && f().strike}
+ aria-pressed={text() && f().strike}
onClick={() => fireAndForget(c.toggle('strike'), 'pptx-editor')}
>
<TextStrikethrough />
</RibbonButton>
<RibbonButton
- label="Superscript"
+ aria-label="Superscript"
tooltip="Superscript (⇧⌘=)"
disabled={!text()}
- active={text() && (f().baseline ?? 0) > 0}
+ aria-pressed={text() && (f().baseline ?? 0) > 0}
onClick={() =>
fireAndForget(c.toggleBaseline('super'), 'pptx-editor')
}
@@ -602,10 +602,10 @@ export function HomeTab() {
<TextSuperscript />
</RibbonButton>
<RibbonButton
- label="Subscript"
+ aria-label="Subscript"
tooltip="Subscript (⌘=)"
disabled={!text()}
- active={text() && (f().baseline ?? 0) < 0}
+ aria-pressed={text() && (f().baseline ?? 0) < 0}
onClick={() => fireAndForget(c.toggleBaseline('sub'), 'pptx-editor')}
>
<TextSubscript />
@@ -698,10 +698,10 @@ export function HomeTab() {
</RibbonGroup>
<RibbonGroup label="Paragraph">
<RibbonButton
- label="Bullets"
+ aria-label="Bullets"
tooltip="Bullets"
disabled={!text()}
- active={text() && f().bullet}
+ aria-pressed={text() && f().bullet}
onClick={() => fireAndForget(c.toggleBullets(), 'pptx-editor')}
>
<ListBullets />
@@ -739,7 +739,7 @@ export function HomeTab() {
)}
</RibbonPopover>
<RibbonButton
- label="Numbering"
+ aria-label="Numbering"
tooltip="Numbering"
disabled={!text()}
onClick={() => fireAndForget(c.toggleNumbering(), 'pptx-editor')}
@@ -776,7 +776,7 @@ export function HomeTab() {
)}
</RibbonPopover>
<RibbonButton
- label="Decrease list level"
+ aria-label="Decrease list level"
tooltip="Decrease list level (⇧Tab)"
disabled={!text()}
onClick={() => fireAndForget(c.indent(-1), 'pptx-editor')}
@@ -784,7 +784,7 @@ export function HomeTab() {
<TextOutdent />
</RibbonButton>
<RibbonButton
- label="Increase list level"
+ aria-label="Increase list level"
tooltip="Increase list level (Tab)"
disabled={!text()}
onClick={() => fireAndForget(c.indent(1), 'pptx-editor')}
@@ -831,10 +831,10 @@ export function HomeTab() {
>
{([value, label, Icon]) => (
<RibbonButton
- label={label.split(' (')[0]}
+ aria-label={label.split(' (')[0]}
tooltip={label}
disabled={!text()}
- active={text() && f().align === value}
+ aria-pressed={text() && f().align === value}
onClick={() => fireAndForget(c.align(value), 'pptx-editor')}
>
<Icon />
@@ -924,14 +924,14 @@ export function HomeTab() {
</RibbonGroup>
<RibbonGroup label="Editing">
<RibbonButton
- label="Find"
+ aria-label="Find"
tooltip="Find (⌘F)"
onClick={() => env.find(false)}
>
<MagnifyingGlass />
</RibbonButton>
<RibbonTextButton
- label="Replace"
+ aria-label="Replace"
tooltip="Replace (⌘H)"
disabled={ro()}
onClick={() => env.find(true)}
@@ -939,7 +939,7 @@ export function HomeTab() {
Replace
</RibbonTextButton>
<RibbonButton
- label="Select all"
+ aria-label="Select all"
tooltip="Select all (⌘A)"
onClick={() => c.selectAll()}
>
diff --git a/apps/web/src/features/block-pptx/components/ribbon/insert-tab.tsx b/apps/web/src/features/block-pptx/components/ribbon/insert-tab.tsx
index 95d5c7d133..2fa71da568 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/insert-tab.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/insert-tab.tsx
@@ -87,7 +87,7 @@ export function InsertTab(props: {
<>
<RibbonGroup label="Slides">
<RibbonTextButton
- label="New slide"
+ aria-label="New slide"
disabled={ro()}
onClick={() => fireAndForget(c.addSlide(), 'pptx-editor')}
>
@@ -136,7 +136,7 @@ export function InsertTab(props: {
</RibbonGroup>
<RibbonGroup label="Images">
<RibbonTextButton
- label="Pictures"
+ aria-label="Pictures"
disabled={ro()}
onClick={() => fileInput.click()}
>
@@ -195,7 +195,7 @@ export function InsertTab(props: {
) : null}
{props.onSmartArt ? (
<RibbonTextButton
- label="SmartArt"
+ aria-label="SmartArt"
tooltip="Insert a SmartArt graphic"
disabled={ro()}
data-testid="pptx-insert-smartart"
@@ -208,7 +208,7 @@ export function InsertTab(props: {
</RibbonGroup>
<RibbonGroup label="Media">
<RibbonTextButton
- label="Video"
+ aria-label="Video"
tooltip="Insert a video from this device"
disabled={ro()}
data-testid="pptx-insert-video"
@@ -218,7 +218,7 @@ export function InsertTab(props: {
Video
</RibbonTextButton>
<RibbonTextButton
- label="Audio"
+ aria-label="Audio"
tooltip="Insert audio from this device"
disabled={ro()}
data-testid="pptx-insert-audio"
@@ -256,7 +256,7 @@ export function InsertTab(props: {
</RibbonGroup>
<RibbonGroup label="Comments">
<RibbonTextButton
- label="Comment"
+ aria-label="Comment"
tooltip="New Comment (Ctrl+Alt+M)"
disabled={ro() || !env.review}
data-testid="pptx-insert-comment"
@@ -268,7 +268,7 @@ export function InsertTab(props: {
</RibbonGroup>
<RibbonGroup label="Text">
<RibbonTextButton
- label="Text box"
+ aria-label="Text box"
disabled={ro()}
data-testid="pptx-insert-textbox"
onClick={() => fireAndForget(c.insertTextBox(), 'pptx-editor')}
@@ -278,7 +278,7 @@ export function InsertTab(props: {
</RibbonTextButton>
<HeaderFooterButtons />
<RibbonTextButton
- label="Link"
+ aria-label="Link"
tooltip="Insert link (⌘K)"
data-testid="pptx-insert-link"
disabled={ro() || (!c.textActive() && env.selection().length === 0)}
@@ -292,7 +292,7 @@ export function InsertTab(props: {
{(equation) => (
<RibbonGroup label="Symbols">
<RibbonTextButton
- label="Equation"
+ aria-label="Equation"
tooltip="Insert an equation (Alt+=)"
data-testid="pptx-insert-equation"
disabled={ro()}
diff --git a/apps/web/src/features/block-pptx/components/ribbon/other-tabs.tsx b/apps/web/src/features/block-pptx/components/ribbon/other-tabs.tsx
index b95476e3d1..46266f4141 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/other-tabs.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/other-tabs.tsx
@@ -78,7 +78,7 @@ export function DesignTab() {
)}
</RibbonPopover>
<RibbonTextButton
- label="Format background"
+ aria-label="Format background"
disabled={ro()}
onClick={() => env.openFormatPane('background')}
>
@@ -237,7 +237,7 @@ export function SlideShowTab() {
<>
<RibbonGroup label="Start slide show">
<RibbonTextButton
- label="From beginning"
+ aria-label="From beginning"
tooltip="From beginning (F5)"
data-testid="pptx-present-start"
onClick={() => env.present(false)}
@@ -246,7 +246,7 @@ export function SlideShowTab() {
From beginning
</RibbonTextButton>
<RibbonTextButton
- label="From current slide"
+ aria-label="From current slide"
tooltip="From current slide (⇧F5)"
onClick={() => env.present(true)}
>
@@ -254,7 +254,7 @@ export function SlideShowTab() {
From current slide
</RibbonTextButton>
<RibbonTextButton
- label="Presenter view"
+ aria-label="Presenter view"
tooltip="Presenter view: notes, next slide, and timer here; the show in a separate window (⌥F5)"
data-testid="pptx-present-presenter"
onClick={() => env.present(true, true)}
@@ -265,7 +265,7 @@ export function SlideShowTab() {
</RibbonGroup>
<RibbonGroup label="Set up">
<RibbonTextButton
- label="Hide slide"
+ aria-label="Hide slide"
disabled={env.readonly()}
onClick={() => {
const s = env.slide();
@@ -291,18 +291,18 @@ export function ViewTab() {
<>
<RibbonGroup label="Presentation views">
<RibbonTextButton
- label="Normal"
+ aria-label="Normal"
aria-pressed={!env.sorter()}
- variant={env.sorter() ? 'ghost' : 'accent'}
+ variant={env.sorter() ? 'ghost' : 'primary'}
onClick={() => env.setSorter(false)}
>
<Rectangle />
Normal
</RibbonTextButton>
<RibbonTextButton
- label="Slide Sorter"
+ aria-label="Slide Sorter"
aria-pressed={env.sorter()}
- variant={env.sorter() ? 'accent' : 'ghost'}
+ variant={env.sorter() ? 'primary' : 'ghost'}
data-testid="pptx-tab-view-sorter"
onClick={() => env.setSorter(true)}
>
@@ -314,7 +314,7 @@ export function ViewTab() {
{(open) => (
<RibbonGroup label="Master views">
<RibbonTextButton
- label="Slide Master"
+ aria-label="Slide Master"
tooltip="Slide Master: edit the slide masters and layouts"
data-testid="pptx-view-slide-master"
onClick={() => open()()}
@@ -327,7 +327,7 @@ export function ViewTab() {
</Show>
<RibbonGroup label="Zoom">
<RibbonButton
- label="Zoom out"
+ aria-label="Zoom out"
tooltip="Zoom out (⌘−)"
onClick={() =>
env.setZoom(Math.max(0.1, (percent() ?? 100) / 100 / 1.25))
@@ -346,7 +346,7 @@ export function ViewTab() {
onCommit={(v) => env.setZoom(v / 100)}
/>
<RibbonButton
- label="Zoom in"
+ aria-label="Zoom in"
tooltip="Zoom in (⌘+)"
onClick={() =>
env.setZoom(Math.min(4, ((percent() ?? 100) / 100) * 1.25))
@@ -355,8 +355,8 @@ export function ViewTab() {
<MagnifyingGlassPlus />
</RibbonButton>
<RibbonTextButton
- label="Fit to window"
- variant={env.zoom() === 'fit' ? 'accent' : 'ghost'}
+ aria-label="Fit to window"
+ variant={env.zoom() === 'fit' ? 'primary' : 'ghost'}
onClick={() => env.setZoom('fit')}
>
<ArrowsOut />
@@ -365,9 +365,9 @@ export function ViewTab() {
</RibbonGroup>
<RibbonGroup label="Show">
<RibbonTextButton
- label="Ruler"
+ aria-label="Ruler"
aria-pressed={view().ruler}
- variant={view().ruler ? 'accent' : 'ghost'}
+ variant={view().ruler ? 'primary' : 'ghost'}
data-testid="pptx-view-ruler"
onClick={() => env.view.set({ ruler: !view().ruler })}
>
@@ -375,9 +375,9 @@ export function ViewTab() {
Ruler
</RibbonTextButton>
<RibbonTextButton
- label="Gridlines"
+ aria-label="Gridlines"
aria-pressed={view().gridlines}
- variant={view().gridlines ? 'accent' : 'ghost'}
+ variant={view().gridlines ? 'primary' : 'ghost'}
data-testid="pptx-view-gridlines"
onClick={() => env.view.set({ gridlines: !view().gridlines })}
>
@@ -385,10 +385,10 @@ export function ViewTab() {
Gridlines
</RibbonTextButton>
<RibbonTextButton
- label="Guides"
+ aria-label="Guides"
tooltip="Guides (⌥F9)"
aria-pressed={view().drawingGuides}
- variant={view().drawingGuides ? 'accent' : 'ghost'}
+ variant={view().drawingGuides ? 'primary' : 'ghost'}
data-testid="pptx-view-guides"
onClick={() => env.view.set({ drawingGuides: !view().drawingGuides })}
>
@@ -469,9 +469,9 @@ export function ViewTab() {
)}
</RibbonPopover>
<RibbonTextButton
- label="Notes"
+ aria-label="Notes"
aria-pressed={env.notesVisible()}
- variant={env.notesVisible() ? 'accent' : 'ghost'}
+ variant={env.notesVisible() ? 'primary' : 'ghost'}
onClick={env.toggleNotes}
>
<Notepad />
@@ -545,7 +545,7 @@ export function ShapeFormatTab() {
</RibbonPopover>
<ShapeEffectsMenu label="Shape effects" testId="pptx-shape-effects" />
<RibbonTextButton
- label="Format pane"
+ aria-label="Format pane"
disabled={ro()}
onClick={() => env.openFormatPane('shape')}
>
@@ -557,7 +557,7 @@ export function ShapeFormatTab() {
</RibbonGroup>
<RibbonGroup label="Arrange">
<RibbonButton
- label="Bring forward"
+ aria-label="Bring forward"
tooltip="Bring forward (⌘])"
disabled={ro()}
onClick={() => c.arrange('forward')}
@@ -565,7 +565,7 @@ export function ShapeFormatTab() {
<ArrowUp />
</RibbonButton>
<RibbonButton
- label="Send backward"
+ aria-label="Send backward"
tooltip="Send backward (⌘[)"
disabled={ro()}
onClick={() => c.arrange('backward')}
@@ -973,7 +973,7 @@ export function TransitionsTab() {
}
/>
<RibbonTextButton
- label="Apply to all"
+ aria-label="Apply to all"
disabled={ro()}
data-testid="pptx-transition-all"
onClick={() =>
diff --git a/apps/web/src/features/block-pptx/components/ribbon/picture-format-tab.tsx b/apps/web/src/features/block-pptx/components/ribbon/picture-format-tab.tsx
index 5252c46e26..ee20d14fa8 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/picture-format-tab.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/picture-format-tab.tsx
@@ -366,14 +366,13 @@ function CropButton(props: { crop: CropMode }) {
data-pptx-crop-toggle
>
<Button
+ aria-label="Crop"
variant="ghost"
- size="sm"
- square
+ size="icon-sm"
class={cn(
'h-7 gap-1 rounded-r-none rounded-l-md px-1.5 text-xs',
props.crop.active() && 'text-accent'
)}
- label="Crop"
tooltip="Crop: drag the black handles; Enter or Esc finishes"
aria-pressed={props.crop.active()}
disabled={disabled()}
@@ -390,12 +389,11 @@ function CropButton(props: { crop: CropMode }) {
gutter={4}
>
<Popover.Trigger
+ aria-label="Crop options"
as={Button}
variant="ghost"
- size="sm"
- square
+ size="icon-sm"
class="h-7 rounded-r-md rounded-l-none px-0.5"
- label="Crop options"
tooltip="Crop to shape, aspect ratio, fill, or fit"
disabled={disabled()}
data-testid="pptx-picture-crop-menu"
@@ -546,7 +544,7 @@ export function PictureFormatTab(props: {
)}
</PictureGalleryMenu>
<RibbonButton
- label="Change picture"
+ aria-label="Change picture"
tooltip="Change picture: keep the size and format, use another image"
disabled={ro() || one()?.kind !== 'picture'}
data-testid="pptx-picture-change"
@@ -600,7 +598,7 @@ export function PictureFormatTab(props: {
</RibbonGroup>
<RibbonGroup label="Accessibility">
<RibbonTextButton
- label="Alt text"
+ aria-label="Alt text"
disabled={ro()}
onClick={() => env.openFormatPane('size')}
>
@@ -609,7 +607,7 @@ export function PictureFormatTab(props: {
</RibbonGroup>
<RibbonGroup label="Arrange">
<RibbonButton
- label="Bring forward"
+ aria-label="Bring forward"
tooltip="Bring forward (⌘])"
disabled={ro()}
onClick={() => c.arrange('forward')}
@@ -617,7 +615,7 @@ export function PictureFormatTab(props: {
<ArrowUp />
</RibbonButton>
<RibbonButton
- label="Send backward"
+ aria-label="Send backward"
tooltip="Send backward (⌘[)"
disabled={ro()}
onClick={() => c.arrange('backward')}
diff --git a/apps/web/src/features/block-pptx/components/ribbon/review-tab.tsx b/apps/web/src/features/block-pptx/components/ribbon/review-tab.tsx
index bceeab2c4c..863e43190e 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/review-tab.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/review-tab.tsx
@@ -40,7 +40,7 @@ export function ReviewTab() {
<>
<RibbonGroup label="Proofing">
<RibbonTextButton
- label="Spelling"
+ aria-label="Spelling"
tooltip="Spelling (F7)"
disabled={ro()}
data-testid="pptx-review-spelling"
@@ -52,7 +52,7 @@ export function ReviewTab() {
</RibbonGroup>
<RibbonGroup label="Comments">
<RibbonTextButton
- label="New Comment"
+ aria-label="New Comment"
tooltip="New Comment (Ctrl+Alt+M)"
disabled={ro()}
data-testid="pptx-review-new-comment"
@@ -103,7 +103,7 @@ export function ReviewTab() {
)}
</RibbonPopover>
<RibbonTextButton
- label="Previous"
+ aria-label="Previous"
tooltip="Previous comment"
disabled={c().count() === 0}
data-testid="pptx-review-previous"
@@ -113,7 +113,7 @@ export function ReviewTab() {
Previous
</RibbonTextButton>
<RibbonTextButton
- label="Next"
+ aria-label="Next"
tooltip="Next comment"
disabled={c().count() === 0}
data-testid="pptx-review-next"
@@ -123,7 +123,7 @@ export function ReviewTab() {
Next
</RibbonTextButton>
<RibbonTextButton
- label="Show Comments"
+ aria-label="Show Comments"
tooltip="Show the Comments pane"
aria-pressed={c().paneOpen()}
data-testid="pptx-review-show-comments"
diff --git a/apps/web/src/features/block-pptx/components/ribbon/slide-master-tab.tsx b/apps/web/src/features/block-pptx/components/ribbon/slide-master-tab.tsx
index 3c29ea53d0..ba86b64f7e 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/slide-master-tab.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/slide-master-tab.tsx
@@ -83,7 +83,7 @@ export function SlideMasterTab(props: { master: MasterView }) {
<>
<RibbonGroup label="Edit Master">
<RibbonTextButton
- label="Insert Layout"
+ aria-label="Insert Layout"
tooltip="Insert Layout: add a layout to the slide master"
disabled={ro() || !m.page()}
data-testid="pptx-master-insert-layout"
@@ -93,7 +93,7 @@ export function SlideMasterTab(props: { master: MasterView }) {
Insert Layout
</RibbonTextButton>
<RibbonTextButton
- label="Delete"
+ aria-label="Delete"
tooltip={
m.deleteBlocker() ??
(layout() ? 'Delete this layout' : 'Delete this slide master')
@@ -106,7 +106,7 @@ export function SlideMasterTab(props: { master: MasterView }) {
Delete
</RibbonTextButton>
<RibbonTextButton
- label="Rename"
+ aria-label="Rename"
tooltip={layout() ? 'Rename this layout' : 'Rename this slide master'}
disabled={ro() || !m.page()}
data-testid="pptx-master-rename"
@@ -174,7 +174,7 @@ export function SlideMasterTab(props: { master: MasterView }) {
<ThemeFontsMenu />
<BackgroundStylesMenu master={m} />
<RibbonTextButton
- label="Format Background"
+ aria-label="Format Background"
tooltip="Format the background of this master or layout"
disabled={ro()}
data-testid="pptx-master-format-background"
@@ -200,9 +200,9 @@ export function SlideMasterTab(props: { master: MasterView }) {
<SlideSizeGroup />
<RibbonGroup label="Close">
<RibbonTextButton
- label="Close Master View"
+ aria-label="Close Master View"
tooltip="Close Master View: back to editing slides"
- variant="accent"
+ variant="primary"
data-testid="pptx-master-close"
onClick={() => fireAndForget(m.close(), 'pptx-editor')}
>
diff --git a/apps/web/src/features/block-pptx/components/ribbon/table-tabs.tsx b/apps/web/src/features/block-pptx/components/ribbon/table-tabs.tsx
index 75148c84f7..0ac079a24d 100644
--- a/apps/web/src/features/block-pptx/components/ribbon/table-tabs.tsx
+++ b/apps/web/src/features/block-pptx/components/ribbon/table-tabs.tsx
@@ -346,7 +346,7 @@ export function TableLayoutTab(props: TableTabProps) {
)}
</RibbonPopover>
<RibbonTextButton
- label="Insert above"
+ aria-label="Insert above"
disabled={ro()}
data-testid="pptx-insert-row-above"
onClick={() => fireAndForget(c.insertRows('above'), 'pptx-editor')}
@@ -354,7 +354,7 @@ export function TableLayoutTab(props: TableTabProps) {
Insert above
</RibbonTextButton>
<RibbonTextButton
- label="Insert below"
+ aria-label="Insert below"
disabled={ro()}
data-testid="pptx-insert-row-below"
onClick={() => fireAndForget(c.insertRows('below'), 'pptx-editor')}
@@ -362,14 +362,14 @@ export function TableLayoutTab(props: TableTabProps) {
Insert below
</RibbonTextButton>
<RibbonTextButton
- label="Insert left"
+ aria-label="Insert left"
disabled={ro()}
onClick={() => fireAndForget(c.insertColumns('left'), 'pptx-editor')}
>
Insert left
</RibbonTextButton>
<RibbonTextButton
- label="Insert right"
+ aria-label="Insert right"
disabled={ro()}
data-testid="pptx-insert-col-right"
onClick={() => fireAndForget(c.insertColumns('right'), 'pptx-editor')}
@@ -379,7 +379,7 @@ export function TableLayoutTab(props: TableTabProps) {
</RibbonGroup>
<RibbonGroup label="Merge">
<RibbonTextButton
- label="Merge cells"
+ aria-label="Merge cells"
disabled={ro() || !c.canMerge()}
data-testid="pptx-merge-cells"
onClick={() => fireAndForget(c.mergeCells(), 'pptx-editor')}
@@ -387,7 +387,7 @@ export function TableLayoutTab(props: TableTabProps) {
Merge cells
</RibbonTextButton>
<RibbonTextButton
- label="Split cells"
+ aria-label="Split cells"
disabled={ro() || !c.canSplit()}
onClick={() => fireAndForget(c.splitCells(), 'pptx-editor')}
>
@@ -414,14 +414,14 @@ export function TableLayoutTab(props: TableTabProps) {
onCommit={(w) => fireAndForget(c.setCellSize({ w }), 'pptx-editor')}
/>
<RibbonTextButton
- label="Distribute rows"
+ aria-label="Distribute rows"
disabled={ro()}
onClick={() => fireAndForget(c.distributeRows(), 'pptx-editor')}
>
Distribute rows
</RibbonTextButton>
<RibbonTextButton
- label="Distribute columns"
+ aria-label="Distribute columns"
disabled={ro()}
onClick={() => fireAndForget(c.distributeColumns(), 'pptx-editor')}
>
@@ -430,7 +430,7 @@ export function TableLayoutTab(props: TableTabProps) {
</RibbonGroup>
<RibbonGroup label="Alignment">
<RibbonButton
- label="Align left"
+ aria-label="Align left"
tooltip="Align left"
disabled={ro()}
onClick={() => fireAndForget(c.alignCells('left'), 'pptx-editor')}
@@ -438,7 +438,7 @@ export function TableLayoutTab(props: TableTabProps) {
<TextAlignLeft />
</RibbonButton>
<RibbonButton
- label="Center"
+ aria-label="Center"
tooltip="Center"
disabled={ro()}
onClick={() => fireAndForget(c.alignCells('center'), 'pptx-editor')}
@@ -446,7 +446,7 @@ export function TableLayoutTab(props: TableTabProps) {
<TextAlignCenter />
</RibbonButton>
<RibbonButton
- label="Align right"
+ aria-label="Align right"
tooltip="Align right"
disabled={ro()}
onClick={() => fireAndForget(c.alignCells('right'), 'pptx-editor')}
@@ -454,7 +454,7 @@ export function TableLayoutTab(props: TableTabProps) {
<TextAlignRight />
</RibbonButton>
<RibbonButton
- label="Align top"
+ aria-label="Align top"
tooltip="Align top"
disabled={ro()}
onClick={() => fireAndForget(c.anchorCells('top'), 'pptx-editor')}
@@ -462,7 +462,7 @@ export function TableLayoutTab(props: TableTabProps) {
<AlignTop />
</RibbonButton>
<RibbonButton
- label="Center vertically"
+ aria-label="Center vertically"
tooltip="Center vertically"
disabled={ro()}
onClick={() => fireAndForget(c.anchorCells('middle'), 'pptx-editor')}
@@ -470,7 +470,7 @@ export function TableLayoutTab(props: TableTabProps) {
<AlignCenterVertical />
</RibbonButton>
<RibbonButton
- label="Align bottom"
+ aria-label="Align bottom"
tooltip="Align bottom"
disabled={ro()}
onClick={() => fireAndForget(c.anchorCells('bottom'), 'pptx-editor')}
diff --git a/apps/web/src/features/block-pptx/components/selection-pane.tsx b/apps/web/src/features/block-pptx/components/selection-pane.tsx
index e63776989c..c236cc65fb 100644
--- a/apps/web/src/features/block-pptx/components/selection-pane.tsx
+++ b/apps/web/src/features/block-pptx/components/selection-pane.tsx
@@ -228,12 +228,13 @@ export function SelectionPane(props: {
<div class="flex h-9 items-center justify-between border-edge-muted border-b px-3">
<span class="font-semibold text-ink text-sm">Selection</span>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="flex items-center gap-1 border-edge-muted border-b px-2 py-1.5">
@@ -257,9 +258,9 @@ export function SelectionPane(props: {
</Button>
<div class="flex-1" />
<Button
+ aria-label="Bring forward"
size="icon-sm"
variant="ghost"
- label="Bring forward"
tooltip="Bring Forward"
data-testid="pptx-selection-forward"
disabled={
@@ -272,12 +273,12 @@ export function SelectionPane(props: {
if (id !== undefined) props.onMove(id, 1);
}}
>
- <ArrowUp />
+ <ArrowUp class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Send backward"
size="icon-sm"
variant="ghost"
- label="Send backward"
tooltip="Send Backward"
data-testid="pptx-selection-backward"
disabled={ro() || !position() || position()!.index === 0}
@@ -286,7 +287,7 @@ export function SelectionPane(props: {
if (id !== undefined) props.onMove(id, -1);
}}
>
- <ArrowDown />
+ <ArrowDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div
diff --git a/apps/web/src/features/block-pptx/components/slide-rail.tsx b/apps/web/src/features/block-pptx/components/slide-rail.tsx
index b49b24ffae..b930f18999 100644
--- a/apps/web/src/features/block-pptx/components/slide-rail.tsx
+++ b/apps/web/src/features/block-pptx/components/slide-rail.tsx
@@ -297,32 +297,36 @@ export function SlideRail(props: SlideRailProps) {
<Show when={!props.readonly && !props.grid}>
<div class="absolute top-1 right-1 hidden flex-col gap-0.5 rounded-md bg-surface/90 p-0.5 shadow group-hover:flex group-focus-within:flex">
<Button
+ aria-label="Duplicate slide"
size="icon-xs"
variant="ghost"
- label="Duplicate slide"
tooltip="Duplicate slide"
onClick={() => props.onDuplicate(slide.id)}
>
- <CopyIcon />
+ <CopyIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label={slide.hidden ? 'Show slide' : 'Hide slide'}
size="icon-xs"
variant="ghost"
- label={slide.hidden ? 'Show slide' : 'Hide slide'}
tooltip={slide.hidden ? 'Show slide' : 'Hide slide'}
onClick={() => props.onToggleHidden(slide)}
>
- {slide.hidden ? <EyeIcon /> : <EyeSlashIcon />}
+ {slide.hidden ? (
+ <EyeIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
+ ) : (
+ <EyeSlashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
<Show when={props.slides.length > 1}>
<Button
+ aria-label="Delete slide"
size="icon-xs"
variant="ghost"
- label="Delete slide"
tooltip="Delete slide"
onClick={() => props.onDelete([slide.id])}
>
- <TrashIcon />
+ <TrashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -348,13 +352,14 @@ export function SlideRail(props: SlideRailProps) {
<Show when={!props.readonly && !props.grid}>
<div class="border-edge-muted border-t p-2">
<Button
+ aria-label="New slide"
+ tooltip="New slide"
size="sm"
- variant="outline"
+ variant="secondary"
class="w-full"
onClick={props.onAdd}
- label="New slide"
>
- <PlusIcon />
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
New slide
</Button>
</div>
diff --git a/apps/web/src/features/block-pptx/components/slide-size-dialog.tsx b/apps/web/src/features/block-pptx/components/slide-size-dialog.tsx
index fcaae1e888..047bc7c816 100644
--- a/apps/web/src/features/block-pptx/components/slide-size-dialog.tsx
+++ b/apps/web/src/features/block-pptx/components/slide-size-dialog.tsx
@@ -239,7 +239,7 @@ export function SlideSizeDialog(props: {
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
type="submit"
data-testid="pptx-slide-size-ok"
>
@@ -247,13 +247,14 @@ export function SlideSizeDialog(props: {
</Button>
</div>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
class="absolute top-3 right-3"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</form>
</Dialog>
diff --git a/apps/web/src/features/block-pptx/components/smartart/smartart-dialog.tsx b/apps/web/src/features/block-pptx/components/smartart/smartart-dialog.tsx
index 561942bcb6..b939474cef 100644
--- a/apps/web/src/features/block-pptx/components/smartart/smartart-dialog.tsx
+++ b/apps/web/src/features/block-pptx/components/smartart/smartart-dialog.tsx
@@ -165,7 +165,7 @@ export function SmartArtDialog(props: {
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
data-testid="pptx-smartart-ok"
disabled={!current()}
onClick={ok}
@@ -174,13 +174,14 @@ export function SmartArtDialog(props: {
</Button>
</div>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
class="absolute top-3 right-3"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Dialog>
diff --git a/apps/web/src/features/block-pptx/components/smartart/smartart-tabs.tsx b/apps/web/src/features/block-pptx/components/smartart/smartart-tabs.tsx
index 8346caa8e8..63c62c0647 100644
--- a/apps/web/src/features/block-pptx/components/smartart/smartart-tabs.tsx
+++ b/apps/web/src/features/block-pptx/components/smartart/smartart-tabs.tsx
@@ -158,7 +158,7 @@ export function SmartArtDesignTab(props: { smartArt: SmartArtState }) {
)}
</RibbonPopover>
<RibbonTextButton
- label="Text Pane"
+ aria-label="Text Pane"
tooltip="Show or hide the Text Pane"
aria-pressed={s().pane.open()}
class={s().pane.open() ? 'bg-accent-bg text-accent' : undefined}
@@ -169,7 +169,7 @@ export function SmartArtDesignTab(props: { smartArt: SmartArtState }) {
Text Pane
</RibbonTextButton>
<RibbonButton
- label="Promote"
+ aria-label="Promote"
tooltip="Promote"
data-testid="pptx-smartart-promote"
disabled={!supported() || !canPromote(lines(), index())}
@@ -178,7 +178,7 @@ export function SmartArtDesignTab(props: { smartArt: SmartArtState }) {
<TextOutdent />
</RibbonButton>
<RibbonButton
- label="Demote"
+ aria-label="Demote"
tooltip="Demote"
data-testid="pptx-smartart-demote"
disabled={!supported() || !canDemote(lines(), index())}
@@ -187,7 +187,7 @@ export function SmartArtDesignTab(props: { smartArt: SmartArtState }) {
<TextIndent />
</RibbonButton>
<RibbonButton
- label="Move Up"
+ aria-label="Move Up"
tooltip="Move Up"
data-testid="pptx-smartart-move-up"
disabled={!supported() || index() < 0}
@@ -196,7 +196,7 @@ export function SmartArtDesignTab(props: { smartArt: SmartArtState }) {
<ArrowUp />
</RibbonButton>
<RibbonButton
- label="Move Down"
+ aria-label="Move Down"
tooltip="Move Down"
data-testid="pptx-smartart-move-down"
disabled={!supported() || index() < 0}
@@ -311,7 +311,7 @@ export function SmartArtDesignTab(props: { smartArt: SmartArtState }) {
</RibbonGroup>
<RibbonGroup label="Reset">
<RibbonTextButton
- label="Reset Graphic"
+ aria-label="Reset Graphic"
tooltip="Discard formatting changes to the graphic"
data-testid="pptx-smartart-reset"
disabled={!supported()}
diff --git a/apps/web/src/features/block-pptx/components/spelling-pane.tsx b/apps/web/src/features/block-pptx/components/spelling-pane.tsx
index 0340cd50df..0b9a36b690 100644
--- a/apps/web/src/features/block-pptx/components/spelling-pane.tsx
+++ b/apps/web/src/features/block-pptx/components/spelling-pane.tsx
@@ -26,12 +26,13 @@ export function SpellingPane(props: {
<div class="flex h-9 items-center justify-between border-edge-muted border-b px-3">
<span class="font-semibold text-ink text-sm">Spelling</span>
<Button
+ aria-label="Close"
+ tooltip="Close"
size="icon-sm"
variant="ghost"
- label="Close"
onClick={props.onClose}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<Show
@@ -45,7 +46,7 @@ export function SpellingPane(props: {
<span>Spell check complete. You're good to go!</span>
<Button
size="sm"
- variant="accent"
+ variant="primary"
data-testid="pptx-spelling-ok"
onClick={props.onClose}
>
@@ -65,7 +66,7 @@ export function SpellingPane(props: {
<div class="flex flex-wrap gap-1">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={noAction()}
data-testid="pptx-spelling-ignore-once"
onClick={() => fireAndForget(p.ignoreOnce(), 'pptx-spelling')}
@@ -74,7 +75,7 @@ export function SpellingPane(props: {
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={noAction()}
data-testid="pptx-spelling-ignore-all"
onClick={() => fireAndForget(p.ignoreAll(), 'pptx-spelling')}
@@ -83,7 +84,7 @@ export function SpellingPane(props: {
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={noAction()}
data-testid="pptx-spelling-add"
onClick={() => fireAndForget(p.add(), 'pptx-spelling')}
@@ -133,7 +134,7 @@ export function SpellingPane(props: {
<div class="flex gap-1">
<Button
size="sm"
- variant="accent"
+ variant="primary"
disabled={noAction() || !p.choice()}
data-testid="pptx-spelling-change"
onClick={() => fireAndForget(p.change(), 'pptx-spelling')}
@@ -142,7 +143,7 @@ export function SpellingPane(props: {
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={noAction() || !p.choice()}
data-testid="pptx-spelling-change-all"
onClick={() => fireAndForget(p.changeAll(), 'pptx-spelling')}
diff --git a/apps/web/src/features/block-pptx/pptx-block.tsx b/apps/web/src/features/block-pptx/pptx-block.tsx
index 0063159ea3..2f452a04c0 100644
--- a/apps/web/src/features/block-pptx/pptx-block.tsx
+++ b/apps/web/src/features/block-pptx/pptx-block.tsx
@@ -239,8 +239,8 @@ function DownloadOnly(props: { onDownload: () => void }): JSX.Element {
return (
<div class="flex size-full flex-col items-center justify-center gap-3 p-6 text-ink-muted text-sm">
Presentations can't be previewed here yet.
- <Button variant="outline" size="sm" onClick={props.onDownload}>
- <DownloadSimple />
+ <Button variant="secondary" size="sm" onClick={props.onDownload}>
+ <DownloadSimple class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Download
</Button>
</div>
@@ -303,6 +303,7 @@ export default function PptxBlock(props: { share?: string }) {
<div class="order-[999] flex items-center">
<HeaderActionGroup label="Presentation actions">
<ChatWithAgentButton
+ grouped
label="Ask Macro"
entity={{
type: 'document',
diff --git a/apps/web/src/features/block-pptx/views/pptx-editor.tsx b/apps/web/src/features/block-pptx/views/pptx-editor.tsx
index af47783772..e8a273cfa2 100644
--- a/apps/web/src/features/block-pptx/views/pptx-editor.tsx
+++ b/apps/web/src/features/block-pptx/views/pptx-editor.tsx
@@ -2467,7 +2467,7 @@ export function PptxEditor() {
start={
<Show when={!readonly()}>
<RibbonButton
- label="Undo"
+ aria-label="Undo"
tooltip="Undo (⌘Z)"
disabled={!session.history().canUndo}
onClick={() => fireAndForget(undo(), 'pptx-editor')}
@@ -2475,7 +2475,7 @@ export function PptxEditor() {
<ArrowCounterClockwise />
</RibbonButton>
<RibbonButton
- label="Redo"
+ aria-label="Redo"
tooltip="Redo (⇧⌘Z)"
disabled={!session.history().canRedo}
onClick={() => fireAndForget(redo(), 'pptx-editor')}
@@ -2507,7 +2507,7 @@ export function PptxEditor() {
</button>
</Show>
<RibbonButton
- label="Print"
+ aria-label="Print"
tooltip="Print or save as PDF (⌘P)"
data-testid="pptx-print-open"
onClick={() => setPrinting(true)}
@@ -2515,7 +2515,7 @@ export function PptxEditor() {
<Printer />
</RibbonButton>
<RibbonButton
- label="Export"
+ aria-label="Export"
tooltip="Export slides as pictures"
data-testid="pptx-export-open"
onClick={() => setExporting(true)}
@@ -2523,17 +2523,17 @@ export function PptxEditor() {
<ImageSquare />
</RibbonButton>
<RibbonButton
- label="Download"
+ aria-label="Download"
tooltip="Download .pptx"
onClick={() => fireAndForget(download(), 'pptx-download')}
>
<DownloadSimple />
</RibbonButton>
<Button
+ aria-label="Present"
size="sm"
- variant="accent"
+ variant="primary"
class="h-6 gap-1 px-2 text-xs"
- label="Present"
tooltip="Present from current slide (⇧F5)"
data-testid="pptx-present"
onClick={() => present(true)}
diff --git a/apps/web/src/features/block-pr/component/MergePullRequestButton.tsx b/apps/web/src/features/block-pr/component/MergePullRequestButton.tsx
index 626f0e771f..aecd16f37e 100644
--- a/apps/web/src/features/block-pr/component/MergePullRequestButton.tsx
+++ b/apps/web/src/features/block-pr/component/MergePullRequestButton.tsx
@@ -1,6 +1,6 @@
import { fireAndForget } from '@core/util/fireAndForget';
import GitMerge from '@icon/system/regular/git-merge.svg';
-import { Button, type ButtonSize, cn, confirmDialog } from '@ui';
+import { Button, ButtonGroup, type ButtonSize, cn, confirmDialog } from '@ui';
import { getOwner, type Owner, Show } from 'solid-js';
import {
createMergePullRequestAction,
@@ -66,6 +66,7 @@ export function MergePullRequestButton(props: {
class?: string;
/** Hide the label and show the icon alone, with the label as its name. */
iconOnly?: boolean;
+ grouped?: boolean;
onMerged?: () => void;
}) {
const owner = getOwner();
@@ -74,6 +75,7 @@ export function MergePullRequestButton(props: {
confirm: (target) => confirmMergePullRequest(target, owner),
});
const label = () => (action.pending() ? 'Merging…' : 'Merge');
+ const Control = props.grouped ? ButtonGroup.Button : Button;
return (
<Show
when={pullRequestReadyToMerge({
@@ -82,10 +84,9 @@ export function MergePullRequestButton(props: {
checks: props.checks,
})}
>
- <Button
+ <Control
variant="success"
size={props.size ?? 'sm'}
- noTouchResize
class={cn('shrink-0', props.class)}
aria-label={`${label()} pull request #${props.target.number}`}
disabled={action.pending()}
@@ -99,7 +100,7 @@ export function MergePullRequestButton(props: {
<Show when={!props.iconOnly}>
<span>{label()}</span>
</Show>
- </Button>
+ </Control>
</Show>
);
}
diff --git a/apps/web/src/features/block-pr/component/PullRequestActionsButton.tsx b/apps/web/src/features/block-pr/component/PullRequestActionsButton.tsx
index 6d13b52d49..ad385aed71 100644
--- a/apps/web/src/features/block-pr/component/PullRequestActionsButton.tsx
+++ b/apps/web/src/features/block-pr/component/PullRequestActionsButton.tsx
@@ -1,6 +1,6 @@
import { t } from '@app/lib/i18n';
import CaretDown from '@icon/system/regular/caret-down.svg';
-import { Button, ButtonGroup, Dropdown } from '@ui';
+import { ButtonGroup, Dropdown } from '@ui';
import { For, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import type { PrActions } from '../primitives/create-pr-actions';
@@ -16,11 +16,11 @@ export function PullRequestActionsButton(props: { actions: PrActions }) {
{(primary) => (
<Dropdown placement="bottom-end">
<ButtonGroup
- variant={primary().key === 'merge' ? 'success' : 'outline'}
- depth={2}
- label={t('entityActions.prActions')}
+ variant={primary().key === 'merge' ? 'success' : 'secondary'}
+ size="sm"
+ aria-label={t('entityActions.prActions')}
>
- <Button
+ <ButtonGroup.Button
disabled={props.actions.pending() || !!primary().disabledReason}
tooltip={primary().disabledReason}
aria-description={primary().disabledReason}
@@ -33,12 +33,15 @@ export function PullRequestActionsButton(props: { actions: PrActions }) {
? t('entityActions.prMerging')
: primary().label}
</span>
- </Button>
+ </ButtonGroup.Button>
<Show when={props.actions.secondary().length > 0}>
<ButtonGroup.Divider />
<Dropdown.Trigger
- size="icon-md"
- label={t('entityActions.prMoreActions')}
+ as={ButtonGroup.Button}
+ variant={primary().key === 'merge' ? 'success' : 'secondary'}
+ size="icon-sm"
+ aria-label={t('entityActions.prMoreActions')}
+ tooltip={t('entityActions.prMoreActions')}
disabled={props.actions.pending()}
>
<CaretDown class="size-3.5" />
diff --git a/apps/web/src/features/block-pr/component/sidepanel/PrAgentSessionsSection.tsx b/apps/web/src/features/block-pr/component/sidepanel/PrAgentSessionsSection.tsx
index 3734d65f0a..e974bd1219 100644
--- a/apps/web/src/features/block-pr/component/sidepanel/PrAgentSessionsSection.tsx
+++ b/apps/web/src/features/block-pr/component/sidepanel/PrAgentSessionsSection.tsx
@@ -66,10 +66,11 @@ function LinkedSessionRow(props: { sessionId: string; url: string }) {
</Tooltip>
<Show when={linkedByPerson()}>
<Button
+ aria-label={`Unlink ${label()}`}
+ tooltip={`Unlink ${label()}`}
variant="ghost"
size="icon-xs"
class="ml-auto"
- label={`Unlink ${label()}`}
disabled={unlink.isPending}
onClick={() =>
unlink.mutate(
@@ -81,7 +82,7 @@ function LinkedSessionRow(props: { sessionId: string; url: string }) {
)
}
>
- <XIcon />
+ <XIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -107,8 +108,13 @@ function LinkSessionPicker(props: {
<ListFilterDropdown
label="Link agent session"
customTrigger={
- <Dropdown.Trigger variant="ghost" size="xs" label="Link agent session">
- <PlusIcon />
+ <Dropdown.Trigger
+ aria-label="Link agent session"
+ tooltip="Link agent session"
+ variant="ghost"
+ size="xs"
+ >
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Link session
</Dropdown.Trigger>
}
diff --git a/apps/web/src/features/block-pr/hooks/usePrShare.tsx b/apps/web/src/features/block-pr/hooks/usePrShare.tsx
index 4b7c6e197e..4b37558c5e 100644
--- a/apps/web/src/features/block-pr/hooks/usePrShare.tsx
+++ b/apps/web/src/features/block-pr/hooks/usePrShare.tsx
@@ -59,7 +59,7 @@ function PrShareModal(props: PrShareModalProps) {
/>
<div class="px-4 py-3 border-t border-edge-muted">
<Button
- variant="outline"
+ variant="secondary"
onClick={() =>
fireAndForget(props.copyLink(), 'pr-share-modal')
}
@@ -118,7 +118,7 @@ function PrShareModal(props: PrShareModalProps) {
Macro
</span>
<Button
- variant="outline"
+ variant="secondary"
onClick={() =>
fireAndForget(props.copyLink(), 'pr-share-modal')
}
diff --git a/apps/web/src/features/block-pr/views/PrDetail.tsx b/apps/web/src/features/block-pr/views/PrDetail.tsx
index 8b3af6f7d2..ebb5678211 100644
--- a/apps/web/src/features/block-pr/views/PrDetail.tsx
+++ b/apps/web/src/features/block-pr/views/PrDetail.tsx
@@ -23,7 +23,15 @@ import {
useRefreshGithubPullRequest,
} from '@queries/storage/github-pull-requests';
import { githubPullRequestChangesKeys } from '@queries/storage/keys';
-import { Button, CopyButton, cn, Layer, Scroll, Tooltip } from '@ui';
+import {
+ Button,
+ ButtonGroup,
+ CopyButton,
+ cn,
+ Layer,
+ Scroll,
+ Tooltip,
+} from '@ui';
import { type Accessor, createMemo, Show, Suspense } from 'solid-js';
import { confirmMergePullRequest } from '../component/MergePullRequestButton';
import { PrChangesProvider } from '../component/PrChanges';
@@ -214,18 +222,23 @@ export function PrDetailActions(props: {
<HeaderActionGroup label="Sharing">
<Tooltip label="Share pull request">
<HeaderActionButton
+ grouped
label="Share"
- icon={<IconShared />}
+ icon={
+ <IconShared class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
onClick={openShare}
/>
</Tooltip>
<CopyButton
+ as={ButtonGroup.Button}
variant="ghost"
+ aria-label="Copy Share Link"
tooltip="Copy Share Link"
- size="icon-md"
+ size="icon-sm"
onClick={copyLink}
>
- <IconLink class="size-3.5!" />
+ <IconLink class="size-3.5" />
</CopyButton>
</HeaderActionGroup>
<PullRequestActionsButton actions={props.actions} />
@@ -424,7 +437,7 @@ function PrLoadErrorBanner(props: { onRetry: () => void }) {
return (
<div class="mt-6 flex flex-col items-start gap-3 rounded-lg border border-edge-muted px-3 py-2 text-xs text-ink-muted">
<span>Couldn't load this pull request from cached GitHub data.</span>
- <Button variant="outline" size="sm" onClick={props.onRetry}>
+ <Button variant="secondary" size="sm" onClick={props.onRetry}>
Retry
</Button>
</div>
diff --git a/apps/web/src/features/block-project/component/TopBar.tsx b/apps/web/src/features/block-project/component/TopBar.tsx
index 6910ce81fa..5e6502e83c 100644
--- a/apps/web/src/features/block-project/component/TopBar.tsx
+++ b/apps/web/src/features/block-project/component/TopBar.tsx
@@ -95,8 +95,11 @@ export function TopBar() {
icon: ChatWithAgentIcon,
action: () => openChatWithAgent({ type: 'project', id, name: name() }),
condition: () => !isSpecialProject,
- buttonComponent: () => (
- <ChatWithAgentButton entity={{ type: 'project', id, name: name() }} />
+ buttonComponent: (control) => (
+ <ChatWithAgentButton
+ grouped={control.grouped}
+ entity={{ type: 'project', id, name: name() }}
+ />
),
},
{
@@ -127,9 +130,9 @@ export function TopBar() {
{(tool) => (
<Show when={!tool.condition || tool.condition()}>
{tool.buttonComponent ? (
- <tool.buttonComponent />
+ <tool.buttonComponent grouped />
) : (
- <ToolButton tool={tool} />
+ <ToolButton tool={tool} grouped />
)}
</Show>
)}
diff --git a/apps/web/src/features/block-psd/components/dialogs.tsx b/apps/web/src/features/block-psd/components/dialogs.tsx
index e264976ce9..f56a9c3eda 100644
--- a/apps/web/src/features/block-psd/components/dialogs.tsx
+++ b/apps/web/src/features/block-psd/components/dialogs.tsx
@@ -78,7 +78,7 @@ function DialogShell(props: {
{props.children}
<div class="flex justify-end gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid={`${props.testId}-cancel`}
onClick={() => props.onCancel()}
@@ -87,7 +87,7 @@ function DialogShell(props: {
</Button>
<Show when={props.onOk}>
<Button
- variant="cta"
+ variant="primary"
size="sm"
data-testid={`${props.testId}-ok`}
onClick={() => props.onOk?.()}
diff --git a/apps/web/src/features/block-psd/components/notice-banner.tsx b/apps/web/src/features/block-psd/components/notice-banner.tsx
index fd942ce060..289b433aa2 100644
--- a/apps/web/src/features/block-psd/components/notice-banner.tsx
+++ b/apps/web/src/features/block-psd/components/notice-banner.tsx
@@ -54,7 +54,7 @@ export function NoticeBanner(props: {
</div>
<Show when={props.readOnlyReason && props.onConvert}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="psd-notice-convert"
onClick={() => props.onConvert?.()}
diff --git a/apps/web/src/features/block-psd/components/session-notice.tsx b/apps/web/src/features/block-psd/components/session-notice.tsx
index a177eaa52d..a0dd4f3518 100644
--- a/apps/web/src/features/block-psd/components/session-notice.tsx
+++ b/apps/web/src/features/block-psd/components/session-notice.tsx
@@ -21,7 +21,7 @@ export function SessionNotice(props: {
<WarningCircle class="size-3.5 shrink-0 text-warning" />
<span class="min-w-0 flex-1">{props.message}</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
data-testid="psd-session-action"
onClick={() => props.onAction()}
diff --git a/apps/web/src/features/block-psd/psd-block.tsx b/apps/web/src/features/block-psd/psd-block.tsx
index dc180c2f7e..c11192b950 100644
--- a/apps/web/src/features/block-psd/psd-block.tsx
+++ b/apps/web/src/features/block-psd/psd-block.tsx
@@ -293,8 +293,8 @@ function DownloadOnly(props: { onDownload: () => void }): JSX.Element {
return (
<div class="flex size-full flex-col items-center justify-center gap-3 p-6 text-ink-muted text-sm">
Photoshop files can't be opened here yet.
- <Button variant="outline" size="sm" onClick={props.onDownload}>
- <DownloadSimple />
+ <Button variant="secondary" size="sm" onClick={props.onDownload}>
+ <DownloadSimple class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Download
</Button>
</div>
diff --git a/apps/web/src/features/block-psd/views/psd-editor.tsx b/apps/web/src/features/block-psd/views/psd-editor.tsx
index f72f7a6a70..016f11f4d7 100644
--- a/apps/web/src/features/block-psd/views/psd-editor.tsx
+++ b/apps/web/src/features/block-psd/views/psd-editor.tsx
@@ -495,26 +495,26 @@ export function PsdEditor() {
<span class="flex-1" />
<Show when={editor.enabled()}>
<Button
+ aria-label="Undo"
variant="ghost"
size="icon-sm"
- label="Undo"
tooltip={`Undo · ${IS_MAC ? '⌘Z' : 'Ctrl+Z'}`}
disabled={!editor.canUndo()}
data-testid="psd-undo"
onClick={() => fireAndForget(editor.undo(), 'psd-editor')}
>
- <ArrowUUpLeft />
+ <ArrowUUpLeft class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Redo"
variant="ghost"
size="icon-sm"
- label="Redo"
tooltip={`Redo · ${IS_MAC ? '⇧⌘Z' : 'Ctrl+⇧Z'}`}
disabled={!editor.canRedo()}
data-testid="psd-redo"
onClick={() => fireAndForget(editor.redo(), 'psd-editor')}
>
- <ArrowUUpRight />
+ <ArrowUUpRight class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<span
class="flex size-6 items-center justify-center text-ink-muted"
@@ -538,13 +538,13 @@ export function PsdEditor() {
</span>
</Show>
<Button
+ aria-label="Keyboard shortcuts"
variant="ghost"
size="icon-sm"
- label="Keyboard shortcuts"
tooltip={`Keyboard shortcuts · ${IS_MAC ? '⌘/' : 'Ctrl+/'}`}
onClick={() => setShowShortcuts((s) => !s)}
>
- <Keyboard />
+ <Keyboard class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<OptionsBar
diff --git a/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx b/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
index 61f84a5c11..0eb95affb9 100644
--- a/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
+++ b/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
@@ -144,7 +144,7 @@ export default function SpreadsheetDemo() {
<SplitHeaderRight>
<div class="order-[1000] flex items-center gap-1">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="bg-surface"
disabled={!!actions.pending()}
@@ -155,14 +155,14 @@ export default function SpreadsheetDemo() {
Ask Macro
</Button>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="bg-surface"
disabled={!!actions.pending()}
aria-busy={actions.pending() === 'share'}
onClick={() => fireAndForget(actions.share(), 'spreadsheet-draft')}
>
- <IconShared />
+ <IconShared class="size-3 touch:size-6 shrink-0 pointer-events-none" />
{actions.pending() === 'share' ? 'Saving…' : 'Share'}
</Button>
</div>
@@ -208,7 +208,7 @@ export default function SpreadsheetDemo() {
</Button>
<Button
size="sm"
- variant="strong"
+ variant="secondary"
type="submit"
disabled={!renameDraft()?.trim() || !canRename()}
>
diff --git a/apps/web/src/features/block-spreadsheet/components/CellListMenu.tsx b/apps/web/src/features/block-spreadsheet/components/CellListMenu.tsx
index 100b4056f6..ed24e475e4 100644
--- a/apps/web/src/features/block-spreadsheet/components/CellListMenu.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/CellListMenu.tsx
@@ -50,9 +50,10 @@ export function CellListMenu(props: {
modal={false}
>
<Dropdown.Trigger
- variant="outline"
+ aria-label={`Choose a value for ${props.address}`}
+ tooltip={`Choose a value for ${props.address}`}
+ variant="secondary"
size="icon-xs"
- label={`Choose a value for ${props.address}`}
tabIndex={-1}
class="size-full min-h-0 min-w-0 rounded-none p-0 touch:min-h-0 touch:min-w-0"
>
diff --git a/apps/web/src/features/block-spreadsheet/components/ChartDialog.tsx b/apps/web/src/features/block-spreadsheet/components/ChartDialog.tsx
index 5c9c32f3ac..98fb59d4d6 100644
--- a/apps/web/src/features/block-spreadsheet/components/ChartDialog.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/ChartDialog.tsx
@@ -158,7 +158,7 @@ function ChartForm(props: {
<Button variant="ghost" size="sm" type="button" onClick={props.onClose}>
Cancel
</Button>
- <Button size="sm" variant="strong" type="submit">
+ <Button size="sm" variant="primary" type="submit">
Apply
</Button>
</div>
diff --git a/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.test.tsx b/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.test.tsx
index b13e0c8b64..f64b0384a1 100644
--- a/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.test.tsx
@@ -1,11 +1,7 @@
import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { DateFormatDialog } from './DateFormatDialog';
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
vi.mock('@components/app/mobile/MobileDrawer', () => ({
MobileDrawer: () => null,
diff --git a/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.tsx b/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.tsx
index eb8f0851e6..f2c0b009b7 100644
--- a/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/DateFormatDialog.tsx
@@ -129,7 +129,7 @@ function DateFormatForm(props: {
<Button variant="ghost" type="button" onClick={props.onClose}>
Cancel
</Button>
- <Button type="submit" variant="strong" disabled={!preview()}>
+ <Button type="submit" variant="primary" disabled={!preview()}>
Apply
</Button>
</div>
diff --git a/apps/web/src/features/block-spreadsheet/components/DropdownDialog.test.tsx b/apps/web/src/features/block-spreadsheet/components/DropdownDialog.test.tsx
index 16d8b8462c..040583571d 100644
--- a/apps/web/src/features/block-spreadsheet/components/DropdownDialog.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/DropdownDialog.test.tsx
@@ -5,14 +5,10 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { DropdownDialog, type DropdownDialogState } from './DropdownDialog';
// App hotkey registries are outside this dialog fixture.
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
let animationStyle: HTMLStyleElement;
beforeEach(() => {
diff --git a/apps/web/src/features/block-spreadsheet/components/DropdownDialog.tsx b/apps/web/src/features/block-spreadsheet/components/DropdownDialog.tsx
index 9ffa0aeb8c..52704997a1 100644
--- a/apps/web/src/features/block-spreadsheet/components/DropdownDialog.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/DropdownDialog.tsx
@@ -316,14 +316,15 @@ function DropdownForm(props: {
class="min-w-0 flex-1 rounded border border-edge-muted bg-input px-3 py-1.5 text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
/>
<Button
+ aria-label={`Remove choice ${index() + 1}`}
+ tooltip={`Remove choice ${index() + 1}`}
type="button"
variant="ghost"
size="icon-sm"
- label={`Remove choice ${index() + 1}`}
disabled={choices.length === 1}
onClick={() => remove(index())}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</li>
)}
@@ -336,7 +337,7 @@ function DropdownForm(props: {
class="self-start"
onClick={() => insert(choices.length)}
>
- <Plus />
+ <Plus class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Add choice
</Button>
</Show>
@@ -366,7 +367,7 @@ function DropdownForm(props: {
<Button variant="ghost" type="button" onClick={props.onClose}>
Cancel
</Button>
- <Button type="submit" variant="strong">
+ <Button type="submit" variant="primary">
Save
</Button>
</div>
@@ -383,9 +384,10 @@ function ChoiceColorMenu(props: {
return (
<Dropdown placement="bottom-start">
<Dropdown.Trigger
+ aria-label={`Color of ${props.choice}`}
+ tooltip={`Color of ${props.choice}`}
variant="ghost"
size="icon-sm"
- label={`Color of ${props.choice}`}
class="shrink-0"
>
<span
diff --git a/apps/web/src/features/block-spreadsheet/components/FormulaBar.test.tsx b/apps/web/src/features/block-spreadsheet/components/FormulaBar.test.tsx
index 12acf19c39..b43a17922b 100644
--- a/apps/web/src/features/block-spreadsheet/components/FormulaBar.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/FormulaBar.test.tsx
@@ -1,12 +1,7 @@
import { cleanup, fireEvent, render } from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { FormulaBar } from './SpreadsheetToolbar';
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
-
afterEach(cleanup);
function formulaBar(options: { editing?: boolean; readonly?: boolean } = {}) {
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsx
index cd3fed7fae..af27c19338 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsx
@@ -41,9 +41,10 @@ function ActionMenu(
return (
<Dropdown placement={props.placement ?? 'bottom-start'} modal={false}>
<Dropdown.Trigger
+ aria-label={props.label}
+ tooltip={props.label}
size="icon-sm"
variant="ghost"
- label={props.label}
disabled={props.disabled}
class="h-7 w-7 min-h-7 min-w-7 shrink-0 p-1 text-ink-muted touch:h-[44px] touch:w-[44px] touch:min-h-[44px] touch:min-w-[44px]"
>
@@ -309,9 +310,10 @@ export function SpreadsheetImportButton(props: {
}) {
return (
<Button
+ aria-label="Import"
+ tooltip="Import"
size="icon-sm"
variant="ghost"
- label="Import"
disabled={props.disabled}
class="h-7 w-7 min-h-7 min-w-7 shrink-0 p-1 text-ink-muted touch:h-[44px] touch:w-[44px] touch:min-h-[44px] touch:min-w-[44px]"
onClick={() => props.onCommand('import')}
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetDialogs.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetDialogs.tsx
index b38fef117b..eaeb4f2335 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetDialogs.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetDialogs.tsx
@@ -95,7 +95,7 @@ export function SpreadsheetFindDialog(props: SpreadsheetFindDialogProps) {
classList={{ '!text-accent': !!props.query.trim() }}
onClick={() => props.onFind()}
>
- <MagnifyingGlass />
+ <MagnifyingGlass class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<input
ref={findInputRef}
@@ -131,7 +131,7 @@ export function SpreadsheetFindDialog(props: SpreadsheetFindDialogProps) {
disabled={!props.matchCount}
onClick={() => props.onFind(true)}
>
- <CaretUp />
+ <CaretUp class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
size="icon-sm"
@@ -140,17 +140,18 @@ export function SpreadsheetFindDialog(props: SpreadsheetFindDialogProps) {
disabled={!props.matchCount}
onClick={() => props.onFind()}
>
- <CaretDown />
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Show when={!props.readonly}>
<Button
+ aria-label={replacing() ? 'Hide replace' : 'Replace'}
+ tooltip={replacing() ? 'Hide replace' : 'Replace'}
size="icon-sm"
variant="ghost"
- label={replacing() ? 'Hide replace' : 'Replace'}
aria-pressed={replacing()}
onClick={() => setReplacing((open) => !open)}
>
- <Swap />
+ <Swap class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Button
@@ -159,7 +160,7 @@ export function SpreadsheetFindDialog(props: SpreadsheetFindDialogProps) {
aria-label="Close find bar"
onClick={close}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<Show when={replacing() && !props.readonly}>
@@ -182,7 +183,7 @@ export function SpreadsheetFindDialog(props: SpreadsheetFindDialogProps) {
/>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.matchIndex < 0}
onClick={() => props.onReplace(false)}
>
@@ -190,7 +191,7 @@ export function SpreadsheetFindDialog(props: SpreadsheetFindDialogProps) {
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={!props.matchCount}
onClick={() => props.onReplace(true)}
>
@@ -278,7 +279,7 @@ export function SpreadsheetMoveDialog(props: {
>
Cancel
</Button>
- <Button size="sm" variant="strong" type="submit">
+ <Button size="sm" variant="secondary" type="submit">
Replace
</Button>
</div>
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.test.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.test.tsx
index ede08b0850..f2cc0f2866 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.test.tsx
@@ -1,11 +1,7 @@
import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { SpreadsheetGoalSeekDialog } from './SpreadsheetGoalSeekDialog';
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
vi.mock('@components/app/mobile/MobileDrawer', () => ({
MobileDrawer: () => null,
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.tsx
index ff2c4e0c8b..5ff92658ac 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGoalSeekDialog.tsx
@@ -50,8 +50,10 @@ export function SpreadsheetGoalSeekDialog(props: {
<div class="mb-4 flex items-center justify-between">
<Dialog.Title class="text-sm font-semibold">Goal Seek</Dialog.Title>
<Button
+ variant="ghost"
+ aria-label="Close Goal Seek"
+ tooltip="Close Goal Seek"
type="button"
- label="Close Goal Seek"
size="icon-sm"
class="order-last text-ink-muted"
tabIndex={-1}
@@ -115,17 +117,22 @@ export function SpreadsheetGoalSeekDialog(props: {
<Button
type="submit"
size="sm"
- variant="strong"
+ variant="primary"
disabled={props.seeking}
>
{props.seeking ? 'Seeking…' : 'OK'}
</Button>
}
>
- <Button type="button" size="sm" onClick={props.onEdit}>
+ <Button
+ variant="ghost"
+ type="button"
+ size="sm"
+ onClick={props.onEdit}
+ >
Change cells
</Button>
- <Button type="submit" size="sm" variant="strong">
+ <Button type="submit" size="sm" variant="primary">
{props.solution?.status === 'found' ? 'OK' : 'Use closest value'}
</Button>
</Show>
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsx
index e45539edcc..0fdb446c18 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsx
@@ -5,16 +5,13 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import { createSignal, type ParentProps } from 'solid-js';
+import { createSignal } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import {
SpreadsheetSheetTabs,
type SpreadsheetSheetTabsProps,
} from './SpreadsheetSheetTabs';
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
vi.mock('@core/mobile/mobileWidth', () => ({ isMobileWidth: () => true }));
let animationStyle: HTMLStyleElement;
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsx
index d3015397b4..44e880d287 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsx
@@ -56,7 +56,8 @@ function SheetActions(props: SpreadsheetSheetTabsProps) {
return (
<Dropdown placement="top-end">
<Dropdown.Trigger
- label={`Sheet actions for ${active()?.name ?? 'current sheet'}`}
+ aria-label={`Sheet actions for ${active()?.name ?? 'current sheet'}`}
+ tooltip={`Sheet actions for ${active()?.name ?? 'current sheet'}`}
variant="ghost"
size="icon-sm"
class="h-7 w-7 shrink-0 touch:h-[44px] touch:w-[44px] touch:min-h-[44px] touch:min-w-[44px]"
@@ -273,7 +274,9 @@ export function SpreadsheetSheetTabs(props: SpreadsheetSheetTabsProps) {
return (
<div class="flex h-9 min-w-0 max-w-[40%] shrink-0 items-center gap-1 bg-panel px-1 max-sm:max-w-none max-sm:flex-1 touch:h-[48px] lg:max-w-[min(50%,42rem)]">
<Button
- label="Add sheet"
+ variant="ghost"
+ aria-label="Add sheet"
+ tooltip="Add sheet"
size="icon-sm"
class="h-7 w-7 shrink-0 touch:h-[44px] touch:w-[44px] touch:min-h-[44px] touch:min-w-[44px]"
disabled={props.readonly || !props.canAdd}
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsx
index 050c7b512b..af591c0333 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsx
@@ -5,7 +5,7 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import { createSignal, type ParentProps } from 'solid-js';
+import { createSignal } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { SpreadsheetToolbarProps } from '../core/toolbar-types';
import {
@@ -15,9 +15,6 @@ import {
import { SpreadsheetToolbar } from './SpreadsheetToolbar';
// App hotkey registries are outside this presentational menu fixture.
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
let animationStyle: HTMLStyleElement;
beforeEach(() => {
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.tsx
index 11d9dc50c1..6c1ec3a07a 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.tsx
@@ -48,6 +48,7 @@ import {
function ToolbarButton(props: ButtonProps) {
return (
<Button
+ variant="ghost"
{...props}
size="icon-sm"
class="h-7 w-7 min-h-7 min-w-7 p-1 font-normal touch:h-[44px] touch:w-[44px] touch:min-h-[44px] touch:min-w-[44px]"
@@ -71,7 +72,7 @@ function FontSizeControl(props: SpreadsheetToolbarProps) {
<div class="flex shrink-0 items-center gap-0.5">
<ToolbarButton
size="icon-sm"
- label="Decrease font size"
+ aria-label="Decrease font size"
disabled={props.readonly || size() <= 8}
onClick={() => setSize(size() - 1)}
>
@@ -108,7 +109,7 @@ function FontSizeControl(props: SpreadsheetToolbarProps) {
/>
<ToolbarButton
size="icon-sm"
- label="Increase font size"
+ aria-label="Increase font size"
disabled={props.readonly || size() >= 36}
onClick={() => setSize(size() + 1)}
>
@@ -123,10 +124,10 @@ function TextStyleControls(props: SpreadsheetToolbarProps) {
<>
<ToolbarButton
size="icon-sm"
- label="Bold"
+ aria-label="Bold"
tooltip="Bold (⌘/Ctrl B)"
aria-pressed={!!props.cell?.bold}
- variant={props.cell?.bold ? 'accent' : 'ghost'}
+ variant={props.cell?.bold ? 'primary' : 'ghost'}
disabled={props.readonly}
onClick={() => props.onStyle({ bold: !props.cell?.bold })}
>
@@ -134,10 +135,10 @@ function TextStyleControls(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Italic"
+ aria-label="Italic"
tooltip="Italic (⌘/Ctrl I)"
aria-pressed={!!props.cell?.italic}
- variant={props.cell?.italic ? 'accent' : 'ghost'}
+ variant={props.cell?.italic ? 'primary' : 'ghost'}
disabled={props.readonly}
onClick={() => props.onStyle({ italic: !props.cell?.italic })}
>
@@ -145,9 +146,9 @@ function TextStyleControls(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Strikethrough"
+ aria-label="Strikethrough"
aria-pressed={!!props.cell?.strikethrough}
- variant={props.cell?.strikethrough ? 'accent' : 'ghost'}
+ variant={props.cell?.strikethrough ? 'primary' : 'ghost'}
disabled={props.readonly}
onClick={() =>
props.onStyle({ strikethrough: !props.cell?.strikethrough })
@@ -157,10 +158,10 @@ function TextStyleControls(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Underline"
+ aria-label="Underline"
tooltip="Underline (⌘/Ctrl U)"
aria-pressed={!!props.cell?.underline}
- variant={props.cell?.underline ? 'accent' : 'ghost'}
+ variant={props.cell?.underline ? 'primary' : 'ghost'}
disabled={props.readonly}
onClick={() => props.onStyle({ underline: !props.cell?.underline })}
>
@@ -184,7 +185,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
>
<ToolbarButton
size="icon-sm"
- label="Undo"
+ aria-label="Undo"
tooltip="Undo (⌘/Ctrl Z)"
disabled={props.readonly || !props.canUndo}
onClick={() => props.onCommand('undo')}
@@ -193,7 +194,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Redo"
+ aria-label="Redo"
tooltip="Redo (⌘/Ctrl Shift Z)"
disabled={props.readonly || !props.canRedo}
onClick={() => props.onCommand('redo')}
@@ -207,7 +208,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
<Divider />
<ToolbarButton
size="icon-sm"
- label="Format as currency"
+ aria-label="Format as currency"
disabled={props.readonly}
onClick={() => props.onStyle({ format: 'currency' })}
>
@@ -215,7 +216,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Format as percent"
+ aria-label="Format as percent"
disabled={props.readonly}
onClick={() => props.onStyle({ format: 'percent' })}
>
@@ -223,7 +224,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Decrease decimal places"
+ aria-label="Decrease decimal places"
disabled={props.readonly || decimals() === 0}
onClick={() => props.onStyle({ decimals: decimals() - 1 })}
>
@@ -233,7 +234,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Increase decimal places"
+ aria-label="Increase decimal places"
disabled={props.readonly || decimals() === 10}
onClick={() => props.onStyle({ decimals: decimals() + 1 })}
>
@@ -254,7 +255,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
<AlignmentMenu {...props} />
<ToolbarButton
size="icon-sm"
- label="Decrease indent"
+ aria-label="Decrease indent"
disabled={props.readonly}
onClick={() => {
props.onCommand('indent-decrease');
@@ -265,7 +266,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
</ToolbarButton>
<ToolbarButton
size="icon-sm"
- label="Increase indent"
+ aria-label="Increase indent"
disabled={props.readonly}
onClick={() => {
props.onCommand('indent-increase');
@@ -277,9 +278,9 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
<VerticalAlignmentMenu {...props} />
<ToolbarButton
size="icon-sm"
- label="Wrap text"
+ aria-label="Wrap text"
aria-pressed={!!props.cell?.wrap}
- variant={props.cell?.wrap ? 'accent' : 'ghost'}
+ variant={props.cell?.wrap ? 'primary' : 'ghost'}
disabled={props.readonly}
onClick={() => props.onStyle({ wrap: !props.cell?.wrap })}
>
@@ -291,7 +292,7 @@ export function SpreadsheetToolbar(props: SpreadsheetToolbarProps) {
<InsertMenu {...props} />
<ToolbarButton
size="icon-sm"
- label="Find and replace"
+ aria-label="Find and replace"
tooltip="Find and replace (⌘/Ctrl F)"
onClick={() => props.onCommand('find')}
>
@@ -425,18 +426,21 @@ export function FormulaBar(props: {
onMouseDown={(event) => event.preventDefault()}
>
<Button
+ variant="ghost"
+ aria-label="Cancel edit"
+ tooltip="Cancel edit"
{...cancelPress}
- label="Cancel edit"
size="icon-sm"
class="size-[44px]"
>
<X class="size-5" />
</Button>
<Button
+ aria-label="Apply edit"
+ tooltip="Apply edit"
{...commitPress}
- label="Apply edit"
size="icon-sm"
- variant="accent"
+ variant="primary"
class="size-[44px]"
>
<Check class="size-5" />
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbarMenus.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbarMenus.tsx
index a6654cda33..857b7ff1d2 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbarMenus.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbarMenus.tsx
@@ -31,9 +31,10 @@ function ToolbarMenu(
return (
<Dropdown placement="bottom-start" modal={false}>
<Dropdown.Trigger
+ aria-label={props.label}
+ tooltip={props.label}
size="sm"
variant="ghost"
- label={props.label}
disabled={props.disabled}
class="h-7 min-h-7 gap-1 px-1.5 text-[13px] font-normal text-ink-muted touch:h-[44px] touch:min-h-[44px] touch:min-w-[44px] touch:px-2 touch:text-[max(14px,0.875rem)]"
>
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.test.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.test.tsx
index d195b3a631..99fdc3de4c 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.test.tsx
@@ -5,7 +5,7 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import { type ComponentProps, createSignal, type ParentProps } from 'solid-js';
+import { type ComponentProps, createSignal } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { SpreadsheetFindDialog } from './SpreadsheetDialogs';
import {
@@ -13,9 +13,6 @@ import {
SpreadsheetSheetDialog,
} from './SpreadsheetWorkbookDialogs';
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
vi.mock('@components/app/mobile/MobileDrawer', () => ({
MobileDrawer: () => null,
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.tsx
index a58838a4b2..cff42c1c23 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetWorkbookDialogs.tsx
@@ -73,7 +73,7 @@ export function SpreadsheetSheetDialog(props: {
</Button>
<Button
size="sm"
- variant="strong"
+ variant={props.dialog?.kind === 'delete' ? 'danger' : 'primary'}
type="submit"
disabled={!canConfirm()}
>
@@ -210,7 +210,7 @@ export function SpreadsheetImportDialog(props: {
</Button>
<Button
size="sm"
- variant="strong"
+ variant="primary"
disabled={props.readonly || props.importing}
onClick={props.onConfirm}
>
diff --git a/apps/web/src/features/block-spreadsheet/components/TableColumnMenu.tsx b/apps/web/src/features/block-spreadsheet/components/TableColumnMenu.tsx
index 37aa7cf321..64b06277b7 100644
--- a/apps/web/src/features/block-spreadsheet/components/TableColumnMenu.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/TableColumnMenu.tsx
@@ -59,9 +59,10 @@ export function TableColumnMenu(props: {
modal={false}
>
<Dropdown.Trigger
+ aria-label={`${props.column} column menu${props.filter ? ', filtered' : ''}`}
+ tooltip={`${props.column} column menu${props.filter ? ', filtered' : ''}`}
variant="ghost"
size="icon-xs"
- label={`${props.column} column menu${props.filter ? ', filtered' : ''}`}
title={
props.filter
? `Filtered: ${filterSummary(props.filter)}`
diff --git a/apps/web/src/features/block-spreadsheet/components/TableDialog.tsx b/apps/web/src/features/block-spreadsheet/components/TableDialog.tsx
index a4efcc8740..f94cbb88f6 100644
--- a/apps/web/src/features/block-spreadsheet/components/TableDialog.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/TableDialog.tsx
@@ -81,7 +81,7 @@ function TableForm(props: {
<Button variant="ghost" type="button" onClick={props.onClose}>
Cancel
</Button>
- <Button type="submit" variant="strong">
+ <Button type="submit" variant="primary">
Save
</Button>
</div>
diff --git a/apps/web/src/features/block-spreadsheet/components/TableFilterPanel.tsx b/apps/web/src/features/block-spreadsheet/components/TableFilterPanel.tsx
index bc743594d8..9de405633d 100644
--- a/apps/web/src/features/block-spreadsheet/components/TableFilterPanel.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/TableFilterPanel.tsx
@@ -279,7 +279,7 @@ function FilterForm(props: {
>
Cancel
</Button>
- <Button type="submit" variant="strong" size="sm">
+ <Button type="submit" variant="primary" size="sm">
OK
</Button>
</div>
diff --git a/apps/web/src/features/block-spreadsheet/components/TableGroupByDialog.tsx b/apps/web/src/features/block-spreadsheet/components/TableGroupByDialog.tsx
index b6a6bbc619..63ced07474 100644
--- a/apps/web/src/features/block-spreadsheet/components/TableGroupByDialog.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/TableGroupByDialog.tsx
@@ -230,7 +230,11 @@ export function TableGroupByDialog(props: {
Show all rows
</Button>
</Show>
- <Button variant="strong" type="button" onClick={props.onClose}>
+ <Button
+ variant="secondary"
+ type="button"
+ onClick={props.onClose}
+ >
Close
</Button>
</div>
diff --git a/apps/web/src/features/block-spreadsheet/components/TableMenu.tsx b/apps/web/src/features/block-spreadsheet/components/TableMenu.tsx
index 0cc2d6e207..723e301c30 100644
--- a/apps/web/src/features/block-spreadsheet/components/TableMenu.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/TableMenu.tsx
@@ -73,10 +73,11 @@ export function TableMenu(props: {
modal={false}
>
<Dropdown.Trigger
+ aria-label={`Table ${props.table.name} menu`}
+ tooltip={`Table ${props.table.name} menu`}
variant="ghost"
size="xs"
tabIndex={-1}
- label={`Table ${props.table.name} menu`}
class="h-full rounded-none border-0 bg-transparent p-0 touch:min-h-0"
>
<NameChip
diff --git a/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx b/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx
index 25de142a74..acd1ebede0 100644
--- a/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx
+++ b/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx
@@ -45,8 +45,13 @@ export function SpreadsheetDraftMenu(props: {
when={isTouchDevice()}
fallback={
<Dropdown open={props.open} onOpenChange={props.onOpenChange}>
- <Dropdown.Trigger label="File actions" size="icon-sm" variant="ghost">
- <DotsThree />
+ <Dropdown.Trigger
+ aria-label="File actions"
+ tooltip="File actions"
+ size="icon-sm"
+ variant="ghost"
+ >
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content class="w-64">
<Dropdown.Group>
diff --git a/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx b/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx
index 8a3cee37cf..36b117117f 100644
--- a/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx
+++ b/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx
@@ -948,7 +948,7 @@ export function SpreadsheetEditor(props: {
>
Cancel
</Button>
- <Button type="submit" variant="strong">
+ <Button type="submit" variant="secondary">
Apply
</Button>
</div>
@@ -972,8 +972,10 @@ export function SpreadsheetEditor(props: {
>
<span>Calculation is unavailable: {error()}</span>
<Button
+ variant="ghost"
+ aria-label="Retry calculation"
+ tooltip="Retry calculation"
size="sm"
- label="Retry calculation"
onClick={() => {
calculation.retry();
}}
@@ -1343,9 +1345,11 @@ export function SpreadsheetEditor(props: {
when={editable() && props.store.rowCount() < SPREADSHEET_MAX_ROWS}
>
<Button
+ variant="ghost"
+ aria-label={`Add ${Math.min(100, SPREADSHEET_MAX_ROWS - props.store.rowCount())} rows`}
+ tooltip={`Add ${Math.min(100, SPREADSHEET_MAX_ROWS - props.store.rowCount())} rows`}
size="sm"
class="max-sm:hidden touch:min-h-[44px]"
- label={`Add ${Math.min(100, SPREADSHEET_MAX_ROWS - props.store.rowCount())} rows`}
onClick={() => {
grid.commit();
props.store.appendRows(100);
@@ -1361,9 +1365,11 @@ export function SpreadsheetEditor(props: {
}
>
<Button
+ variant="ghost"
+ aria-label="Add 26 columns"
+ tooltip="Add 26 columns"
size="sm"
class="max-sm:hidden touch:min-h-[44px]"
- label="Add 26 columns"
onClick={() => {
grid.commit();
props.store.appendColumns(26);
diff --git a/apps/web/src/features/block-spreadsheet/views/UploadedWorkbook.tsx b/apps/web/src/features/block-spreadsheet/views/UploadedWorkbook.tsx
index 02eded20b4..f8cfe195c6 100644
--- a/apps/web/src/features/block-spreadsheet/views/UploadedWorkbook.tsx
+++ b/apps/web/src/features/block-spreadsheet/views/UploadedWorkbook.tsx
@@ -56,6 +56,7 @@ export default function UploadedWorkbook() {
: 'Unable to open this workbook.'}
</span>
<Button
+ variant="ghost"
size="sm"
onClick={() =>
fireAndForget(query.refetch(), 'uploaded-workbook')
@@ -167,7 +168,7 @@ function UploadedWorkbookPreview(props: {
</span>
<Button
size="sm"
- variant="accent"
+ variant="primary"
disabled={!!actions.pending()}
onClick={() => fireAndForget(actions.edit(), 'uploaded-workbook')}
>
diff --git a/apps/web/src/features/block-unknown/component/UnknownContent.tsx b/apps/web/src/features/block-unknown/component/UnknownContent.tsx
index 7d6d6d1e60..7735b2e608 100644
--- a/apps/web/src/features/block-unknown/component/UnknownContent.tsx
+++ b/apps/web/src/features/block-unknown/component/UnknownContent.tsx
@@ -38,11 +38,11 @@ export function UnknownContent(props: {
</Show>
<div class="flex flex-row items-center gap-2">
- <Button variant="accent" onClick={props.onShare}>
+ <Button variant="primary" onClick={props.onShare}>
<ShareFat class="size-4" /> Share
</Button>
- <Button variant="accent" onClick={props.onDownload}>
+ <Button variant="primary" onClick={props.onDownload}>
<DownloadSimple class="size-4" /> Download
</Button>
</div>
diff --git a/apps/web/src/features/block-write/browser-test/fixture.tsx b/apps/web/src/features/block-write/browser-test/fixture.tsx
index 23d27c1e6b..06d64eaf15 100644
--- a/apps/web/src/features/block-write/browser-test/fixture.tsx
+++ b/apps/web/src/features/block-write/browser-test/fixture.tsx
@@ -438,7 +438,7 @@ function Fixture() {
onReady={setEditor}
actions={(download) => (
<Dropdown>
- <Dropdown.Trigger label="Document options">
+ <Dropdown.Trigger aria-label="Document options">
…
</Dropdown.Trigger>
<Dropdown.Content>
@@ -571,7 +571,7 @@ function LocalFixture() {
onReady={index() === 0 ? setEditor : undefined}
actions={(download) => (
<Dropdown>
- <Dropdown.Trigger label="Document options">
+ <Dropdown.Trigger aria-label="Document options">
…
</Dropdown.Trigger>
<Dropdown.Content>
diff --git a/apps/web/src/features/block-write/components/DocxFindBar.tsx b/apps/web/src/features/block-write/components/DocxFindBar.tsx
index c389263876..4e07dabcb4 100644
--- a/apps/web/src/features/block-write/components/DocxFindBar.tsx
+++ b/apps/web/src/features/block-write/components/DocxFindBar.tsx
@@ -127,30 +127,32 @@ export function DocxFindBar(props: DocxFindBarProps) {
</InputGroup.Addon>
</InputGroup>
<Toolbar.Button
- label="Match case"
+ aria-label="Match case"
+ tooltip="Match case"
aria-pressed={props.matchCase}
onClick={() => props.onToggleMatchCase()}
>
<TextAa />
</Toolbar.Button>
<Toolbar.Button
- label="Whole words only"
+ aria-label="Whole words only"
+ tooltip="Whole words only"
aria-pressed={props.wholeWord}
onClick={() => props.onToggleWholeWord()}
>
<TextT />
</Toolbar.Button>
<Toolbar.Button
- label="Previous match"
- shortcut="Shift+Enter"
+ aria-label="Previous match"
+ tooltip={{ content: 'Previous match', shortcut: 'Shift+Enter' }}
disabled={!props.count}
onClick={() => props.onPrevious()}
>
<CaretUp />
</Toolbar.Button>
<Toolbar.Button
- label="Next match"
- shortcut="Enter"
+ aria-label="Next match"
+ tooltip={{ content: 'Next match', shortcut: 'Enter' }}
disabled={!props.count}
onClick={() => props.onNext()}
>
@@ -158,7 +160,8 @@ export function DocxFindBar(props: DocxFindBarProps) {
</Toolbar.Button>
<Show when={props.canEdit}>
<Toolbar.Button
- label={props.replacing ? 'Hide replace' : 'Replace'}
+ aria-label={props.replacing ? 'Hide replace' : 'Replace'}
+ tooltip={props.replacing ? 'Hide replace' : 'Replace'}
aria-pressed={props.replacing}
onClick={() => props.onToggleReplace()}
data-docx-find-replace-toggle
@@ -167,8 +170,8 @@ export function DocxFindBar(props: DocxFindBarProps) {
</Toolbar.Button>
</Show>
<Toolbar.Button
- label="Close"
- shortcut="Escape"
+ aria-label="Close"
+ tooltip={{ content: 'Close', shortcut: 'Escape' }}
onClick={() => props.onClose()}
>
<X />
@@ -192,7 +195,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
</InputGroup>
<Toolbar.Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.current === undefined}
onClick={() => props.onReplace()}
data-docx-replace
@@ -201,7 +204,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
</Toolbar.Button>
<Toolbar.Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={!props.count}
onClick={() => props.onReplaceAll()}
data-docx-replace-all
diff --git a/apps/web/src/features/block-write/components/DocxToolbar.tsx b/apps/web/src/features/block-write/components/DocxToolbar.tsx
index d0d25d5ab6..1033376a1f 100644
--- a/apps/web/src/features/block-write/components/DocxToolbar.tsx
+++ b/apps/web/src/features/block-write/components/DocxToolbar.tsx
@@ -235,9 +235,10 @@ function ToolbarMenu(props: {
return (
<Dropdown placement="bottom-start" modal={false}>
<Dropdown.Trigger
+ aria-label={props.label}
+ tooltip={props.label}
variant="ghost"
size="icon-sm"
- label={props.label}
data-docx-menu={props.testId}
>
{props.icon}
@@ -296,15 +297,15 @@ export function DocxToolbar(props: DocxToolbarProps) {
<Show when={props.canEdit}>
<Toolbar.Group>
<Toolbar.Button
- label="Undo"
- shortcut="Mod+Z"
+ aria-label="Undo"
+ tooltip={{ content: 'Undo', shortcut: 'Mod+Z' }}
onClick={() => props.onUndo()}
>
<ArrowCounterClockwise />
</Toolbar.Button>
<Toolbar.Button
- label="Redo"
- shortcut="Mod+Shift+Z"
+ aria-label="Redo"
+ tooltip={{ content: 'Redo', shortcut: 'Mod+Shift+Z' }}
onClick={() => props.onRedo()}
>
<ArrowClockwise />
@@ -391,8 +392,8 @@ export function DocxToolbar(props: DocxToolbarProps) {
<For each={INLINE}>
{(item) => (
<Toolbar.Button
- label={item.label}
- shortcut={item.shortcut}
+ aria-label={item.label}
+ tooltip={{ content: item.label, shortcut: item.shortcut }}
aria-pressed={!!props.format[item.format]}
onClick={() => props.onFormat(item.format)}
>
@@ -445,7 +446,8 @@ export function DocxToolbar(props: DocxToolbarProps) {
</For>
</ToolbarMenu>
<Toolbar.Button
- label="Clear formatting"
+ aria-label="Clear formatting"
+ tooltip="Clear formatting"
onClick={() => props.onClearFormat()}
>
<TextTSlash />
@@ -454,13 +456,15 @@ export function DocxToolbar(props: DocxToolbarProps) {
<Toolbar.Divider class="mx-1.5 my-2.5" />
<Toolbar.Group>
<Toolbar.Button
- label="Bulleted list"
+ aria-label="Bulleted list"
+ tooltip="Bulleted list"
onClick={() => props.onList('bullet')}
>
<ListBullets />
</Toolbar.Button>
<Toolbar.Button
- label="Numbered list"
+ aria-label="Numbered list"
+ tooltip="Numbered list"
onClick={() => props.onList('number')}
>
<ListNumbers />
@@ -471,7 +475,8 @@ export function DocxToolbar(props: DocxToolbarProps) {
<For each={ALIGNMENTS}>
{(item) => (
<Toolbar.Button
- label={item.label}
+ aria-label={item.label}
+ tooltip={item.label}
onClick={() => props.onAlign(item.alignment)}
>
{item.icon()}
@@ -479,14 +484,15 @@ export function DocxToolbar(props: DocxToolbarProps) {
)}
</For>
<Toolbar.Button
- label="Decrease indent"
- shortcut="Shift+Tab"
+ aria-label="Decrease indent"
+ tooltip={{ content: 'Decrease indent', shortcut: 'Shift+Tab' }}
onClick={() => props.onIndent(false)}
>
<TextOutdent />
</Toolbar.Button>
<Toolbar.Button
- label="Increase indent"
+ aria-label="Increase indent"
+ tooltip="Increase indent"
onClick={() => props.onIndent(true)}
>
<TextIndent />
@@ -516,7 +522,8 @@ export function DocxToolbar(props: DocxToolbarProps) {
</Toolbar.Group>
<Toolbar.Divider class="mx-1.5 my-2.5" />
<Toolbar.Button
- label="Insert table"
+ aria-label="Insert table"
+ tooltip="Insert table"
onClick={() => props.onInsertTable()}
>
<Table />
@@ -555,7 +562,12 @@ export function DocxToolbar(props: DocxToolbarProps) {
<Toolbar.Divider class="mx-1.5 my-2.5" />
<Toolbar.Group>
<Toolbar.Button
- label={props.tracking ? 'Stop tracking changes' : 'Track changes'}
+ aria-label={
+ props.tracking ? 'Stop tracking changes' : 'Track changes'
+ }
+ tooltip={
+ props.tracking ? 'Stop tracking changes' : 'Track changes'
+ }
aria-pressed={props.tracking}
data-docx-track-changes
onClick={() => props.onToggleTracking()}
@@ -563,7 +575,12 @@ export function DocxToolbar(props: DocxToolbarProps) {
<GitDiff />
</Toolbar.Button>
<Toolbar.Button
- label={
+ aria-label={
+ props.showMarkup
+ ? 'Hide tracked changes'
+ : 'Show tracked changes'
+ }
+ tooltip={
props.showMarkup
? 'Hide tracked changes'
: 'Show tracked changes'
@@ -577,27 +594,31 @@ export function DocxToolbar(props: DocxToolbarProps) {
</Toolbar.Button>
<Show when={props.tracking || props.onRevision}>
<Toolbar.Button
- label="Accept change"
+ aria-label="Accept change"
+ tooltip="Accept change"
disabled={!props.onRevision}
onClick={() => props.onAccept(false)}
>
<Check />
</Toolbar.Button>
<Toolbar.Button
- label="Reject change"
+ aria-label="Reject change"
+ tooltip="Reject change"
disabled={!props.onRevision}
onClick={() => props.onReject(false)}
>
<X />
</Toolbar.Button>
<Toolbar.Button
- label="Accept all changes"
+ aria-label="Accept all changes"
+ tooltip="Accept all changes"
onClick={() => props.onAccept(true)}
>
<Checks />
</Toolbar.Button>
<Toolbar.Button
- label="Reject all changes"
+ aria-label="Reject all changes"
+ tooltip="Reject all changes"
onClick={() => props.onReject(true)}
>
<XCircle />
@@ -608,16 +629,16 @@ export function DocxToolbar(props: DocxToolbarProps) {
</Show>
<Show when={props.canComment}>
<Toolbar.Button
- label="Comment on selection"
- shortcut="Mod+Alt+M"
+ aria-label="Comment on selection"
+ tooltip={{ content: 'Comment on selection', shortcut: 'Mod+Alt+M' }}
onClick={() => props.onComment()}
>
<ChatCircleText />
</Toolbar.Button>
</Show>
<Toolbar.Button
- label="Find and replace"
- shortcut="Mod+F"
+ aria-label="Find and replace"
+ tooltip={{ content: 'Find and replace', shortcut: 'Mod+F' }}
onClick={() => props.onFind()}
>
<MagnifyingGlass />
diff --git a/apps/web/src/features/block-write/views/DocxMarginLayout.tsx b/apps/web/src/features/block-write/views/DocxMarginLayout.tsx
index f8488362b4..0903efb73c 100644
--- a/apps/web/src/features/block-write/views/DocxMarginLayout.tsx
+++ b/apps/web/src/features/block-write/views/DocxMarginLayout.tsx
@@ -71,15 +71,16 @@ export function DocxMarginLayout(props: {
style={{ top: `${props.selectionTop()}px` }}
>
<Button
+ aria-label="Comment"
+ tooltip="Comment"
size="icon-md"
- variant="cta"
- label="Comment"
+ variant="primary"
data-docx-comment-button
onPointerDown={(event: PointerEvent) => event.preventDefault()}
onMouseDown={(event: MouseEvent) => event.preventDefault()}
onClick={() => props.comments.beginDraft()}
>
- <ChatCircleText />
+ <ChatCircleText class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
diff --git a/apps/web/src/features/calendar-notes/browser-test/fixture.tsx b/apps/web/src/features/calendar-notes/browser-test/fixture.tsx
index 9fea04d463..cb7e9b2cf3 100644
--- a/apps/web/src/features/calendar-notes/browser-test/fixture.tsx
+++ b/apps/web/src/features/calendar-notes/browser-test/fixture.tsx
@@ -183,7 +183,7 @@ function Fixture() {
</div>
<Button
ref={setAnchor}
- variant="outline"
+ variant="secondary"
size="md"
class="mt-5"
onClick={() => setSelected(true)}
diff --git a/apps/web/src/features/calendar-notes/components/note-dialog.tsx b/apps/web/src/features/calendar-notes/components/note-dialog.tsx
index 6e52a5eadc..a23f92ac19 100644
--- a/apps/web/src/features/calendar-notes/components/note-dialog.tsx
+++ b/apps/web/src/features/calendar-notes/components/note-dialog.tsx
@@ -109,6 +109,7 @@ export function NoteDialog(props: {
size="md"
fullWidth
aria-label={document.name}
+ tooltip={document.name}
aria-pressed={
props.selected?.documentId === document.documentId
}
@@ -215,7 +216,7 @@ export function NoteDialog(props: {
Cancel
</Button>
<Button
- variant={props.kind === 'unlink' ? 'danger' : 'strong'}
+ variant={props.kind === 'unlink' ? 'danger' : 'primary'}
size="md"
onClick={props.onSave}
disabled={
@@ -227,7 +228,7 @@ export function NoteDialog(props: {
}
>
<Show when={props.kind === 'link'}>
- <LinkIcon />
+ <LinkIcon class="size-4 shrink-0 touch:size-6" />
</Show>
{props.saving
? 'Saving…'
@@ -241,10 +242,11 @@ export function NoteDialog(props: {
variant="ghost"
size="icon-sm"
aria-label="Close"
+ tooltip="Close"
disabled={props.saving}
class="absolute right-4 top-4 sm:right-6 sm:top-6"
>
- <XIcon />
+ <XIcon class="size-3.5 shrink-0 touch:size-6" />
</Dialog.CloseButton>
</div>
</Dialog>
diff --git a/apps/web/src/features/calendar-notes/components/notes-section.tsx b/apps/web/src/features/calendar-notes/components/notes-section.tsx
index 186c40b19e..55cc303091 100644
--- a/apps/web/src/features/calendar-notes/components/notes-section.tsx
+++ b/apps/web/src/features/calendar-notes/components/notes-section.tsx
@@ -57,6 +57,7 @@ export function NotesSection(props: {
variant="ghost"
size="xs"
aria-label={createLabel()}
+ tooltip={createLabel()}
disabled={props.creating}
onClick={props.onCreate}
>
@@ -67,8 +68,8 @@ export function NotesSection(props: {
<Button
variant="ghost"
size="xs"
- depth={3}
aria-label="Link existing"
+ tooltip="Link existing"
disabled={props.creating}
onClick={props.onLink}
>
@@ -82,7 +83,7 @@ export function NotesSection(props: {
class="flex items-center justify-between gap-2 py-2 text-xs text-ink-muted"
>
<span>{props.state.error}</span>
- <Button size="sm" variant="outline" onClick={props.onRetry}>
+ <Button size="sm" variant="secondary" onClick={props.onRetry}>
Retry
</Button>
</div>
@@ -97,9 +98,9 @@ export function NotesSection(props: {
<Button
variant="ghost"
size="sm"
- depth={3}
class="min-w-0 justify-start"
aria-label={`Open ${note.name}`}
+ tooltip={`Open ${note.name}`}
onClick={() => props.onOpen(note)}
>
<span class="min-w-0 flex-1 truncate text-left">
@@ -115,13 +116,14 @@ export function NotesSection(props: {
}
>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
size="xs"
aria-label={`Options for ${note.name}`}
+ tooltip={`Options for ${note.name}`}
disabled={props.creating}
>
Options
- <CaretDownIcon />
+ <CaretDownIcon class="size-3 shrink-0 touch:size-6" />
</Dropdown.Trigger>
<Dropdown.Content
portalScope="local"
diff --git a/apps/web/src/features/calendar-view/browser-test/fixture.tsx b/apps/web/src/features/calendar-view/browser-test/fixture.tsx
index 221207fcd2..44b99687f9 100644
--- a/apps/web/src/features/calendar-view/browser-test/fixture.tsx
+++ b/apps/web/src/features/calendar-view/browser-test/fixture.tsx
@@ -103,7 +103,7 @@ function Fixture() {
>
<Button
ref={setAnchor}
- variant="outline"
+ variant="secondary"
size="md"
fullWidth
onClick={() => setSelected(true)}
diff --git a/apps/web/src/features/calendar-view/components/AddToCalendarButton.tsx b/apps/web/src/features/calendar-view/components/AddToCalendarButton.tsx
index 7747bdf000..59ff9650d3 100644
--- a/apps/web/src/features/calendar-view/components/AddToCalendarButton.tsx
+++ b/apps/web/src/features/calendar-view/components/AddToCalendarButton.tsx
@@ -55,25 +55,43 @@ export function AddToCalendarButton(props: {
when={targetCalendars().length > 1}
fallback={
<Button
- variant="outline"
+ variant="secondary"
size={props.size}
disabled={props.pending || targetCalendars().length === 0}
onClick={() => props.onAdd(targetCalendars()[0]?.id)}
>
- <CalendarPlusIcon />
+ <CalendarPlusIcon
+ class={
+ props.size === 'xs'
+ ? 'size-3 shrink-0 touch:size-6'
+ : 'size-4 shrink-0 touch:size-6'
+ }
+ />
Add to calendar
</Button>
}
>
<Dropdown onOpenChange={(open) => props.onMenuOpenChange?.(open)}>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
size={props.size}
disabled={props.pending}
>
- <CalendarPlusIcon />
+ <CalendarPlusIcon
+ class={
+ props.size === 'xs'
+ ? 'size-3 shrink-0 touch:size-6'
+ : 'size-4 shrink-0 touch:size-6'
+ }
+ />
Add to calendar
- <CaretDownIcon />
+ <CaretDownIcon
+ class={
+ props.size === 'xs'
+ ? 'size-3 shrink-0 touch:size-6'
+ : 'size-4 shrink-0 touch:size-6'
+ }
+ />
</Dropdown.Trigger>
<Dropdown.Content blockingBackdrop class="z-nested-action-menu">
<Dropdown.Group>
diff --git a/apps/web/src/features/calendar-view/components/CalendarCreateMenu.tsx b/apps/web/src/features/calendar-view/components/CalendarCreateMenu.tsx
index 542a390d1e..c89d193aaa 100644
--- a/apps/web/src/features/calendar-view/components/CalendarCreateMenu.tsx
+++ b/apps/web/src/features/calendar-view/components/CalendarCreateMenu.tsx
@@ -22,9 +22,10 @@ export function CalendarCreateMenu(props: {
when={props.presentation}
fallback={
<Dropdown.Trigger
+ aria-label={props.label}
+ tooltip={props.label}
size={props.size ?? 'sm'}
class={props.class}
- label={props.label}
>
{props.trigger}
</Dropdown.Trigger>
diff --git a/apps/web/src/features/calendar-view/components/CalendarSearch.tsx b/apps/web/src/features/calendar-view/components/CalendarSearch.tsx
index 0c0d5a1183..d735b00cc3 100644
--- a/apps/web/src/features/calendar-view/components/CalendarSearch.tsx
+++ b/apps/web/src/features/calendar-view/components/CalendarSearch.tsx
@@ -573,12 +573,12 @@ function CalendarSearchControl(props: {
<div class="flex shrink-0 items-center gap-1">
<Show when={rawQuery().trim()}>
<Button
+ aria-label="Exact match"
+ tooltip="Exact match"
type="button"
variant="ghost"
size="icon-sm"
- square
aria-pressed={filters().matchType === 'exact'}
- label="Exact match"
class={filters().matchType === 'exact' ? 'bg-active text-ink' : ''}
onPointerDown={(event) => event.preventDefault()}
onClick={() =>
@@ -679,12 +679,15 @@ function CalendarSearchControl(props: {
>
<Show when={props.expanded === false}>
<Button
+ aria-label="Search events"
+ tooltip={{
+ content: 'Search events',
+ hotkey: TOKENS.calendar.search,
+ }}
ref={searchButton}
type="button"
- variant="outline"
+ variant="secondary"
size="icon-md"
- label="Search events"
- hotkey={TOKENS.calendar.search}
aria-expanded="false"
aria-haspopup="dialog"
onClick={props.onExpand}
@@ -800,11 +803,11 @@ function CalendarSearchControl(props: {
{filterActions()}
<Show when={rawQuery()}>
<Button
+ aria-label="Clear search"
+ tooltip="Clear search"
type="button"
variant="ghost"
size="icon-sm"
- square
- label="Clear search"
onClick={() => {
changeQuery('');
inputRef?.focus();
@@ -901,10 +904,11 @@ function CalendarSearchControl(props: {
>
{(link) => (
<Button
+ aria-label={`Join ${link().label}`}
+ tooltip={`Join ${link().label}`}
type="button"
variant="ghost"
size="sm"
- label={`Join ${link().label}`}
class={cn(
'px-2',
link().kind === 'google'
diff --git a/apps/web/src/features/calendar-view/components/CalendarSearchFilters.tsx b/apps/web/src/features/calendar-view/components/CalendarSearchFilters.tsx
index 4b90f98aec..ecad7b79e8 100644
--- a/apps/web/src/features/calendar-view/components/CalendarSearchFilters.tsx
+++ b/apps/web/src/features/calendar-view/components/CalendarSearchFilters.tsx
@@ -70,11 +70,11 @@ export function CalendarSearchFilters(props: {
return (
<Dropdown placement="bottom-end" onOpenChange={setOpen}>
<Dropdown.Trigger
+ aria-label={hasFilters() ? 'Filter events (active)' : 'Filter events'}
+ tooltip={hasFilters() ? 'Filter events (active)' : 'Filter events'}
type="button"
variant="ghost"
size="icon-sm"
- square
- label={hasFilters() ? 'Filter events (active)' : 'Filter events'}
classList={{ 'text-accent': hasFilters() }}
>
<FilterIcon class="size-4" />
diff --git a/apps/web/src/features/calendar-view/components/CalendarSidebar.tsx b/apps/web/src/features/calendar-view/components/CalendarSidebar.tsx
index d073dc08fb..65004c3598 100644
--- a/apps/web/src/features/calendar-view/components/CalendarSidebar.tsx
+++ b/apps/web/src/features/calendar-view/components/CalendarSidebar.tsx
@@ -284,7 +284,7 @@ function CalendarSidebarOverlayClose() {
return (
<Show when={shell.aside.isOverlay() && isTouchDevice()}>
<ViewSidebar.Control
- label="Close calendar navigation"
+ aria-label="Close calendar navigation"
onClick={shell.aside.collapse}
>
<CloseIcon class="size-4" />
diff --git a/apps/web/src/features/calendar-view/components/EventGuests.tsx b/apps/web/src/features/calendar-view/components/EventGuests.tsx
index 286bb45b25..f4ad9b3309 100644
--- a/apps/web/src/features/calendar-view/components/EventGuests.tsx
+++ b/apps/web/src/features/calendar-view/components/EventGuests.tsx
@@ -155,9 +155,8 @@ function InviteGuestsForm(props: {
/>
</Show>
<Button
- variant="strong"
+ variant="secondary"
size="sm"
- depth={3}
class="ml-auto"
disabled={added().length === 0}
onClick={send}
@@ -212,9 +211,8 @@ function ForwardInvitationForm(props: {
<div class="flex shrink-0 items-center gap-2 border-t border-edge-muted p-2">
<p class="min-w-0 flex-1 text-xs text-ink-muted">{FORWARD_FORM_NOTE}</p>
<Button
- variant="strong"
+ variant="secondary"
size="sm"
- depth={3}
class="shrink-0"
disabled={added().length === 0}
onClick={send}
@@ -256,12 +254,12 @@ function GuestEditorAction(props: {
overlap
>
<Popover.Trigger
+ aria-label={props.label}
+ tooltip={props.label}
as={Button}
- label={props.label}
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
>
{props.icon}
</Popover.Trigger>
@@ -277,11 +275,11 @@ function GuestEditorAction(props: {
}
>
<Button
- label={props.label}
+ aria-label={props.label}
+ tooltip={props.label}
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={() => props.onOpenChange(true)}
>
{props.icon}
@@ -304,7 +302,7 @@ function EventInviteGuestsAction(props: {
return (
<GuestEditorAction
label="Add guests"
- icon={<UserPlusIcon />}
+ icon={<UserPlusIcon class="size-4 shrink-0" />}
open={props.invites.editorOpen()}
onOpenChange={props.invites.setEditorOpen}
>
@@ -328,7 +326,7 @@ export function EventForwardInvitationAction(props: {
return (
<GuestEditorAction
label="Forward invitation"
- icon={<PaperPlaneTiltIcon />}
+ icon={<PaperPlaneTiltIcon class="size-4 shrink-0" />}
open={props.invites.forwardEditorOpen()}
onOpenChange={props.invites.setForwardEditorOpen}
>
@@ -362,29 +360,29 @@ function EventGuestActions(props: {
<Show when={eventEmailRecipients(props.event).length > 0}>
<Show when={!guestListHidden(props.event)}>
<Button
- label="Copy guest emails"
+ aria-label="Copy guest emails"
+ tooltip="Copy guest emails"
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={() => copyGuestEmails(guestEmails(props.event.attendees))}
>
- <CopyIcon />
+ <CopyIcon class="size-4 shrink-0" />
</Button>
</Show>
<Button
- label="Email guests"
+ aria-label="Email guests"
+ tooltip="Email guests"
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={() => {
const event = props.event;
props.closeDetails();
openEventEmail(event);
}}
>
- <EnvelopeIcon />
+ <EnvelopeIcon class="size-4 shrink-0" />
</Button>
</Show>
<Show when={props.invites.canInvite()}>
diff --git a/apps/web/src/features/calendar-view/components/EventJoinRequests.tsx b/apps/web/src/features/calendar-view/components/EventJoinRequests.tsx
index 9ad29507cc..cc4696ec55 100644
--- a/apps/web/src/features/calendar-view/components/EventJoinRequests.tsx
+++ b/apps/web/src/features/calendar-view/components/EventJoinRequests.tsx
@@ -84,7 +84,7 @@ export function EventJoinRequests(props: {
Decline
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={respond.isPending}
onClick={() => answer(request, 'accept')}
diff --git a/apps/web/src/features/calendar-view/components/EventRsvpSection.tsx b/apps/web/src/features/calendar-view/components/EventRsvpSection.tsx
index 467409e621..edf551e3b2 100644
--- a/apps/web/src/features/calendar-view/components/EventRsvpSection.tsx
+++ b/apps/web/src/features/calendar-view/components/EventRsvpSection.tsx
@@ -75,7 +75,6 @@ export function EventRsvpSection(props: {
<Button
variant="ghost"
size={props.buttonSize ?? 'sm'}
- depth={3}
class="bg-ink/5 px-3 aria-pressed:bg-accent-bg aria-pressed:text-accent mobile:min-h-11"
aria-pressed={
selfAttendee()?.responseStatus === option.response
diff --git a/apps/web/src/features/calendar-view/components/Header.tsx b/apps/web/src/features/calendar-view/components/Header.tsx
index dbb88190b6..8b7ffce4b4 100644
--- a/apps/web/src/features/calendar-view/components/Header.tsx
+++ b/apps/web/src/features/calendar-view/components/Header.tsx
@@ -9,6 +9,7 @@ import { useCalendarHotkeys } from '@app/features/calendar/hooks/use-calendar-ho
import { calendarPeriodLabel } from '@app/features/calendar/utils/calendar-label';
import { CalendarSchedulingActions } from '@app/features/scheduling/calendar-actions';
import { createSizeBreakpoints } from '@app/util/create-size-breakpoints';
+import { HeaderActionGroup } from '@components/app/HeaderActionGroup';
import { HeaderIsland } from '@components/app/split-layout/components/HeaderIsland';
import {
SplitHeaderLeft,
@@ -191,56 +192,80 @@ export function Header(props: {
</CalendarCreateMenu>
);
- const previous = (compact = false) => (
- <Button
- variant="ghost"
- size={compact ? 'icon-md' : 'icon-lg'}
- class="border-transparent bg-transparent"
- label={`Previous ${periodLabel()}`}
- hotkey={TOKENS.calendar.period.previous}
- onClick={calendarPager.previousPeriod}
- >
- <CaretLeftIcon class={compact ? 'size-4' : 'size-5'} />
- </Button>
- );
- const next = (compact = false) => (
- <Button
- variant="ghost"
- size={compact ? 'icon-md' : 'icon-lg'}
- class="border-transparent bg-transparent"
- label={`Next ${periodLabel()}`}
- hotkey={TOKENS.calendar.period.next}
- onClick={calendarPager.nextPeriod}
- >
- <CaretRightIcon class={compact ? 'size-4' : 'size-5'} />
- </Button>
- );
- const todayButton = (mobile: boolean, compact = false) => (
- <Button
- variant={mobile || compact ? 'ghost' : 'outline'}
- size={compact ? (mobile ? 'icon-md' : 'md') : mobile ? 'icon-lg' : 'lg'}
- class={cn(
- mobile && 'relative',
- !mobile && 'bg-transparent text-sm',
- !mobile && (compact ? 'px-2' : 'px-3'),
- !mobile && !compact && 'border-edge-button'
- )}
- label="Go to today"
- hotkey={TOKENS.calendar.period.today}
- onClick={calendarPager.navigateToToday}
- >
- <Show when={mobile} fallback="Today">
- <CalendarBlankIcon aria-hidden="true" />
- <span
- aria-hidden="true"
- class="pointer-events-none absolute inset-0 flex items-center justify-center pt-1 text-[10px] font-bold leading-none"
- >
- {today().getDate()}
- </span>
- </Show>
- </Button>
- );
-
+ const previous = (compact = false) => {
+ const Control = compact ? ButtonGroup.Button : Button;
+ return (
+ <Control
+ aria-label={`Previous ${periodLabel()}`}
+ tooltip={{
+ content: `Previous ${periodLabel()}`,
+ hotkey: TOKENS.calendar.period.previous,
+ }}
+ variant="ghost"
+ size={compact ? 'icon-sm' : 'icon-lg'}
+ class="border-transparent bg-transparent"
+ onClick={calendarPager.previousPeriod}
+ >
+ <CaretLeftIcon class={compact ? 'size-4' : 'size-5'} />
+ </Control>
+ );
+ };
+ const next = (compact = false) => {
+ const Control = compact ? ButtonGroup.Button : Button;
+ return (
+ <Control
+ aria-label={`Next ${periodLabel()}`}
+ tooltip={{
+ content: `Next ${periodLabel()}`,
+ hotkey: TOKENS.calendar.period.next,
+ }}
+ variant="ghost"
+ size={compact ? 'icon-sm' : 'icon-lg'}
+ class="border-transparent bg-transparent"
+ onClick={calendarPager.nextPeriod}
+ >
+ <CaretRightIcon class={compact ? 'size-4' : 'size-5'} />
+ </Control>
+ );
+ };
+ const todayButton = (mobile: boolean, compact = false) => {
+ const Control = compact ? ButtonGroup.Button : Button;
+ const size = () => {
+ if (compact) return mobile ? 'icon-sm' : 'sm';
+ return mobile ? 'icon-lg' : 'lg';
+ };
+ return (
+ <Control
+ aria-label="Go to today"
+ tooltip={{
+ content: 'Go to today',
+ hotkey: TOKENS.calendar.period.today,
+ }}
+ variant={mobile || compact ? 'ghost' : 'secondary'}
+ size={size()}
+ class={cn(
+ mobile && 'relative',
+ !mobile && 'bg-transparent text-sm',
+ !mobile && (compact ? 'px-2' : 'px-3'),
+ !mobile && !compact && 'border-edge-button'
+ )}
+ onClick={calendarPager.navigateToToday}
+ >
+ <Show when={mobile} fallback="Today">
+ <CalendarBlankIcon
+ class="size-4 touch:size-6 shrink-0 pointer-events-none"
+ aria-hidden="true"
+ />
+ <span
+ aria-hidden="true"
+ class="pointer-events-none absolute inset-0 flex items-center justify-center pt-1 text-[10px] font-bold leading-none"
+ >
+ {today().getDate()}
+ </span>
+ </Show>
+ </Control>
+ );
+ };
return (
<Switch>
<Match when={usesSplitHeader()}>
@@ -248,10 +273,11 @@ export function Header(props: {
<HeaderIsland class="min-w-0 shrink px-1">
<Show when={!isMobile() && shell?.aside.isCollapsed()}>
<Button
+ aria-label="Show calendar navigation"
+ tooltip="Show calendar navigation"
variant="ghost"
size="icon-sm"
class="shrink-0"
- label="Show calendar navigation"
ref={tourTarget(CALENDAR_TOUR.sidebarToggle)}
aria-expanded={shell?.aside.isOverlay() ?? false}
onClick={() => shell?.aside.expand()}
@@ -334,26 +360,14 @@ export function Header(props: {
<Show when={showBookingLinks()}>
<CalendarSchedulingActions compact />
</Show>
- <div
- role="group"
- aria-label="Calendar navigation"
- class="flex shrink-0"
- >
- <ButtonGroup variant="outline" size="icon-md">
- {todayButton(!breakpoints.labeledToday(), true)}
- {previous(true)}
- {next(true)}
- </ButtonGroup>
- </div>
- <div
- role="group"
- aria-label="Calendar view"
- class="flex shrink-0"
- >
- <ButtonGroup variant="outline" size="icon-md">
- <PeriodSelector isNarrow={isNarrow()} compact />
- </ButtonGroup>
- </div>
+ <HeaderActionGroup label="Calendar navigation">
+ {todayButton(!breakpoints.labeledToday(), true)}
+ {previous(true)}
+ {next(true)}
+ </HeaderActionGroup>
+ <HeaderActionGroup label="Calendar view">
+ <PeriodSelector isNarrow={isNarrow()} compact grouped />
+ </HeaderActionGroup>
{headerCreateMenu()}
</div>
<div
diff --git a/apps/web/src/features/calendar-view/components/Page.tsx b/apps/web/src/features/calendar-view/components/Page.tsx
index 4b7e5361e4..8ef8c90d97 100644
--- a/apps/web/src/features/calendar-view/components/Page.tsx
+++ b/apps/web/src/features/calendar-view/components/Page.tsx
@@ -176,9 +176,10 @@ function CalendarPageDataStatus(props: {
We couldn’t load your calendar events. Try again.
</p>
<Button
- variant="accent"
+ aria-label="Retry loading calendar"
+ tooltip="Retry loading calendar"
+ variant="primary"
size="sm"
- label="Retry loading calendar"
onClick={() =>
fireAndForget(
props.data.occurrencesQuery.refetch(),
diff --git a/apps/web/src/features/calendar-view/components/SelectedEventDetails.tsx b/apps/web/src/features/calendar-view/components/SelectedEventDetails.tsx
index d648cc0c8a..4fc7c550a4 100644
--- a/apps/web/src/features/calendar-view/components/SelectedEventDetails.tsx
+++ b/apps/web/src/features/calendar-view/components/SelectedEventDetails.tsx
@@ -171,7 +171,7 @@ function EveryoneElseDeclinedNotice(props: {
<Button variant="ghost" size="sm" onClick={props.onDelete}>
Delete
</Button>
- <Button variant="cta" size="sm" onClick={props.onReschedule}>
+ <Button variant="primary" size="sm" onClick={props.onReschedule}>
Reschedule
</Button>
</div>
@@ -247,66 +247,65 @@ function EventDetailsDrawer(props: EventDetailsOverlayProps) {
aria-label="Close event details"
variant="ghost"
size="icon-md"
- depth={3}
- class="size-11 rounded-full bg-ink/6 text-ink-muted [&_svg]:size-5"
+ class="size-11 rounded-full bg-ink/6 text-ink-muted"
>
- <CloseIcon />
+ <CloseIcon class="size-5 shrink-0" />
</MobileDrawer.Close>
<div class="flex items-center gap-1">
<Show when={!props.event.teamProjection}>
<Button
- label="Copy event"
+ aria-label="Copy event"
+ tooltip="Copy event"
variant="ghost"
size="icon-md"
- depth={3}
- class="size-11 bg-ink/6 text-ink-muted [&_svg]:size-5"
+ class="size-11 bg-ink/6 text-ink-muted"
onClick={() => copyCalendarEventMention(props.event)}
>
- <LinkIcon />
+ <LinkIcon class="size-5 shrink-0" />
</Button>
<Button
- label="Download .ics"
+ aria-label="Download .ics"
+ tooltip="Download .ics"
variant="ghost"
size="icon-md"
- depth={3}
- class="size-11 bg-ink/6 text-ink-muted [&_svg]:size-5"
+ class="size-11 bg-ink/6 text-ink-muted"
onClick={() => downloadCalendarEventIcs(props.event)}
>
- <DownloadSimpleIcon />
+ <DownloadSimpleIcon class="size-5 shrink-0" />
</Button>
<Button
- label="Forward by email"
+ aria-label="Forward by email"
+ tooltip="Forward by email"
variant="ghost"
size="icon-md"
- depth={3}
- class="size-11 bg-ink/6 text-ink-muted [&_svg]:size-5"
+ class="size-11 bg-ink/6 text-ink-muted"
onClick={forwardByEmail}
>
- <ArrowBendUpRightIcon />
+ <ArrowBendUpRightIcon class="size-5 shrink-0" />
</Button>
</Show>
<Show when={canEdit()}>
<Button
- label="Edit event"
+ aria-label="Edit event"
+ tooltip="Edit event"
variant="ghost"
size="icon-md"
- depth={3}
- class="size-11 bg-ink/6 text-ink-muted [&_svg]:size-5"
+ class="size-11 bg-ink/6 text-ink-muted"
onClick={openEditor}
>
- <PencilSimpleIcon />
+ <PencilSimpleIcon class="size-5 shrink-0" />
</Button>
</Show>
<Show when={canDelete()}>
<Button
- label={deleteEventLabel(props.event)}
+ aria-label={deleteEventLabel(props.event)}
+ tooltip={deleteEventLabel(props.event)}
variant="ghost"
size="icon-md"
- depth={3}
- class="size-11 bg-ink/6 text-ink-muted [&_svg]:size-5"
+ class="size-11 bg-ink/6 text-ink-muted"
onClick={deleteDialog.open}
>
- <TrashIcon />
+ <TrashIcon class="size-5 shrink-0" />
</Button>
</Show>
</div>
@@ -583,72 +582,70 @@ function EventDetailsPopover(props: EventDetailsPopoverProps) {
<div class="flex shrink-0 items-center justify-end gap-1 px-2 pt-2">
<Show when={!props.event.teamProjection}>
<Button
- label="Copy event"
+ aria-label="Copy event"
+ tooltip="Copy event"
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={() => copyCalendarEventMention(props.event)}
>
- <LinkIcon />
+ <LinkIcon class="size-4 shrink-0" />
</Button>
<Button
- label="Download .ics"
+ aria-label="Download .ics"
+ tooltip="Download .ics"
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={() => downloadCalendarEventIcs(props.event)}
>
- <DownloadSimpleIcon />
+ <DownloadSimpleIcon class="size-4 shrink-0" />
</Button>
<Button
- label="Forward by email"
+ aria-label="Forward by email"
+ tooltip="Forward by email"
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={forwardByEmail}
>
- <ArrowBendUpRightIcon />
+ <ArrowBendUpRightIcon class="size-4 shrink-0" />
</Button>
</Show>
<Show when={canEdit()}>
<Button
- label="Edit event"
+ aria-label="Edit event"
+ tooltip="Edit event"
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={openEditor}
>
- <PencilSimpleIcon />
+ <PencilSimpleIcon class="size-4 shrink-0" />
</Button>
</Show>
<Show when={canDelete()}>
<Button
- label={deleteEventLabel(props.event)}
+ aria-label={deleteEventLabel(props.event)}
+ tooltip={deleteEventLabel(props.event)}
variant="ghost"
size="icon-sm"
- depth={3}
- class="text-ink-muted [&_svg]:size-4"
+ class="text-ink-muted"
onClick={deleteDialog.open}
>
- <TrashIcon />
+ <TrashIcon class="size-4 shrink-0" />
</Button>
</Show>
- {/* Kobalte names the button "Dismiss" unless it gets an
- aria-label, which Button prefers over `label`. */}
+ {/* Kobalte names the button "Dismiss" unless it gets an aria-label. */}
<Popover.CloseButton
as={Button}
aria-label="Close event details"
tooltip="Close event details"
variant="ghost"
size="icon-sm"
- depth={3}
- class="rounded-md text-ink-muted [&_svg]:size-4"
+ class="rounded-md text-ink-muted"
>
- <CloseIcon />
+ <CloseIcon class="size-4 shrink-0" />
</Popover.CloseButton>
</div>
<div class="min-h-0 flex-auto overflow-y-auto overscroll-contain">
diff --git a/apps/web/src/features/calendar-view/components/SetupStatus.tsx b/apps/web/src/features/calendar-view/components/SetupStatus.tsx
index bb694f7ae0..e71d28fcea 100644
--- a/apps/web/src/features/calendar-view/components/SetupStatus.tsx
+++ b/apps/web/src/features/calendar-view/components/SetupStatus.tsx
@@ -159,7 +159,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="accent" size="sm" onClick={startSetup}>
+ <Button variant="primary" size="sm" onClick={startSetup}>
{setupMessage().action}
</Button>
</div>
@@ -174,7 +174,7 @@ export function SetupStatus() {
{setupMessage().title}
</div>
<p class="text-xs text-ink-muted">{setupMessage().description}</p>
- <Button variant="accent" size="sm" onClick={startSetup}>
+ <Button variant="primary" size="sm" onClick={startSetup}>
{setupMessage().action}
</Button>
</div>
diff --git a/apps/web/src/features/calendar-view/components/SharedEventActions.tsx b/apps/web/src/features/calendar-view/components/SharedEventActions.tsx
index fa361adf57..72b2944ad2 100644
--- a/apps/web/src/features/calendar-view/components/SharedEventActions.tsx
+++ b/apps/web/src/features/calendar-view/components/SharedEventActions.tsx
@@ -108,12 +108,12 @@ export function SharedEventActions(props: {
</Match>
<Match when={props.canRequestToJoin}>
<Button
- variant="outline"
+ variant="secondary"
size="xs"
disabled={requestToJoin.isPending}
onClick={() => requestToJoin.mutate(props.eventId)}
>
- <UserPlusIcon />
+ <UserPlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Ask to join
</Button>
</Match>
@@ -141,7 +141,7 @@ export function SharedEventActions(props: {
)
}
>
- <DownloadSimpleIcon />
+ <DownloadSimpleIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Download .ics
</Button>
<Switch>
diff --git a/apps/web/src/features/calendar/availability/CopyAvailabilityButton.tsx b/apps/web/src/features/calendar/availability/CopyAvailabilityButton.tsx
index 5eb985982c..ce9a5f3f04 100644
--- a/apps/web/src/features/calendar/availability/CopyAvailabilityButton.tsx
+++ b/apps/web/src/features/calendar/availability/CopyAvailabilityButton.tsx
@@ -20,14 +20,15 @@ export function CopyAvailabilityButton(props: {
return (
<Show when={connectedInboxes().length > 0}>
<Button
+ aria-label="Copy availability"
+ tooltip="Copy availability"
ref={tourTarget(CALENDAR_TOUR.availability)}
variant="ghost"
size={props.size ?? 'icon-sm'}
class={props.class}
- label="Copy availability"
onClick={showDialog}
>
- <CalendarCheckIcon />
+ <CalendarCheckIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
);
diff --git a/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.test.tsx b/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.test.tsx
index 562c8e3768..f8f99bbe58 100644
--- a/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.test.tsx
+++ b/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.test.tsx
@@ -92,7 +92,7 @@ it('keeps the button neutral after copying and colors only the check', async ()
const copied = await screen.findByRole('button', {
name: 'Today availability copied',
});
- expect(copied.getAttribute('data-variant')).toBe('strong');
+ expect(copied.getAttribute('data-variant')).toBe('secondary');
expect(copied.className).not.toContain('bg-success');
expect(copied.textContent).toContain('Copied');
expect(copied.querySelector('svg.text-success')).toBeTruthy();
diff --git a/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.tsx b/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.tsx
index 39f3c9a202..f435ee8210 100644
--- a/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.tsx
+++ b/apps/web/src/features/calendar/availability/CopyAvailabilityDialog.tsx
@@ -126,9 +126,10 @@ export function CopyAvailabilityDialog(props: ManagedDialogProps) {
<ActionDialogShell.Header class="flex items-start justify-between gap-3">
<ActionDialogShell.Title>Copy availability</ActionDialogShell.Title>
<Button
+ aria-label="Close availability dialog"
+ tooltip="Close availability dialog"
variant="ghost"
size="icon-sm"
- label="Close availability dialog"
onClick={() => props.onOpenChange(false)}
>
<XIcon class="size-4" />
@@ -195,7 +196,11 @@ export function CopyAvailabilityDialog(props: ManagedDialogProps) {
class="flex w-full items-center justify-between gap-2 text-sm text-ink-muted"
>
Could not load availability.
- <Button variant="outline" size="sm" onClick={availability.retry}>
+ <Button
+ variant="secondary"
+ size="sm"
+ onClick={availability.retry}
+ >
Retry
</Button>
</div>
@@ -225,7 +230,7 @@ export function CopyAvailabilityDialog(props: ManagedDialogProps) {
tabIndex={unavailable() ? 0 : undefined}
>
<Button
- variant="strong"
+ variant="secondary"
size="md"
class={cn(
'w-full px-2 disabled:cursor-not-allowed disabled:opacity-50',
diff --git a/apps/web/src/features/calendar/components/CalendarSettingsDropdown.tsx b/apps/web/src/features/calendar/components/CalendarSettingsDropdown.tsx
index 7917f1e52f..8d097b5c23 100644
--- a/apps/web/src/features/calendar/components/CalendarSettingsDropdown.tsx
+++ b/apps/web/src/features/calendar/components/CalendarSettingsDropdown.tsx
@@ -197,7 +197,7 @@ function DesktopCalendarSettings(props: {
>
<Show when={props.sidebar} fallback={<GearIcon class="size-5" />}>
<ViewSidebar.Icon>
- <GearIcon />
+ <GearIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</ViewSidebar.Icon>
<span class="min-w-0 truncate">Settings</span>
</Show>
@@ -383,7 +383,7 @@ function MobileCalendarSettings(props: {
>
<Show when={props.sidebar} fallback={<GearIcon class="size-6" />}>
<ViewSidebar.Icon>
- <GearIcon />
+ <GearIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</ViewSidebar.Icon>
<span class="min-w-0 truncate">Settings</span>
</Show>
diff --git a/apps/web/src/features/calendar/components/EventDetails.tsx b/apps/web/src/features/calendar/components/EventDetails.tsx
index 36b47b6df2..e323525879 100644
--- a/apps/web/src/features/calendar/components/EventDetails.tsx
+++ b/apps/web/src/features/calendar/components/EventDetails.tsx
@@ -557,7 +557,7 @@ export function EventDetails(props: {
<Button
variant="ghost"
size="sm"
- class="h-8 min-w-0 bg-hover text-ink not-touch:not-disabled:hover:bg-active [&_svg]:size-3.5!"
+ class="h-8 min-w-0 bg-hover text-ink not-touch:not-disabled:hover:bg-active"
onClick={() =>
openExternalUrl(
conferenceJoinUrl(url(), props.event.calendar.emailAddress)
@@ -565,13 +565,14 @@ export function EventDetails(props: {
}
>
{conferenceLabel()}
- <ArrowSquareOutIcon />
+ <ArrowSquareOutIcon class="size-3.5 shrink-0" />
</Button>
<Button
+ aria-label="Copy call link"
+ tooltip="Copy call link"
variant="ghost"
size="icon-sm"
class="shrink-0"
- label="Copy call link"
onClick={async () => {
if (await writeClipboardData({ 'text/plain': url() })) {
toast.success('Call link copied');
diff --git a/apps/web/src/features/calendar/components/EventReplacementDialog.tsx b/apps/web/src/features/calendar/components/EventReplacementDialog.tsx
index 34cfce5a92..e945a816fd 100644
--- a/apps/web/src/features/calendar/components/EventReplacementDialog.tsx
+++ b/apps/web/src/features/calendar/components/EventReplacementDialog.tsx
@@ -44,7 +44,7 @@ function ReplacementConfirmation(props: {
</span>
</label>
<Button
- variant="strong"
+ variant="secondary"
disabled={props.pending || !accepted()}
onClick={props.onConfirm}
>
@@ -115,7 +115,7 @@ export function EventReplacementDialog(props: {
</p>
</Show>
<Button
- variant="strong"
+ variant="secondary"
disabled={state.pending()}
onClick={() =>
fireAndForget(state.prepare(), 'calendar-replacement')
@@ -158,6 +158,7 @@ export function EventReplacementDialog(props: {
</p>
<div class="flex flex-wrap gap-2">
<Button
+ variant="ghost"
disabled={state.pending()}
onClick={() =>
fireAndForget(
@@ -169,6 +170,7 @@ export function EventReplacementDialog(props: {
Check progress
</Button>
<Button
+ variant="primary"
disabled={state.pending()}
onClick={() =>
fireAndForget(
@@ -208,7 +210,7 @@ export function EventReplacementDialog(props: {
<p role="status">
Replacement complete. The old invitation was cancelled.
</p>
- <Button variant="strong" onClick={props.onDone}>
+ <Button variant="secondary" onClick={props.onDone}>
Done
</Button>
</Show>
diff --git a/apps/web/src/features/calendar/components/EventRsvpScopeDialog.tsx b/apps/web/src/features/calendar/components/EventRsvpScopeDialog.tsx
index f2650d4be6..e4b140538a 100644
--- a/apps/web/src/features/calendar/components/EventRsvpScopeDialog.tsx
+++ b/apps/web/src/features/calendar/components/EventRsvpScopeDialog.tsx
@@ -40,7 +40,7 @@ export function EventRsvpScopeDialog(props: {
variant="ghost"
size="icon-sm"
>
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="m-0 p-0 text-sm font-medium">
RSVP to recurring event
@@ -70,7 +70,7 @@ export function EventRsvpScopeDialog(props: {
<Button variant="ghost" onClick={props.onClose}>
Cancel
</Button>
- <Button variant="strong" onClick={props.onConfirm}>
+ <Button variant="secondary" onClick={props.onConfirm}>
OK
</Button>
</div>
@@ -152,7 +152,7 @@ export function EventRsvpScopeDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
class="min-h-11 flex-1"
onClick={props.onConfirm}
>
diff --git a/apps/web/src/features/calendar/components/MonthDrawer.tsx b/apps/web/src/features/calendar/components/MonthDrawer.tsx
index ac36b6a7bd..4ce393f157 100644
--- a/apps/web/src/features/calendar/components/MonthDrawer.tsx
+++ b/apps/web/src/features/calendar/components/MonthDrawer.tsx
@@ -42,6 +42,7 @@ export function MonthDrawer(props: MonthDrawerProps) {
preventScrollbarShift={false}
>
<MobileDrawer.Trigger
+ variant="ghost"
as={Button}
aria-label="Choose month"
class="max-w-full min-w-0 shrink justify-start gap-1 rounded-full border-none bg-transparent px-1 text-base font-semibold text-ink not-touch:hover:bg-hover"
diff --git a/apps/web/src/features/calendar/components/PeriodSelector.tsx b/apps/web/src/features/calendar/components/PeriodSelector.tsx
index a6f47f1ec0..70d950426c 100644
--- a/apps/web/src/features/calendar/components/PeriodSelector.tsx
+++ b/apps/web/src/features/calendar/components/PeriodSelector.tsx
@@ -4,7 +4,13 @@ import CalendarIcon from '@icon/system/regular/calendar-blank.svg';
import CaretDownIcon from '@icon/system/regular/caret-down.svg';
import CaretRightIcon from '@icon/system/regular/caret-right.svg';
import CheckIcon from '@icon/system/regular/check.svg';
-import { Dropdown, Hotkey, Calendar as MiniCalendar } from '@ui';
+import {
+ Button,
+ ButtonGroup,
+ Dropdown,
+ Hotkey,
+ Calendar as MiniCalendar,
+} from '@ui';
import { createMemo, For, Show } from 'solid-js';
import { createStore } from 'solid-js/store';
import type { CalendarPeriodView } from '../types';
@@ -133,6 +139,7 @@ function CustomDatePicker(props: { controls: CalendarPeriodControls }) {
export function PeriodSelector(props: {
isNarrow?: boolean;
compact?: boolean;
+ grouped?: boolean;
}) {
const controls = createCalendarPeriodControls();
@@ -143,9 +150,10 @@ export function PeriodSelector(props: {
placement="bottom-end"
>
<Dropdown.Trigger
+ as={props.grouped ? ButtonGroup.Button : Button}
aria-label="Choose calendar view"
variant="ghost"
- size={props.compact ? 'md' : 'lg'}
+ size={props.grouped ? undefined : props.compact ? 'md' : 'lg'}
class="shrink-0 border-transparent bg-transparent text-sm"
>
{CALENDAR_VIEWS.find((view) => view.value === controls.activeView())
diff --git a/apps/web/src/features/calendar/components/SourceControls.tsx b/apps/web/src/features/calendar/components/SourceControls.tsx
index b4a83ae5f5..7db5d3b35b 100644
--- a/apps/web/src/features/calendar/components/SourceControls.tsx
+++ b/apps/web/src/features/calendar/components/SourceControls.tsx
@@ -80,7 +80,7 @@ export function SourceControls(props: SourceControlsProps) {
</Checkbox>
<span class="absolute right-(--sidebar-action-inset) top-1/2 flex -translate-y-1/2">
<ViewSidebar.Control
- label={`${expanded() ? 'Collapse' : 'Expand'} ${group.emailAddress}`}
+ aria-label={`${expanded() ? 'Collapse' : 'Expand'} ${group.emailAddress}`}
aria-expanded={expanded()}
onClick={() => toggleExpanded(group.key)}
>
diff --git a/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsx b/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsx
index a079dfe1cb..9c6b46b2d1 100644
--- a/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsx
+++ b/apps/web/src/features/calendar/components/TurnOffCalendarDialog.tsx
@@ -66,15 +66,13 @@ export function TurnOffCalendarDialog(props: {
<div class="pt-3 justify-end items-center gap-3 inline-flex">
<Button
variant="ghost"
- depth={3}
onClick={props.onClose}
disabled={disableCalendar.isPending}
>
Cancel
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="secondary"
onClick={confirm}
disabled={disableCalendar.isPending}
>
diff --git a/apps/web/src/features/calendar/components/composer/EventForm.tsx b/apps/web/src/features/calendar/components/composer/EventForm.tsx
index 1b58039b31..0f832dc6cb 100644
--- a/apps/web/src/features/calendar/components/composer/EventForm.tsx
+++ b/apps/web/src/features/calendar/components/composer/EventForm.tsx
@@ -556,8 +556,7 @@ export function EventForm(props: EventFormProps) {
</Button>
<Button
type="submit"
- variant="strong"
- depth={3}
+ variant="primary"
disabled={!controller.canSave() || formIsDisabled()}
aria-label={isEdit() ? 'Save' : 'Create event'}
>
diff --git a/apps/web/src/features/calendar/components/composer/EventGuestsEditor.tsx b/apps/web/src/features/calendar/components/composer/EventGuestsEditor.tsx
index e88d48e697..487b8ef2b5 100644
--- a/apps/web/src/features/calendar/components/composer/EventGuestsEditor.tsx
+++ b/apps/web/src/features/calendar/components/composer/EventGuestsEditor.tsx
@@ -142,17 +142,18 @@ export function AddOnlyGuestsEditor(props: {
<EventGuestRow guest={guest}>
{props.addedControls?.(guest)}
<Button
- label={`Remove ${guestDisplayName(guest)}`}
+ aria-label={`Remove ${guestDisplayName(guest)}`}
+ tooltip={`Remove ${guestDisplayName(guest)}`}
variant="ghost"
size="icon-sm"
- class="shrink-0 text-ink-muted [&_svg]:size-3.5"
+ class="shrink-0 text-ink-muted"
onClick={() =>
props.onAddedChange(
props.added.filter((added) => added.id !== guest.id)
)
}
>
- <XIcon />
+ <XIcon class="size-3.5 shrink-0" />
</Button>
</EventGuestRow>
</li>
diff --git a/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsx b/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsx
index a1832bb54e..7db5869b9c 100644
--- a/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsx
+++ b/apps/web/src/features/calendar/components/composer/RecurrenceBuilder.tsx
@@ -136,7 +136,7 @@ export function RecurrenceBuilder(props: RecurrenceBuilderProps) {
{(code) => (
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="icon-sm"
class="text-xxs"
aria-label={code}
diff --git a/apps/web/src/features/calendar/components/connected-calendars.tsx b/apps/web/src/features/calendar/components/connected-calendars.tsx
index 15048f6209..5a8c333aa4 100644
--- a/apps/web/src/features/calendar/components/connected-calendars.tsx
+++ b/apps/web/src/features/calendar/components/connected-calendars.tsx
@@ -64,7 +64,7 @@ export function ConnectedCalendars(props: {
<Show when={props.canConnect}>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.connecting}
onClick={props.onConnect}
>
@@ -77,7 +77,7 @@ export function ConnectedCalendars(props: {
{(account) => (
<Button
size="sm"
- variant="cta"
+ variant="primary"
disabled={props.connecting}
onClick={() => props.onEnable(account())}
>
@@ -97,7 +97,7 @@ export function ConnectedCalendars(props: {
class="flex items-center justify-between gap-3 px-6 py-4 text-sm text-ink-muted"
>
Could not load calendars.
- <Button size="sm" variant="outline" onClick={props.onRetry}>
+ <Button size="sm" variant="secondary" onClick={props.onRetry}>
Retry
</Button>
</div>
diff --git a/apps/web/src/features/calls-view/components/calls-header.tsx b/apps/web/src/features/calls-view/components/calls-header.tsx
index cc62be242a..e377dd8898 100644
--- a/apps/web/src/features/calls-view/components/calls-header.tsx
+++ b/apps/web/src/features/calls-view/components/calls-header.tsx
@@ -52,10 +52,11 @@ export function CallsHeader() {
title={<ViewSidebar.Title caret={false}>{title()}</ViewSidebar.Title>}
>
<HeaderActionGroup label="Call filters">
- <UnifiedFilterDropdown hideLabel variant="ghost" />
+ <UnifiedFilterDropdown grouped hideLabel variant="ghost" />
</HeaderActionGroup>
<HeaderActionGroup label="Call view options">
<ListSortDropdown
+ grouped
label="Sort calls"
value={
DEFAULT_SORT_OPTIONS.find(
@@ -71,7 +72,7 @@ export function CallsHeader() {
open={sortOpen()}
onOpenChange={setSortOpen}
/>
- <SoupViewContextGroup hideLabel variant="ghost" />
+ <SoupViewContextGroup grouped hideLabel variant="ghost" />
</HeaderActionGroup>
<NewCallButton />
<ListHeaderSearch
diff --git a/apps/web/src/features/changes/components/ChangesHeader.tsx b/apps/web/src/features/changes/components/ChangesHeader.tsx
index a7c8c6245a..645b1ce4b1 100644
--- a/apps/web/src/features/changes/components/ChangesHeader.tsx
+++ b/apps/web/src/features/changes/components/ChangesHeader.tsx
@@ -31,12 +31,13 @@ export function ChangesHeader(props: {
<>
<Show when={props.mobile}>
<Button
+ aria-label="Back to conversation"
+ tooltip="Back to conversation"
variant="ghost"
size="icon-sm"
- label="Back to conversation"
onClick={props.onClose}
>
- <ArrowLeftIcon />
+ <ArrowLeftIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<div class="flex min-w-0 flex-1 flex-wrap items-center gap-x-2 gap-y-0.5">
@@ -123,26 +124,36 @@ export function ChangesHeader(props: {
<Show when={!props.mobile}>
<Show when={props.onSpotlight}>
<Button
- variant="ghost"
- size="icon-sm"
- aria-pressed={props.spotlit}
- label={
+ aria-label={
props.spotlit
? 'Back to the split'
: 'Expand changes to the full width'
}
+ tooltip={
+ props.spotlit
+ ? 'Back to the split'
+ : 'Expand changes to the full width'
+ }
+ variant="ghost"
+ size="icon-sm"
+ aria-pressed={props.spotlit}
onClick={() => props.onSpotlight?.()}
>
- {props.spotlit ? <ArrowsInSimpleIcon /> : <ArrowsOutSimpleIcon />}
+ {props.spotlit ? (
+ <ArrowsInSimpleIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ ) : (
+ <ArrowsOutSimpleIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
</Show>
<Button
+ aria-label="Close the changes pane"
+ tooltip="Close the changes pane"
variant="ghost"
size="icon-sm"
- label="Close the changes pane"
onClick={() => props.onClose()}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</>
diff --git a/apps/web/src/features/changes/components/ChangesNotice.tsx b/apps/web/src/features/changes/components/ChangesNotice.tsx
index 6e4dad4a82..0e75e2f479 100644
--- a/apps/web/src/features/changes/components/ChangesNotice.tsx
+++ b/apps/web/src/features/changes/components/ChangesNotice.tsx
@@ -27,14 +27,18 @@ export function ChangesNotice(props: {
</Show>
<Show when={props.onRefresh}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="mt-2 gap-1.5"
disabled={props.refreshing}
onClick={() => props.onRefresh?.()}
>
<ArrowsClockwiseIcon
- class={props.refreshing ? 'animate-spin' : undefined}
+ class={
+ props.refreshing
+ ? 'size-3 shrink-0 touch:size-6 animate-spin'
+ : 'size-3 shrink-0 touch:size-6'
+ }
/>
<span>Refresh changes</span>
</Button>
diff --git a/apps/web/src/features/changes/components/ChangesReadyCard.tsx b/apps/web/src/features/changes/components/ChangesReadyCard.tsx
index d0385d5980..6b759febb8 100644
--- a/apps/web/src/features/changes/components/ChangesReadyCard.tsx
+++ b/apps/web/src/features/changes/components/ChangesReadyCard.tsx
@@ -37,7 +37,7 @@ export function ChangesReadyCard(props: {
tooltip="Dismiss"
onClick={() => props.onDismiss()}
>
- <XIcon />
+ <XIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="flex items-center gap-2 font-mono text-[11px] text-ink-placeholder">
@@ -46,7 +46,7 @@ export function ChangesReadyCard(props: {
</div>
<div class="flex flex-wrap gap-1.5">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="gap-1.5"
onClick={() => props.onReview()}
@@ -56,7 +56,7 @@ export function ChangesReadyCard(props: {
</Button>
<Show when={props.linkedUrl}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="gap-1.5"
onClick={props.onViewPullRequest}
diff --git a/apps/web/src/features/changes/components/ChangesToggleButton.tsx b/apps/web/src/features/changes/components/ChangesToggleButton.tsx
index eac6d7c97d..5335f1673b 100644
--- a/apps/web/src/features/changes/components/ChangesToggleButton.tsx
+++ b/apps/web/src/features/changes/components/ChangesToggleButton.tsx
@@ -1,25 +1,32 @@
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import SquareSplitHorizontalIcon from '@icon/system/regular/square-split-horizontal.svg';
-import { Button } from '@ui';
+import { Button, ButtonGroup, cn } from '@ui';
/** Toggles the changes pane; totals live beside the pane's branch range. */
export function ChangesToggleButton(props: {
open: boolean;
+ grouped?: boolean;
onToggle: () => void;
}) {
+ const Control = props.grouped ? ButtonGroup.Button : Button;
return (
- <Button
+ <Control
+ aria-label="Changes"
variant="ghost"
- size={isTouchDevice() ? 'sm' : 'md'}
- label="Changes"
+ size={isTouchDevice() || props.grouped ? 'sm' : 'md'}
aria-pressed={props.open}
tooltip={props.open ? 'Hide the changes pane' : 'Show the changes pane'}
// The label collapses as the header narrows; the pressed fill marks open.
- class="touch:h-7 gap-1.5 not-touch:@max-[28rem]/split-header:w-8 touch:@max-[28rem]/split-header:w-7 @max-[28rem]/split-header:gap-0 @max-[28rem]/split-header:px-0"
+ class={cn(
+ 'touch:h-7 gap-1.5 touch:@max-[28rem]/split-header:w-7 @max-[28rem]/split-header:gap-0 @max-[28rem]/split-header:px-0',
+ props.grouped
+ ? 'not-touch:@max-[28rem]/split-header:w-7'
+ : 'not-touch:@max-[28rem]/split-header:w-8'
+ )}
onClick={() => props.onToggle()}
>
<SquareSplitHorizontalIcon class="size-3.5" />
<span class="@max-[28rem]/split-header:hidden">Changes</span>
- </Button>
+ </Control>
);
}
diff --git a/apps/web/src/features/changes/components/CopyFilePathButton.tsx b/apps/web/src/features/changes/components/CopyFilePathButton.tsx
index 27a4e2c876..613ab48758 100644
--- a/apps/web/src/features/changes/components/CopyFilePathButton.tsx
+++ b/apps/web/src/features/changes/components/CopyFilePathButton.tsx
@@ -40,8 +40,13 @@ export function CopyFilePathButton(props: {
class="motion-safe:transition-transform motion-safe:duration-150 motion-safe:active:scale-95"
onClick={() => fireAndForget(copy(), 'changes')}
>
- <Show when={copied()} fallback={<CopyIcon />}>
- <CheckIcon class="text-success" />
+ <Show
+ when={copied()}
+ fallback={
+ <CopyIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ >
+ <CheckIcon class="text-success size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
<span class="sr-only" aria-live="polite">
diff --git a/apps/web/src/features/changes/components/NoteAnnotation.tsx b/apps/web/src/features/changes/components/NoteAnnotation.tsx
index 39bfa266ae..3d77d1f3ec 100644
--- a/apps/web/src/features/changes/components/NoteAnnotation.tsx
+++ b/apps/web/src/features/changes/components/NoteAnnotation.tsx
@@ -41,7 +41,7 @@ function NoteEditor(props: {
/>
<div class="flex items-center gap-1.5">
<Button
- variant="cta"
+ variant="primary"
size="xs"
class="h-6.5 px-2.5"
disabled={props.draft.text.trim() === ''}
@@ -104,7 +104,7 @@ export function NoteAnnotation(props: {
tooltip="Remove note"
onClick={() => props.onRemove(note.id)}
>
- <XIcon />
+ <XIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
diff --git a/apps/web/src/features/changes/components/ReviewNotesChip.tsx b/apps/web/src/features/changes/components/ReviewNotesChip.tsx
index 30abfb17ae..cf0c5747e0 100644
--- a/apps/web/src/features/changes/components/ReviewNotesChip.tsx
+++ b/apps/web/src/features/changes/components/ReviewNotesChip.tsx
@@ -99,7 +99,7 @@ export function ReviewNotesChip(props: {
tooltip="Remove note"
onClick={() => props.onRemove(note().id)}
>
- <XIcon />
+ <XIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<textarea
diff --git a/apps/web/src/features/changes/debug/Gallery.tsx b/apps/web/src/features/changes/debug/Gallery.tsx
index 431064043f..d93c17362c 100644
--- a/apps/web/src/features/changes/debug/Gallery.tsx
+++ b/apps/web/src/features/changes/debug/Gallery.tsx
@@ -97,7 +97,7 @@ export default function ChangesGallery() {
</p>
<div class="flex flex-wrap gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="self-start"
onClick={() =>
@@ -109,7 +109,7 @@ export default function ChangesGallery() {
Simulate the agent linking PR #1482
</Button>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="self-start"
aria-pressed={queued()}
diff --git a/apps/web/src/features/changes/views/ChangesControls.tsx b/apps/web/src/features/changes/views/ChangesControls.tsx
index f8af4ae673..aae7d20396 100644
--- a/apps/web/src/features/changes/views/ChangesControls.tsx
+++ b/apps/web/src/features/changes/views/ChangesControls.tsx
@@ -19,6 +19,7 @@ export function ChangesToggle() {
<Show when={available()}>
<HeaderActionGroup label="Changes view">
<ChangesToggleButton
+ grouped
open={layout.changesVisible()}
onToggle={layout.toggle}
/>
diff --git a/apps/web/src/features/changes/views/ChangesPane.tsx b/apps/web/src/features/changes/views/ChangesPane.tsx
index 5bc3e3d87f..b1b16513df 100644
--- a/apps/web/src/features/changes/views/ChangesPane.tsx
+++ b/apps/web/src/features/changes/views/ChangesPane.tsx
@@ -108,13 +108,14 @@ function ChangesTreeToggle(props: {
</Dialog.Trigger>
) : (
<Button
+ aria-label={label()}
+ tooltip={label()}
variant="ghost"
size="icon-sm"
- label={label()}
aria-expanded={open()}
onClick={props.onToggle ?? layout.toggleTree}
>
- <SidebarIcon />
+ <SidebarIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -156,13 +157,19 @@ function ChangesControls(props: { narrow: boolean; drawerOpen: boolean }) {
<span class="flex-1" />
<DiffView.CollapseAll iconOnly />
<Button
+ aria-label="Refresh pull request changes"
+ tooltip="Refresh pull request changes"
variant="ghost"
size="icon-sm"
- label="Refresh pull request changes"
disabled={refreshing()}
onClick={() => fireAndForget(model.refresh(), 'changes')}
>
- <ArrowsClockwiseIcon class={cn(refreshing() && 'animate-spin')} />
+ <ArrowsClockwiseIcon
+ class={cn(
+ 'size-3.5 shrink-0 touch:size-6',
+ refreshing() && 'animate-spin'
+ )}
+ />
</Button>
</div>
);
@@ -377,7 +384,7 @@ function ChangesBodyContent(props: {
The diff could not be loaded
</p>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={model.retryPatch}
>
diff --git a/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsx b/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsx
index ffd20a4133..cf7b0a379c 100644
--- a/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsx
+++ b/apps/web/src/features/channel-invitations/ChannelInviteAcceptance.tsx
@@ -89,7 +89,7 @@ function InvalidInviteLink() {
This channel invitation is invalid or no longer available.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={() => navigate('/')}
@@ -108,7 +108,7 @@ function UnauthenticatedView(props: { onLogin: () => void }) {
Sign in or create an account to accept this channel invitation.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={props.onLogin}
@@ -131,7 +131,12 @@ function JoinConfirmation(props: { onJoin: () => void }) {
Confirm that you want to join this channel.
</p>
</div>
- <Button variant="outline" size="md" class="w-full" onClick={props.onJoin}>
+ <Button
+ variant="secondary"
+ size="md"
+ class="w-full"
+ onClick={props.onJoin}
+ >
Join Channel
</Button>
</div>
@@ -146,7 +151,7 @@ function ServerError(props: { onRetry: () => void }) {
Something went wrong while joining the channel. Please try again.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={props.onRetry}
diff --git a/apps/web/src/features/channel/Attachments/SectionHeader.tsx b/apps/web/src/features/channel/Attachments/SectionHeader.tsx
index f2a48a1c25..9206421ca9 100644
--- a/apps/web/src/features/channel/Attachments/SectionHeader.tsx
+++ b/apps/web/src/features/channel/Attachments/SectionHeader.tsx
@@ -40,9 +40,8 @@ export function LoadMoreButton(props: {
}) {
return (
<Button
- variant="outline"
- size="sm"
- depth={4}
+ variant="secondary"
+ size="xs"
class="justify-self-center mt-2 bg-surface"
onClick={() => props.onLoadMore()}
disabled={props.isFetching()}
diff --git a/apps/web/src/features/channel/Bots/BotAdvancedSection.tsx b/apps/web/src/features/channel/Bots/BotAdvancedSection.tsx
index 2c2ac9f74e..200bd19dc0 100644
--- a/apps/web/src/features/channel/Bots/BotAdvancedSection.tsx
+++ b/apps/web/src/features/channel/Bots/BotAdvancedSection.tsx
@@ -19,7 +19,7 @@ export function BotAdvancedSection(props: { children: JSX.Element }) {
>
Advanced
<CaretUpIcon
- class="transition-transform"
+ class="transition-transform size-3.5 touch:size-6 shrink-0 pointer-events-none"
classList={{ 'rotate-180': open() }}
/>
</Button>
diff --git a/apps/web/src/features/channel/Bots/BotCreatePage.tsx b/apps/web/src/features/channel/Bots/BotCreatePage.tsx
index 1bda783290..cbed3e362e 100644
--- a/apps/web/src/features/channel/Bots/BotCreatePage.tsx
+++ b/apps/web/src/features/channel/Bots/BotCreatePage.tsx
@@ -186,7 +186,7 @@ export function BotCreate(props: { channelId?: string; onBack: () => void }) {
disabled={pending()}
onClick={leave}
>
- <CaretLeftIcon />
+ <CaretLeftIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Back to bots
</Button>
<Show when={stage() !== 'ready'}>
@@ -308,7 +308,7 @@ export function BotCreate(props: { channelId?: string; onBack: () => void }) {
<Button type="button" variant="ghost" size="sm" onClick={leave}>
Cancel
</Button>
- <Button type="submit" variant="cta" size="sm">
+ <Button type="submit" variant="primary" size="sm">
Create bot
</Button>
</div>
diff --git a/apps/web/src/features/channel/Bots/BotCreationResult.tsx b/apps/web/src/features/channel/Bots/BotCreationResult.tsx
index eba72512b3..8c45de9faa 100644
--- a/apps/web/src/features/channel/Bots/BotCreationResult.tsx
+++ b/apps/web/src/features/channel/Bots/BotCreationResult.tsx
@@ -105,7 +105,12 @@ export function BotCreationResult(props: {
</div>
<div class="mt-8 flex justify-end border-t border-edge-muted pt-4">
- <Button type="button" variant="cta" size="sm" onClick={props.onDone}>
+ <Button
+ type="button"
+ variant="primary"
+ size="sm"
+ onClick={props.onDone}
+ >
Done
</Button>
</div>
diff --git a/apps/web/src/features/channel/Bots/BotDeleteDialog.tsx b/apps/web/src/features/channel/Bots/BotDeleteDialog.tsx
index b42eb786ba..0b39f018d9 100644
--- a/apps/web/src/features/channel/Bots/BotDeleteDialog.tsx
+++ b/apps/web/src/features/channel/Bots/BotDeleteDialog.tsx
@@ -38,12 +38,12 @@ export function BotDeleteDialog(props: {
</Button>
<Button
type="button"
- variant="strong"
+ variant="secondary"
size="sm"
disabled={props.pending}
onClick={props.onConfirm}
>
- <TrashIcon />
+ <TrashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
{props.pending ? 'Deleting…' : 'Delete bot'}
</Button>
</div>
diff --git a/apps/web/src/features/channel/Bots/BotDetailActions.tsx b/apps/web/src/features/channel/Bots/BotDetailActions.tsx
index 30966891f7..adf96621c5 100644
--- a/apps/web/src/features/channel/Bots/BotDetailActions.tsx
+++ b/apps/web/src/features/channel/Bots/BotDetailActions.tsx
@@ -22,7 +22,7 @@ export function BotDetailActions(props: BotDetailActionsProps) {
disabled={props.pending}
onClick={props.onDelete}
>
- <TrashIcon />
+ <TrashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Delete bot
</Button>
</Show>
@@ -38,7 +38,7 @@ export function BotDetailActions(props: BotDetailActionsProps) {
</Button>
<Button
type="submit"
- variant="cta"
+ variant="primary"
size="sm"
disabled={!props.dirty || props.pending}
>
diff --git a/apps/web/src/features/channel/Bots/BotDetailPage.tsx b/apps/web/src/features/channel/Bots/BotDetailPage.tsx
index 99e833d17f..b764ed206e 100644
--- a/apps/web/src/features/channel/Bots/BotDetailPage.tsx
+++ b/apps/web/src/features/channel/Bots/BotDetailPage.tsx
@@ -216,7 +216,7 @@ export function BotDetail(props: { botId: string; onBack: () => void }) {
disabled={pending()}
onClick={leave}
>
- <CaretLeftIcon />
+ <CaretLeftIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Back to bots
</Button>
<Show
@@ -265,7 +265,7 @@ export function BotDetail(props: { botId: string; onBack: () => void }) {
<Button
type="button"
size="sm"
- variant="outline"
+ variant="secondary"
class="ml-auto"
disabled={agentDm?.pending()}
onClick={() =>
diff --git a/apps/web/src/features/channel/Bots/BotInviteSelect.tsx b/apps/web/src/features/channel/Bots/BotInviteSelect.tsx
index 99846ebc18..8029c88a04 100644
--- a/apps/web/src/features/channel/Bots/BotInviteSelect.tsx
+++ b/apps/web/src/features/channel/Bots/BotInviteSelect.tsx
@@ -149,7 +149,7 @@ export function BotInviteSelect(props: {
</Combobox>
</div>
<Button
- variant="outline"
+ variant="secondary"
disabled={!selectedBot() || addBotMutation.isPending}
onClick={() => fireAndForget(inviteBot(), 'channel-bots')}
>
diff --git a/apps/web/src/features/channel/Bots/BotProfileFields.tsx b/apps/web/src/features/channel/Bots/BotProfileFields.tsx
index 368a98ba12..bccb3e631b 100644
--- a/apps/web/src/features/channel/Bots/BotProfileFields.tsx
+++ b/apps/web/src/features/channel/Bots/BotProfileFields.tsx
@@ -40,12 +40,12 @@ export function BotProfileFields(props: {
</div>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
disabled={props.uploadingAvatar}
onClick={props.onUploadAvatar}
>
- <UploadIcon />
+ <UploadIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
{props.uploadingAvatar ? 'Uploading…' : 'Upload'}
</Button>
</div>
diff --git a/apps/web/src/features/channel/Bots/BotWebhooksSection.tsx b/apps/web/src/features/channel/Bots/BotWebhooksSection.tsx
index 17be918f3c..a1d5477abb 100644
--- a/apps/web/src/features/channel/Bots/BotWebhooksSection.tsx
+++ b/apps/web/src/features/channel/Bots/BotWebhooksSection.tsx
@@ -23,11 +23,11 @@ export function BotWebhooksSection(props: BotWebhooksSectionProps) {
action={
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
onClick={props.onNewToken}
>
- <KeyIcon />
+ <KeyIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
New token
</Button>
}
diff --git a/apps/web/src/features/channel/Bots/CreateBotTokenDialog.tsx b/apps/web/src/features/channel/Bots/CreateBotTokenDialog.tsx
index f801020605..4b407eddd3 100644
--- a/apps/web/src/features/channel/Bots/CreateBotTokenDialog.tsx
+++ b/apps/web/src/features/channel/Bots/CreateBotTokenDialog.tsx
@@ -40,14 +40,14 @@ export function CreateBotTokenDialog(props: {
</Dialog.Title>
<div class="ml-auto">
<Button
+ tooltip="Close"
variant="ghost"
size="icon-sm"
- label="Close"
aria-label="Close"
disabled={minted.isPending()}
onClick={close}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Panel.Header>
@@ -99,7 +99,7 @@ export function CreateBotTokenDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
size="sm"
disabled={isPending}
onClick={mint}
@@ -115,7 +115,7 @@ export function CreateBotTokenDialog(props: {
Store this token somewhere secure before closing.
</div>
<div class="flex justify-end border-t border-edge-muted pt-4">
- <Button variant="strong" size="sm" onClick={close}>
+ <Button variant="secondary" size="sm" onClick={close}>
Done
</Button>
</div>
diff --git a/apps/web/src/features/channel/Bots/CredentialField.tsx b/apps/web/src/features/channel/Bots/CredentialField.tsx
index 3e4e7c6515..02c4bc715f 100644
--- a/apps/web/src/features/channel/Bots/CredentialField.tsx
+++ b/apps/web/src/features/channel/Bots/CredentialField.tsx
@@ -37,14 +37,20 @@ export function CredentialField(props: {
onClick={(event) => event.currentTarget.select()}
/>
<Button
+ aria-label={`Copy ${props.label.toLowerCase()}`}
+ tooltip={`Copy ${props.label.toLowerCase()}`}
type="button"
variant={copied() ? 'success' : 'ghost'}
size="sm"
- label={`Copy ${props.label.toLowerCase()}`}
onClick={copy}
>
- <Show when={copied()} fallback={<CopyIcon />}>
- <CheckIcon />
+ <Show
+ when={copied()}
+ fallback={
+ <CopyIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ >
+ <CheckIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Copied
</Show>
</Button>
diff --git a/apps/web/src/features/channel/Bots/MintCredential.tsx b/apps/web/src/features/channel/Bots/MintCredential.tsx
index d377989025..f663aaf2be 100644
--- a/apps/web/src/features/channel/Bots/MintCredential.tsx
+++ b/apps/web/src/features/channel/Bots/MintCredential.tsx
@@ -60,7 +60,7 @@ export function MintCredential(props: {
<div>
<Button
type="button"
- variant="cta"
+ variant="primary"
size="sm"
disabled={minted.isPending()}
onClick={mint}
diff --git a/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx b/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx
index 0920d7c12b..74e92341ae 100644
--- a/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx
+++ b/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx
@@ -25,23 +25,27 @@ function MediaSplitButton(props: {
const [open, setOpen] = createSignal(false);
return (
<Dropdown placement="top-start" open={open()} onOpenChange={setOpen}>
- <ButtonGroup size="icon-lg" label={props.label}>
- <Button
- label={props.toggleLabel}
- tooltipPlacement="top"
+ <ButtonGroup size="icon-lg" aria-label={props.label}>
+ <ButtonGroup.Button
+ aria-label={props.toggleLabel}
+ tooltip={{ content: props.toggleLabel, placement: 'top' }}
aria-pressed={props.on}
disabled={props.disabled}
onClick={props.onToggle}
>
{props.icon}
- </Button>
+ </ButtonGroup.Button>
<ButtonGroup.Divider />
<Dropdown.Trigger
+ as={ButtonGroup.Button}
variant="ghost"
size="icon-lg"
- label={props.menuLabel}
- tooltipPlacement="top"
- tooltipDisabled={open()}
+ aria-label={props.menuLabel}
+ tooltip={{
+ content: props.menuLabel,
+ placement: 'top',
+ disabled: open(),
+ }}
class="w-6"
>
<CaretUp
@@ -85,8 +89,11 @@ export function CallControlBar(props: {
disabled={props.disabled}
onToggle={props.onToggleAudio}
icon={
- <Show when={props.audioMuted} fallback={<Microphone />}>
- <MicrophoneSlash />
+ <Show
+ when={props.audioMuted}
+ fallback={<Microphone class="size-5" />}
+ >
+ <MicrophoneSlash class="size-5" />
</Show>
}
>
@@ -100,8 +107,11 @@ export function CallControlBar(props: {
disabled={props.disabled}
onToggle={props.onToggleVideo}
icon={
- <Show when={props.videoMuted} fallback={<VideoCamera />}>
- <VideoCameraSlash />
+ <Show
+ when={props.videoMuted}
+ fallback={<VideoCamera class="size-5" />}
+ >
+ <VideoCameraSlash class="size-5" />
</Show>
}
>
@@ -109,23 +119,30 @@ export function CallControlBar(props: {
</MediaSplitButton>
<Button
size="icon-lg"
- variant="outline"
- label={props.screenSharing ? 'Stop sharing screen' : 'Share screen'}
- tooltipPlacement="top"
+ variant="secondary"
+ aria-label={
+ props.screenSharing ? 'Stop sharing screen' : 'Share screen'
+ }
+ tooltip={{
+ content: props.screenSharing
+ ? 'Stop sharing screen'
+ : 'Share screen',
+ placement: 'top',
+ }}
aria-pressed={props.screenSharing}
disabled={props.disabled}
onClick={props.onToggleScreen}
>
- <Screencast />
+ <Screencast class="size-5" />
</Button>
<Button
size="icon-lg"
variant="danger"
- label="Leave call"
- tooltipPlacement="top"
+ aria-label="Leave call"
+ tooltip={{ content: 'Leave call', placement: 'top' }}
onClick={props.onLeave}
>
- <PhoneDisconnect />
+ <PhoneDisconnect class="size-5" />
</Button>
</div>
<Show when={props.error}>
diff --git a/apps/web/src/features/channel/Call/ChannelCallButton.tsx b/apps/web/src/features/channel/Call/ChannelCallButton.tsx
index 0d6ef45e5e..29f1afb5e5 100644
--- a/apps/web/src/features/channel/Call/ChannelCallButton.tsx
+++ b/apps/web/src/features/channel/Call/ChannelCallButton.tsx
@@ -7,7 +7,10 @@ import { Show } from 'solid-js';
import { CHANNEL_TOUR } from '../tour';
import { useStartChannelCall } from './use-start-channel-call';
-export function ChannelCallButton(props: { channelId: string }) {
+export function ChannelCallButton(props: {
+ channelId: string;
+ grouped?: boolean;
+}) {
const call = useStartChannelCall(() => props.channelId);
const tooltip = () => (call.isCallInProgress() ? 'Join Call' : 'Start Call');
@@ -16,11 +19,14 @@ export function ChannelCallButton(props: { channelId: string }) {
return (
<Show when={!call.isInThisChannel()}>
<HeaderActionButton
+ grouped={props.grouped}
ref={tourTarget(CHANNEL_TOUR.call)}
onClick={() => fireAndForget(call.start(), 'channel-call')}
tooltip={tooltip()}
label={label()}
- icon={<PhoneIcon />}
+ icon={
+ <PhoneIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
class={cn(call.isCallInProgress() && 'text-success')}
/>
</Show>
diff --git a/apps/web/src/features/channel/Call/ChannelCallTab.tsx b/apps/web/src/features/channel/Call/ChannelCallTab.tsx
index 0894e95859..8923d6f0f6 100644
--- a/apps/web/src/features/channel/Call/ChannelCallTab.tsx
+++ b/apps/web/src/features/channel/Call/ChannelCallTab.tsx
@@ -79,7 +79,7 @@ function JoinCallEmptyState(props: {
</div>
<Button
- variant="cta"
+ variant="primary"
size="lg"
class="px-5"
onClick={props.onJoin}
diff --git a/apps/web/src/features/channel/Call/NewMeetingButton.tsx b/apps/web/src/features/channel/Call/NewMeetingButton.tsx
index fa25b5d220..46e41ab92d 100644
--- a/apps/web/src/features/channel/Call/NewMeetingButton.tsx
+++ b/apps/web/src/features/channel/Call/NewMeetingButton.tsx
@@ -25,7 +25,7 @@ export function NewMeetingButton(props: NewMeetingActions) {
<Show
when={props.presentation}
fallback={
- <Button variant="accent" size="sm" onClick={props.onChannelCall}>
+ <Button variant="primary" size="sm" onClick={props.onChannelCall}>
<VideoCameraIcon class="size-3.5" />
New call
</Button>
@@ -62,10 +62,11 @@ function NewMeetingMenu(props: NewMeetingActions) {
when={props.presentation}
fallback={
<Dropdown.Trigger
- variant="accent"
+ aria-label="New call"
+ tooltip="New call"
+ variant="primary"
size="sm"
class="gap-1.5 px-2"
- label="New call"
>
<VideoCameraIcon class="size-3.5" />
<span>New call</span>
diff --git a/apps/web/src/features/channel/Call/chat/GuestCallChat.tsx b/apps/web/src/features/channel/Call/chat/GuestCallChat.tsx
index 3d5cc919b2..54f8a0d52a 100644
--- a/apps/web/src/features/channel/Call/chat/GuestCallChat.tsx
+++ b/apps/web/src/features/channel/Call/chat/GuestCallChat.tsx
@@ -94,6 +94,7 @@ function GuestCallChatContent(props: GuestCallChatProps) {
/>
</TextField>
<Button
+ variant="primary"
type="submit"
class="mt-2"
disabled={!chat.ready() || chat.sending() || !content().trim()}
@@ -115,6 +116,7 @@ function GuestCallChatContent(props: GuestCallChatProps) {
: 'Could not load chat.'}
</p>
<Button
+ variant="ghost"
type="button"
onClick={() => fireAndForget(chat.refresh(), 'meetings')}
>
diff --git a/apps/web/src/features/channel/Calls/ChannelCallsTab.tsx b/apps/web/src/features/channel/Calls/ChannelCallsTab.tsx
index c403a87509..8b9aedb0bd 100644
--- a/apps/web/src/features/channel/Calls/ChannelCallsTab.tsx
+++ b/apps/web/src/features/channel/Calls/ChannelCallsTab.tsx
@@ -292,7 +292,7 @@ function ChannelCallsList(props: { channelId: string }) {
: 'Calls couldn’t be loaded.'}
</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(source.refresh(), 'channel-calls')
@@ -424,9 +424,8 @@ function ChannelCallsList(props: { channelId: string }) {
}
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={2}
disabled={loadMore().isLoading}
class="bg-surface"
>
diff --git a/apps/web/src/features/channel/Channel/ChannelDetail.tsx b/apps/web/src/features/channel/Channel/ChannelDetail.tsx
index 680b7a4910..229589cef6 100644
--- a/apps/web/src/features/channel/Channel/ChannelDetail.tsx
+++ b/apps/web/src/features/channel/Channel/ChannelDetail.tsx
@@ -142,6 +142,7 @@ export function ChannelDetailTabs(props: {
return (
<Tabs
aria-label="Channel sections"
+ size="md"
touch="inset"
class="shrink-0"
options={isCollapsed() ? withChannelTabIcons(tabs()) : tabs()}
@@ -180,13 +181,17 @@ export function ChannelDetailActions(props: ChannelDetailHeaderProps) {
when={ENABLE_CALLS && !channel()?.agent_dm && !call.isInThisChannel()}
>
<DebugSuspense name="ChannelDetail.call-button">
- <ChannelCallButton channelId={props.channelId} />
+ <ChannelCallButton grouped channelId={props.channelId} />
</DebugSuspense>
</Show>
<Show when={askMacroEntity()}>
{(entity) => (
<DebugSuspense name="ChannelDetail.ask-macro">
- <ChatWithAgentButton entity={entity()} label="Ask Macro" />
+ <ChatWithAgentButton
+ grouped
+ entity={entity()}
+ label="Ask Macro"
+ />
</DebugSuspense>
)}
</Show>
@@ -215,11 +220,12 @@ export function ChannelDetailTopBar(
return (
<ViewShell.TopBar ref={collapse.setRow} class="gap-3 py-0">
+ {/* Reserve room for the tab outline inside the clipped, measured region. */}
<PriorityCollapseOverflowSensor
controller={collapse}
truncateAsLastResort
class="relative h-full min-w-0 shrink overflow-hidden"
- contentClass="flex h-full items-center gap-3"
+ contentClass="flex h-full items-center gap-3 not-touch:pr-1"
>
<div class="flex min-w-0 shrink items-center gap-1">
<DebugSuspense name="ChannelDetail.title">
diff --git a/apps/web/src/features/channel/Channel/ChannelTitleMenu.tsx b/apps/web/src/features/channel/Channel/ChannelTitleMenu.tsx
index 85332640c3..760e465720 100644
--- a/apps/web/src/features/channel/Channel/ChannelTitleMenu.tsx
+++ b/apps/web/src/features/channel/Channel/ChannelTitleMenu.tsx
@@ -33,9 +33,9 @@ export function ChannelTitleMenu(props: { channelId: string }) {
entity={current()}
list={list}
viewContext={CHANNEL_ACTION_VIEW_CONTEXT}
- triggerProps={{ size: 'icon-sm', label: 'Channel actions' }}
+ triggerProps={{ size: 'icon-sm', 'aria-label': 'Channel actions' }}
>
- <DotsThreeIcon />
+ <DotsThreeIcon class="size-4 shrink-0" />
</SoupEntityActionsDropdown>
)}
</Show>
diff --git a/apps/web/src/features/channel/Channel/tests/channel-detail-top-bar.test.tsx b/apps/web/src/features/channel/Channel/tests/channel-detail-top-bar.test.tsx
index 7ef149bcb7..c7f3bef1e6 100644
--- a/apps/web/src/features/channel/Channel/tests/channel-detail-top-bar.test.tsx
+++ b/apps/web/src/features/channel/Channel/tests/channel-detail-top-bar.test.tsx
@@ -25,9 +25,9 @@ vi.mock('@app/features/soup/entity-notifications', () => ({
vi.mock('@app/features/soup/SoupEntityActionsDropdown', () => ({
SoupEntityActionsDropdown: (props: {
entity: ChannelEntity;
- triggerProps?: { label?: string };
+ triggerProps?: { 'aria-label'?: string };
}) => (
- <button type="button" aria-label={props.triggerProps?.label}>
+ <button type="button" aria-label={props.triggerProps?.['aria-label']}>
{props.entity.id}
</button>
),
diff --git a/apps/web/src/features/channel/CreateChannelModal.tsx b/apps/web/src/features/channel/CreateChannelModal.tsx
index 106740e276..ecc160aae1 100644
--- a/apps/web/src/features/channel/CreateChannelModal.tsx
+++ b/apps/web/src/features/channel/CreateChannelModal.tsx
@@ -285,10 +285,11 @@ export function CreateChannelModal() {
</Show>
</div>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-sm"
- label="Close"
tabIndex={-1}
disabled={
createChannelMutation.isPending ||
@@ -297,7 +298,7 @@ export function CreateChannelModal() {
addAgentMutation.isPending
}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</div>
@@ -456,7 +457,7 @@ export function CreateChannelModal() {
if (step() === 'invite')
fireAndForget(finishInvites(), 'create-channel');
}}
- variant="strong"
+ variant="primary"
disabled={
(step() !== 'invite' && !channelName()) ||
createChannelMutation.isPending ||
diff --git a/apps/web/src/features/channel/Input/ActionButton.tsx b/apps/web/src/features/channel/Input/ActionButton.tsx
index 89ede04dd0..b5424e4d89 100644
--- a/apps/web/src/features/channel/Input/ActionButton.tsx
+++ b/apps/web/src/features/channel/Input/ActionButton.tsx
@@ -11,11 +11,11 @@ export function InputActionButton(props: {
}) {
return (
<Button
+ tooltip={props.label}
aria-label={props.label}
- label={props.label}
disabled={props.disabled}
- variant={props.active ? 'accent' : 'ghost'}
- size="icon-composer"
+ variant={props.active ? 'primary' : 'ghost'}
+ size="icon-md"
class={cn('touch:size-6', props.class)}
onPointerDown={(event: PointerEvent) => event.preventDefault()}
onClick={(event) => props.onClick?.(event)}
diff --git a/apps/web/src/features/channel/Input/ComposerAddMenu.tsx b/apps/web/src/features/channel/Input/ComposerAddMenu.tsx
index b454d6315c..e8270990ad 100644
--- a/apps/web/src/features/channel/Input/ComposerAddMenu.tsx
+++ b/apps/web/src/features/channel/Input/ComposerAddMenu.tsx
@@ -57,8 +57,8 @@ export function ComposerAddMenu(props: {
>
<Button
variant="ghost"
- size="icon-composer"
- class={cn('touch:size-6', props.class)}
+ size="icon-md"
+ class={props.class}
aria-label="Add"
aria-haspopup="dialog"
disabled={props.disabled}
@@ -69,7 +69,7 @@ export function ComposerAddMenu(props: {
}}
onClick={() => props.onOpenDrawer()}
>
- <PlusIcon />
+ <PlusIcon class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
);
@@ -94,14 +94,15 @@ function AddDropdown(props: {
return (
<Dropdown placement={props.placement ?? 'top-start'} gutter={8}>
<Dropdown.Trigger
+ tooltip="Add"
+ data-composer-menu-anchor
variant="ghost"
- size="icon-composer"
- class={cn('touch:size-6', props.class)}
+ size="icon-md"
+ class={props.class}
aria-label="Add"
- label="Add"
disabled={props.disabled}
>
- <PlusIcon />
+ <PlusIcon class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content
class={cn('min-w-56', props.contentClass)}
diff --git a/apps/web/src/features/channel/Input/FormatButtons.tsx b/apps/web/src/features/channel/Input/FormatButtons.tsx
index b29f8fbea9..171d8ddee9 100644
--- a/apps/web/src/features/channel/Input/FormatButtons.tsx
+++ b/apps/web/src/features/channel/Input/FormatButtons.tsx
@@ -104,9 +104,8 @@ type FormatButtonProps = {
function FormatButton(props: FormatButtonProps) {
return (
<Button
+ tooltip={{ content: props.label, hotkey: props.hotkeyToken }}
aria-label={props.label}
- label={props.label}
- hotkey={props.hotkeyToken}
variant="ghost"
size="icon-sm"
class={props.active ? 'bg-active text-ink' : ''}
diff --git a/apps/web/src/features/channel/Input/SendAction.tsx b/apps/web/src/features/channel/Input/SendAction.tsx
index 763accda9c..adab3d5a8c 100644
--- a/apps/web/src/features/channel/Input/SendAction.tsx
+++ b/apps/web/src/features/channel/Input/SendAction.tsx
@@ -29,8 +29,7 @@ export function SendAction(props: SendActionProps) {
return (
<SendButton
appearance="composer"
- tooltip={tooltipText()}
- shortcut="enter"
+ tooltip={{ content: tooltipText(), shortcut: 'enter' }}
aria-label={tooltipText()}
data-input-action="send"
pending={isBlockedByPending()}
diff --git a/apps/web/src/features/channel/Media/MediaGrid.tsx b/apps/web/src/features/channel/Media/MediaGrid.tsx
index e6cd03a720..cca902591c 100644
--- a/apps/web/src/features/channel/Media/MediaGrid.tsx
+++ b/apps/web/src/features/channel/Media/MediaGrid.tsx
@@ -153,13 +153,14 @@ function MessageVideoTile(props: {
<Button
variant="ghost"
size="icon-md"
+ aria-label="Open video viewer"
+ tooltip="Open video viewer"
onClick={(event) => {
event.stopPropagation();
props.onOpen();
}}
- label="Open video viewer"
>
- <ExpandIcon />
+ <ExpandIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</div>
diff --git a/apps/web/src/features/channel/Media/MediaViewerDialog.tsx b/apps/web/src/features/channel/Media/MediaViewerDialog.tsx
index 92ae790728..b6cae351ac 100644
--- a/apps/web/src/features/channel/Media/MediaViewerDialog.tsx
+++ b/apps/web/src/features/channel/Media/MediaViewerDialog.tsx
@@ -94,12 +94,13 @@ function VideoViewerContent(props: {
<LightboxToolbar isVisible={true}>
<FileDownloadButton download={props.download} iconOnly />
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-md"
- label="Close"
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</LightboxToolbar>
diff --git a/apps/web/src/features/channel/Message/Content.tsx b/apps/web/src/features/channel/Message/Content.tsx
index c3c00b1632..985c67d909 100644
--- a/apps/web/src/features/channel/Message/Content.tsx
+++ b/apps/web/src/features/channel/Message/Content.tsx
@@ -134,7 +134,7 @@ function CollapsibleBody(props: { children: JSX.Element }) {
>
<CaretRight
aria-hidden="true"
- class="transition-transform"
+ class="transition-transform size-3 touch:size-6 shrink-0 pointer-events-none"
classList={{ 'rotate-90': expanded() }}
/>
{expanded() ? 'Show less' : 'Show more'}
diff --git a/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx b/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx
index 3078d6723d..e9784cc1f8 100644
--- a/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx
+++ b/apps/web/src/features/channel/Message/EmojiReactionPopover.tsx
@@ -41,7 +41,12 @@ export function EmojiReactionPopover(props: EmojiReactionPopoverProps) {
overflowPadding={8}
slide={true}
>
- <Popover.Trigger as={Button} type="button" {...local.triggerProps}>
+ <Popover.Trigger
+ variant="ghost"
+ as={Button}
+ type="button"
+ {...local.triggerProps}
+ >
{local.trigger}
</Popover.Trigger>
<Popover.Portal>
diff --git a/apps/web/src/features/channel/Message/ReactionChip.tsx b/apps/web/src/features/channel/Message/ReactionChip.tsx
index f8e7ce04ec..d4d0787a18 100644
--- a/apps/web/src/features/channel/Message/ReactionChip.tsx
+++ b/apps/web/src/features/channel/Message/ReactionChip.tsx
@@ -90,7 +90,6 @@ export function ReactionChip(props: ReactionChipProps) {
data-emoji={props.emoji}
data-user-reacted={props.selected ? '' : undefined}
aria-pressed={!!props.selected}
- noTouchResize
ref={(el) =>
touchHandler(el, () => ({
onLongPress: () => {
@@ -100,7 +99,7 @@ export function ReactionChip(props: ReactionChipProps) {
}))
}
size="sm"
- variant={props.selected ? 'accent' : 'outline'}
+ variant={props.selected ? 'primary' : 'secondary'}
class={cn(
'flex flex-row items-center h-7 min-w-7 gap-1',
!props.interactive && 'pointer-events-auto'
diff --git a/apps/web/src/features/channel/Message/Reactions.tsx b/apps/web/src/features/channel/Message/Reactions.tsx
index 5ef9962c57..f566fc4288 100644
--- a/apps/web/src/features/channel/Message/Reactions.tsx
+++ b/apps/web/src/features/channel/Message/Reactions.tsx
@@ -76,7 +76,7 @@ export function Reactions(props: ReactionsProps) {
triggerProps={{
size: 'icon-sm',
tooltip: 'Add reaction',
- variant: 'outline',
+ variant: 'secondary',
class: 'rounded-full h-7 min-w-7',
'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.tsx
index 8cfddf3e8a..af4f806b2d 100644
--- a/apps/web/src/features/channel/Participants/ChannelBotRow.tsx
+++ b/apps/web/src/features/channel/Participants/ChannelBotRow.tsx
@@ -56,20 +56,24 @@ export function ChannelBotRow(props: {
<div class="absolute right-3 top-1/2 -translate-y-1/2">
<Item.Actions>
<Button
+ variant="ghost"
+ aria-label="Copy webhook URL"
+ tooltip="Copy webhook URL"
size="icon-sm"
- label="Copy webhook URL"
onClick={props.onCopyWebhook}
>
- <CopyIcon />
+ <CopyIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Show when={props.editable}>
<Button
+ variant="danger"
+ aria-label={`Remove ${props.bot.name}`}
+ tooltip={`Remove ${props.bot.name}`}
size="icon-sm"
- label={`Remove ${props.bot.name}`}
disabled={props.removing}
onClick={props.onRemove}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</Item.Actions>
diff --git a/apps/web/src/features/channel/Participants/ChannelBotsPanel.tsx b/apps/web/src/features/channel/Participants/ChannelBotsPanel.tsx
index d46b974614..df899810e8 100644
--- a/apps/web/src/features/channel/Participants/ChannelBotsPanel.tsx
+++ b/apps/web/src/features/channel/Participants/ChannelBotsPanel.tsx
@@ -141,7 +141,7 @@ export function ChannelBotsPanel(props: {
<Show when={props.editable}>
<div class="flex flex-wrap items-center gap-2">
<Button variant="ghost" size="sm" onClick={props.onCreateBot}>
- <PlusIcon />
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
New bot
</Button>
</div>
@@ -170,20 +170,22 @@ export function ChannelBotsPanel(props: {
</div>
<Show when={props.editable}>
<Button
- variant="outline"
+ aria-label="New bot"
+ tooltip="New bot"
+ variant="secondary"
size="icon-md"
- label="New bot"
onClick={props.onCreateBot}
>
- <PlusIcon />
+ <PlusIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
- variant="outline"
+ aria-label="Invite bot"
+ tooltip="Invite bot"
+ variant="secondary"
size="icon-md"
- label="Invite bot"
onClick={() => setInviteOpen(true)}
>
- <UserPlusIcon />
+ <UserPlusIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
diff --git a/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.test.tsx b/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.test.tsx
index f84eeb07ba..ca98bc969d 100644
--- a/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.test.tsx
+++ b/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.test.tsx
@@ -34,13 +34,13 @@ vi.mock('@queries/channel/join-links', () => ({
vi.mock('@ui', () => ({
Button: (props: {
children: JSX.Element;
- label?: string;
+ 'aria-label'?: string;
disabled?: boolean;
onClick?: JSX.EventHandlerUnion<HTMLButtonElement, MouseEvent>;
}) => (
<button
type="button"
- aria-label={props.label}
+ aria-label={props['aria-label']}
disabled={props.disabled}
onClick={props.onClick}
>
diff --git a/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsx b/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsx
index 22b8d32422..7f6a19c813 100644
--- a/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsx
+++ b/apps/web/src/features/channel/Participants/ChannelJoinLinkButton.tsx
@@ -75,9 +75,10 @@ export function ChannelJoinLinkButton(props: {
return (
<Button
- variant="outline"
+ aria-label={buttonLabel()}
+ tooltip={buttonLabel()}
+ variant="secondary"
size={props.iconOnly ? 'icon-md' : 'sm'}
- label={buttonLabel()}
disabled={getJoinLinkMutation.isPending}
onClick={() => fireAndForget(copyJoinLink(), 'channel-invite')}
>
diff --git a/apps/web/src/features/channel/Participants/ParticipantsActionSheet.tsx b/apps/web/src/features/channel/Participants/ParticipantsActionSheet.tsx
index 4efdcc6312..a68eb4366e 100644
--- a/apps/web/src/features/channel/Participants/ParticipantsActionSheet.tsx
+++ b/apps/web/src/features/channel/Participants/ParticipantsActionSheet.tsx
@@ -25,12 +25,13 @@ export function ParticipantsActionSheet(
{props.title}
</MobileDrawer.Title>
<Button
+ aria-label="Close"
+ tooltip="Close"
variant="ghost"
size="icon-md"
- label="Close"
onClick={() => props.onOpenChange(false)}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<MobileDrawer.ScrollBody>
diff --git a/apps/web/src/features/channel/Participants/ParticipantsAddPanel.tsx b/apps/web/src/features/channel/Participants/ParticipantsAddPanel.tsx
index c19cd3e088..28fa7bdcd2 100644
--- a/apps/web/src/features/channel/Participants/ParticipantsAddPanel.tsx
+++ b/apps/web/src/features/channel/Participants/ParticipantsAddPanel.tsx
@@ -52,7 +52,7 @@ export function ParticipantsAddPanel(props: {
/>
</div>
<Button
- variant="outline"
+ variant="secondary"
disabled={selectedUsers().length === 0}
onClick={handleAddParticipants}
>
diff --git a/apps/web/src/features/channel/Participants/ParticipantsListItem.tsx b/apps/web/src/features/channel/Participants/ParticipantsListItem.tsx
index a4102e253f..d11083cd0c 100644
--- a/apps/web/src/features/channel/Participants/ParticipantsListItem.tsx
+++ b/apps/web/src/features/channel/Participants/ParticipantsListItem.tsx
@@ -73,7 +73,11 @@ export function ParticipantsListItem(props: {
<Show when={props.editable}>
<div class="absolute right-4 top-1/2 -translate-y-1/2">
<Button
- label={
+ variant="danger"
+ aria-label={
+ canRemove() ? 'Remove participant' : 'Cannot remove participant'
+ }
+ tooltip={
canRemove() ? 'Remove participant' : 'Cannot remove participant'
}
size="icon-sm"
@@ -85,7 +89,7 @@ export function ParticipantsListItem(props: {
props.onRemove();
}}
>
- <IconX />
+ <IconX class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
diff --git a/apps/web/src/features/channel/Participants/ParticipantsMobileLayout.tsx b/apps/web/src/features/channel/Participants/ParticipantsMobileLayout.tsx
index 3e765a7d81..114b42d2fe 100644
--- a/apps/web/src/features/channel/Participants/ParticipantsMobileLayout.tsx
+++ b/apps/web/src/features/channel/Participants/ParticipantsMobileLayout.tsx
@@ -52,12 +52,13 @@ export function ParticipantsMobileLayout(props: {
{props.inviteLink?.()}
<Show when={props.addParticipants}>
<Button
- variant="outline"
+ aria-label="Add participants"
+ tooltip="Add participants"
+ variant="secondary"
size="icon-md"
- label="Add participants"
onClick={() => setAdding(true)}
>
- <UserPlusIcon />
+ <UserPlusIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
diff --git a/apps/web/src/features/channel/channel-invite-button.tsx b/apps/web/src/features/channel/channel-invite-button.tsx
index e9a93e655c..313aefc725 100644
--- a/apps/web/src/features/channel/channel-invite-button.tsx
+++ b/apps/web/src/features/channel/channel-invite-button.tsx
@@ -27,8 +27,11 @@ export function ChannelInviteButton(props: {
<Show when={canInvite()}>
<HeaderActionGroup label="Sharing">
<HeaderActionButton
+ grouped
label="Invite"
- icon={<UserPlusIcon />}
+ icon={
+ <UserPlusIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
tooltip="Invite people"
onClick={() => setOpen(true)}
/>
diff --git a/apps/web/src/features/channel/views/channel-invite-modal.tsx b/apps/web/src/features/channel/views/channel-invite-modal.tsx
index efbeacd62d..99d3fa008e 100644
--- a/apps/web/src/features/channel/views/channel-invite-modal.tsx
+++ b/apps/web/src/features/channel/views/channel-invite-modal.tsx
@@ -63,14 +63,15 @@ export function ChannelInviteModal(props: {
Invite people to {props.channelName}
</Dialog.Title>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-sm"
- label="Close"
tabIndex={-1}
disabled={pending()}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</div>
<RadioGroup
@@ -151,7 +152,7 @@ export function ChannelInviteModal(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="primary"
onClick={() => fireAndForget(addPeople(), 'channel-invite')}
disabled={!canAdd()}
>
diff --git a/apps/web/src/features/channels-view/components/ChannelThreadsView.tsx b/apps/web/src/features/channels-view/components/ChannelThreadsView.tsx
index f65f0e4a74..a0efafc23a 100644
--- a/apps/web/src/features/channels-view/components/ChannelThreadsView.tsx
+++ b/apps/web/src/features/channels-view/components/ChannelThreadsView.tsx
@@ -134,7 +134,7 @@ function ThreadCard(props: {
<div class="flex items-center gap-2 text-xs text-ink-muted">
<span>Couldn’t load this thread.</span>
<Button
- variant="outline"
+ variant="secondary"
size="xs"
onClick={() => fireAndForget(query.refetch(), 'channels-view')}
>
@@ -163,12 +163,13 @@ function ThreadCard(props: {
on hover or keyboard focus, and always on touch, which cannot hover. */}
<div class="absolute top-2 right-2 opacity-0 transition-opacity group-hover/thread-card:opacity-100 group-focus-within/thread-card:opacity-100 touch:opacity-100 motion-reduce:transition-none">
<Button
+ aria-label="View in channel"
+ tooltip="View in channel"
variant="ghost"
size="icon-md"
- label="View in channel"
onClick={() => props.onOpen()}
>
- <ArrowSquareOutIcon />
+ <ArrowSquareOutIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</article>
@@ -224,7 +225,7 @@ function ThreadList(props: {
<div class="flex min-h-40 flex-col items-center justify-center gap-2 text-sm text-ink-muted">
<span>Couldn’t load threads.</span>
<Button
- variant="outline"
+ variant="secondary"
size="xs"
onClick={() =>
fireAndForget(props.query.refresh(), 'channels-view')
@@ -282,7 +283,7 @@ function ThreadList(props: {
<div class="flex items-center justify-center gap-2 py-3 text-xs text-ink-muted">
<span>Couldn’t load more threads.</span>
<Button
- variant="outline"
+ variant="secondary"
size="xs"
onClick={() =>
fireAndForget(props.query.refresh(), 'channels-view')
diff --git a/apps/web/src/features/channels-view/components/ChannelsMobileView.tsx b/apps/web/src/features/channels-view/components/ChannelsMobileView.tsx
index ed3660febb..bb6cc682e5 100644
--- a/apps/web/src/features/channels-view/components/ChannelsMobileView.tsx
+++ b/apps/web/src/features/channels-view/components/ChannelsMobileView.tsx
@@ -235,7 +235,7 @@ export function ChannelsMobileView(props: {
<div class="flex min-h-32 flex-col items-center justify-center gap-3 px-(--mobile-chrome-gutter) text-sm text-ink-muted">
<span>Conversations couldn’t be loaded.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(props.source.refresh(), 'channels-view')
@@ -354,7 +354,7 @@ export function ChannelsMobileView(props: {
<div class="flex items-center justify-center gap-2 py-3 text-xs text-ink-muted">
<span>Couldn’t load more conversations.</span>
<Button
- variant="outline"
+ variant="secondary"
size="xs"
onClick={() =>
fireAndForget(props.source.refresh(), 'channels-view')
diff --git a/apps/web/src/features/channels-view/components/ConversationsCreateMenu.tsx b/apps/web/src/features/channels-view/components/ConversationsCreateMenu.tsx
index 32185205b9..e6b1feed3b 100644
--- a/apps/web/src/features/channels-view/components/ConversationsCreateMenu.tsx
+++ b/apps/web/src/features/channels-view/components/ConversationsCreateMenu.tsx
@@ -22,10 +22,11 @@ export function ConversationsCreateMenu(props: {
when={props.presentation}
fallback={
<Dropdown.Trigger
+ aria-label="Create channel or direct message"
+ tooltip="Create channel or direct message"
as={ViewSidebar.Control}
variant="ghost"
size="icon-sm"
- label="Create channel or direct message"
>
<PlusIcon class="size-3.5" />
</Dropdown.Trigger>
diff --git a/apps/web/src/features/channels-view/components/rail/ChannelLabelNameDialog.tsx b/apps/web/src/features/channels-view/components/rail/ChannelLabelNameDialog.tsx
index 8d2bbf0c54..b2cb08428c 100644
--- a/apps/web/src/features/channels-view/components/rail/ChannelLabelNameDialog.tsx
+++ b/apps/web/src/features/channels-view/components/rail/ChannelLabelNameDialog.tsx
@@ -99,7 +99,6 @@ function LabelNameDialog(
<Button
type="button"
variant="ghost"
- depth={2}
disabled={pending()}
onClick={() => props.onOpenChange(false)}
>
@@ -107,8 +106,7 @@ function LabelNameDialog(
</Button>
<Button
type="submit"
- variant="strong"
- depth={2}
+ variant="primary"
disabled={!canSubmit() || pending()}
>
{pending() ? 'Saving…' : props.confirmLabel}
diff --git a/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx b/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx
index ddb340cae8..c6ecbc05c6 100644
--- a/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx
+++ b/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx
@@ -128,10 +128,11 @@ export function ChannelLabelRow(props: { label: ChannelLabel }) {
<span class="absolute right-(--sidebar-action-inset) top-1/2 flex -translate-y-1/2 items-center gap-0.5">
<Dropdown placement="bottom-end">
<Dropdown.Trigger
+ aria-label={`Options for ${props.label.name}`}
+ tooltip={`Options for ${props.label.name}`}
as={ViewSidebar.Control}
variant="ghost"
size="icon-sm"
- label={`Options for ${props.label.name}`}
class="opacity-0 transition-opacity group-hover/channel-label:opacity-100 focus-visible:opacity-100 data-expanded:opacity-100 touch:opacity-100"
onMouseDown={(event: MouseEvent) => event.stopPropagation()}
>
@@ -185,7 +186,7 @@ export function ChannelLabelRow(props: { label: ChannelLabel }) {
</Dropdown.Content>
</Dropdown>
<ViewSidebar.Control
- label={`${state().open ? 'Collapse' : 'Expand'} ${props.label.name}`}
+ aria-label={`${state().open ? 'Collapse' : 'Expand'} ${props.label.name}`}
aria-expanded={state().open}
onMouseDown={(event) => event.stopPropagation()}
onClick={() => rail.toggleLabel(props.label.id)}
@@ -211,7 +212,7 @@ export function ChannelsCreateMenu() {
when={rail.channelTagsEnabled() && rail.labelsAvailable()}
fallback={
<ViewSidebar.Control
- label="Create channel"
+ aria-label="Create channel"
onClick={openNewChannelModal}
>
<PlusIcon class="size-3.5" />
@@ -220,10 +221,11 @@ export function ChannelsCreateMenu() {
>
<Dropdown placement="bottom-end">
<Dropdown.Trigger
+ aria-label="Create channel or label"
+ tooltip="Create channel or label"
as={ViewSidebar.Control}
variant="ghost"
size="icon-sm"
- label="Create channel or label"
>
<PlusIcon class="size-3.5" />
</Dropdown.Trigger>
diff --git a/apps/web/src/features/channels-view/components/rail/ChannelRailItems.tsx b/apps/web/src/features/channels-view/components/rail/ChannelRailItems.tsx
index 2e793e7aae..f63d62af40 100644
--- a/apps/web/src/features/channels-view/components/rail/ChannelRailItems.tsx
+++ b/apps/web/src/features/channels-view/components/rail/ChannelRailItems.tsx
@@ -146,12 +146,12 @@ export function IncomingCallActions(props: {
)}
>
<Button
+ aria-label="Decline incoming call"
+ tooltip={{ content: 'Decline incoming call', disabled: isWide() }}
variant="danger"
size={isWide() ? 'sm' : 'icon-xs'}
fullWidth={isWide()}
class={cn(isWide() && 'h-7 flex-1')}
- label="Decline incoming call"
- tooltipDisabled={isWide()}
onPointerDown={(event) => event.stopPropagation()}
onMouseDown={(event) => event.stopPropagation()}
onClick={(event) => {
@@ -164,12 +164,12 @@ export function IncomingCallActions(props: {
<Show when={isWide()}>Decline</Show>
</Button>
<Button
+ aria-label="Accept incoming call"
+ tooltip={{ content: 'Accept incoming call', disabled: isWide() }}
variant="success"
size={isWide() ? 'sm' : 'icon-xs'}
fullWidth={isWide()}
class={cn(isWide() && 'h-7 flex-1')}
- label="Accept incoming call"
- tooltipDisabled={isWide()}
onPointerDown={(event) => event.stopPropagation()}
onMouseDown={(event) => event.stopPropagation()}
onClick={(event) => {
diff --git a/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx b/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx
index 13f24f54a6..fb04ab509d 100644
--- a/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx
+++ b/apps/web/src/features/channels-view/components/rail/ChannelsRailSection.tsx
@@ -262,7 +262,7 @@ export function RailListError(props: {
>
<span>Couldn’t load conversations.</span>
<Button
- variant="outline"
+ variant="secondary"
size="xs"
onClick={() => fireAndForget(props.retry(), 'channels-view')}
>
@@ -277,7 +277,7 @@ export function CreateRailAction(props: {
onClick: () => void;
}) {
return (
- <ViewSidebar.Control label={props.label} onClick={props.onClick}>
+ <ViewSidebar.Control aria-label={props.label} onClick={props.onClick}>
<PlusIcon class="size-3.5" />
</ViewSidebar.Control>
);
diff --git a/apps/web/src/features/channels-view/components/rail/ExpandedChannelsRail.tsx b/apps/web/src/features/channels-view/components/rail/ExpandedChannelsRail.tsx
index ee3516bb28..541f7b2199 100644
--- a/apps/web/src/features/channels-view/components/rail/ExpandedChannelsRail.tsx
+++ b/apps/web/src/features/channels-view/components/rail/ExpandedChannelsRail.tsx
@@ -160,10 +160,11 @@ function ChannelSortDropdown(props: {
return (
<Dropdown placement="bottom-end">
<Dropdown.Trigger
+ aria-label={`Sort ${props.label.toLowerCase()}`}
+ tooltip={`Sort ${props.label.toLowerCase()}`}
as={ViewSidebar.Control}
variant="ghost"
size="icon-sm"
- label={`Sort ${props.label.toLowerCase()}`}
>
<SortIcon class="size-3.5" />
</Dropdown.Trigger>
@@ -433,7 +434,7 @@ function ExpandedHeader(props: { search: ChannelRailSearch }) {
/>
<Show when={isTouchDevice()}>
<ViewSidebar.Control
- label={
+ aria-label={
props.search.isOpen() ? 'Close search' : 'Search conversations'
}
aria-pressed={props.search.isOpen()}
diff --git a/apps/web/src/features/channels-view/components/rail/SmartTagDialog.tsx b/apps/web/src/features/channels-view/components/rail/SmartTagDialog.tsx
index bd78a8053c..16f2a66cb5 100644
--- a/apps/web/src/features/channels-view/components/rail/SmartTagDialog.tsx
+++ b/apps/web/src/features/channels-view/components/rail/SmartTagDialog.tsx
@@ -87,14 +87,16 @@ function SmartTagDialog(props: SmartTagDialogProps & ManagedDialogProps) {
</Dialog.Title>
</div>
<Button
+ variant="ghost"
+ aria-label="Close"
+ tooltip="Close"
type="button"
- label="Close"
- size="icon-composer"
+ size="icon-md"
tabIndex={-1}
disabled={saving()}
onClick={() => props.onOpenChange(false)}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="flex flex-col gap-4 px-2">
@@ -141,7 +143,6 @@ function SmartTagDialog(props: SmartTagDialogProps & ManagedDialogProps) {
<Button
type="button"
variant="ghost"
- depth={3}
disabled={saving()}
onClick={() => props.onOpenChange(false)}
>
@@ -149,8 +150,7 @@ function SmartTagDialog(props: SmartTagDialogProps & ManagedDialogProps) {
</Button>
<Button
type="submit"
- variant="strong"
- depth={3}
+ variant="primary"
class="not-touch:h-[33.75px] not-touch:px-[15px]"
disabled={!canSubmit() || saving()}
>
diff --git a/apps/web/src/features/chat/ChatWithAgentButton.tsx b/apps/web/src/features/chat/ChatWithAgentButton.tsx
index dd0c6cfa13..ea71c38737 100644
--- a/apps/web/src/features/chat/ChatWithAgentButton.tsx
+++ b/apps/web/src/features/chat/ChatWithAgentButton.tsx
@@ -12,6 +12,7 @@ import { fileTypeToBlockName } from '@core/constant/allBlocks';
import { fireAndForget } from '@core/util/fireAndForget';
import AgentIcon from '@icon/system/regular/sparkle.svg';
import type { ChannelType } from '@service-cognition/generated/schemas/channelType';
+import type { ButtonSize } from '@ui';
import { createSignal } from 'solid-js';
export { AgentIcon as ChatWithAgentIcon };
@@ -141,6 +142,7 @@ export function ChatWithAgentButton(props: {
/** Button text; defaults to "Chat". */
label?: string;
disabled?: boolean;
+ grouped?: boolean;
}) {
const [opening, setOpening] = createSignal(false);
async function open() {
@@ -154,9 +156,12 @@ export function ChatWithAgentButton(props: {
}
return (
<HeaderActionButton
+ grouped={props.grouped}
tooltip={props.label ?? 'Chat with Agent'}
label={props.label ?? 'Chat'}
- icon={<AgentIcon />}
+ icon={
+ <AgentIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
onClick={() => fireAndForget(open(), 'chat-with-agent')}
disabled={props.disabled || opening()}
busy={opening()}
@@ -164,13 +169,21 @@ export function ChatWithAgentButton(props: {
);
}
-export function AskMacroButton(props: { entity: ChatWithAgentEntity }) {
+export function AskMacroButton(props: {
+ entity: ChatWithAgentEntity;
+ grouped?: boolean;
+ size?: ButtonSize;
+}) {
return (
<HeaderActionButton
+ grouped={props.grouped}
+ size={props.size}
onClick={() => openChatWithAgent(props.entity)}
tooltip="Ask Macro"
label="Ask Macro"
- icon={<AgentIcon />}
+ icon={
+ <AgentIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
/>
);
}
diff --git a/apps/web/src/features/command/components/CreateMenuAction.tsx b/apps/web/src/features/command/components/CreateMenuAction.tsx
index 20516c1367..dc74a98c74 100644
--- a/apps/web/src/features/command/components/CreateMenuAction.tsx
+++ b/apps/web/src/features/command/components/CreateMenuAction.tsx
@@ -11,8 +11,8 @@ export function CreateMenuAction(props: {
return (
<Button
size="md"
- variant="cta"
- class="h-8 rounded-full px-4 font-medium [--color-accent:#fff] [--color-accent-contrast:#000] light-mode:[--color-accent:#000] light-mode:[--color-accent-contrast:#fff]"
+ variant="primary"
+ class="h-8 rounded-full px-4 font-medium"
aria-label={t(
props.shiftHeld ? 'create.createItemInNewSplit' : 'create.createItem',
{ label: props.item.label }
diff --git a/apps/web/src/features/command/mobile/MobileSearchResults.tsx b/apps/web/src/features/command/mobile/MobileSearchResults.tsx
index a67c39ba37..dbf16c3fab 100644
--- a/apps/web/src/features/command/mobile/MobileSearchResults.tsx
+++ b/apps/web/src/features/command/mobile/MobileSearchResults.tsx
@@ -353,6 +353,7 @@ function MobileFullTextResults(props: {
{t('commandMenu.searchFailed')}
</p>
<Button
+ variant="ghost"
onClick={() => fireAndForget(search.refetch(), 'mobile-search')}
>
{t('commandMenu.retry')}
diff --git a/apps/web/src/features/command/sidebar/sidebar-create-menu.test.tsx b/apps/web/src/features/command/sidebar/sidebar-create-menu.test.tsx
index 60ac5cae4d..a24324d42c 100644
--- a/apps/web/src/features/command/sidebar/sidebar-create-menu.test.tsx
+++ b/apps/web/src/features/command/sidebar/sidebar-create-menu.test.tsx
@@ -7,7 +7,6 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import { SidebarCreateMenu } from './sidebar-create-menu';
@@ -42,9 +41,7 @@ vi.mock('@core/hotkey/state', () => ({ setActiveScope: vi.fn() }));
vi.mock('@core/hotkey/utils', () => ({ activateClosestDOMScope: vi.fn() }));
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
vi.mock('@ui/components/Hotkey', () => ({ Hotkey: () => null }));
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
+
vi.mock('@ui', async () => ({
...(await import('@ui/components/Button')),
...(await import('@ui/components/Dropdown')),
diff --git a/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx b/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx
index ab54a4a6d9..55f337ba08 100644
--- a/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx
+++ b/apps/web/src/features/command/sidebar/sidebar-create-menu.tsx
@@ -111,14 +111,17 @@ export const SidebarCreateMenu = (props: SidebarCreateMenuProps) => {
when={props.variant === 'icon'}
fallback={
<Dropdown.Trigger
+ aria-label={t('create.create')}
+ tooltip={{
+ content: t('create.create'),
+ placement: 'right',
+ disabled: !isSlim(),
+ hotkey: TOKENS.global.createCommand,
+ }}
ref={createMenuTarget}
as={NavRow}
class="center h-8 bg-ink/4 text-[13px]"
fullWidth
- tooltipPlacement="right"
- tooltipDisabled={!isSlim()}
- label={t('create.create')}
- hotkey={TOKENS.global.createCommand}
onMouseDown={(e: MouseEvent) => {
if (e.button !== 0) return;
e.preventDefault();
@@ -142,20 +145,22 @@ export const SidebarCreateMenu = (props: SidebarCreateMenuProps) => {
}
>
<Dropdown.Trigger
+ aria-label={t('create.create')}
+ tooltip={{
+ content: t('create.create'),
+ hotkey: TOKENS.global.createCommand,
+ }}
ref={createMenuTarget}
as={Button}
- variant="outline"
+ variant="secondary"
size="icon-sm"
- depth={1}
- class="size-[26px] bg-surface shadow-md shadow-drop-shadow [&_svg]:size-4!"
- label={t('create.create')}
- hotkey={TOKENS.global.createCommand}
+ class="size-[26px] bg-surface shadow-md shadow-drop-shadow"
onMouseDown={(e: MouseEvent) => {
if (e.button !== 0) return;
e.preventDefault();
}}
>
- <CreateIcon />
+ <CreateIcon class="size-4 shrink-0" />
</Dropdown.Trigger>
</Show>
}
diff --git a/apps/web/src/features/connector-import/components/provider-row.tsx b/apps/web/src/features/connector-import/components/provider-row.tsx
index 0a6d52a86c..452af2cc6b 100644
--- a/apps/web/src/features/connector-import/components/provider-row.tsx
+++ b/apps/web/src/features/connector-import/components/provider-row.tsx
@@ -46,7 +46,7 @@ export function ProviderRow(props: {
when={props.state === 'connected'}
fallback={
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={
props.disabled ||
@@ -61,13 +61,16 @@ export function ProviderRow(props: {
}
>
<Button
- variant="strong"
+ variant="primary"
size="sm"
disabled={props.disabled}
aria-label={`Import from ${props.provider.name}`}
onClick={() => props.onImport()}
>
- <SparkleIcon aria-hidden="true" />
+ <SparkleIcon
+ class="size-3 touch:size-6 shrink-0 pointer-events-none"
+ aria-hidden="true"
+ />
Import
</Button>
</Show>
diff --git a/apps/web/src/features/crm/activity-tasks-adapter.tsx b/apps/web/src/features/crm/activity-tasks-adapter.tsx
index ca54188559..6913131128 100644
--- a/apps/web/src/features/crm/activity-tasks-adapter.tsx
+++ b/apps/web/src/features/crm/activity-tasks-adapter.tsx
@@ -67,14 +67,14 @@ function ActivityTasksBody(props: {
<Show
when={!isTouchDevice()}
fallback={
- <Button variant="outline" onClick={() => props.onCreateTask()}>
+ <Button variant="secondary" onClick={() => props.onCreateTask()}>
<PlusIcon class="size-4" />
New task
</Button>
}
>
<ViewCreateButton
- label="New task"
+ aria-label="New task"
onClick={() => props.onCreateTask()}
/>
</Show>
diff --git a/apps/web/src/features/crm/components/company-list-dialog.tsx b/apps/web/src/features/crm/components/company-list-dialog.tsx
index 960d96f319..da6b9fcb2c 100644
--- a/apps/web/src/features/crm/components/company-list-dialog.tsx
+++ b/apps/web/src/features/crm/components/company-list-dialog.tsx
@@ -136,7 +136,7 @@ export function CrmListDialog(props: {
</Button>
<Button
type="submit"
- variant="strong"
+ variant="secondary"
disabled={pending() || !name().trim()}
>
{pending() ? 'Saving…' : 'Save list'}
diff --git a/apps/web/src/features/crm/components/crm-sidebar.tsx b/apps/web/src/features/crm/components/crm-sidebar.tsx
index 17f4c1c6a7..d1ac5ab90d 100644
--- a/apps/web/src/features/crm/components/crm-sidebar.tsx
+++ b/apps/web/src/features/crm/components/crm-sidebar.tsx
@@ -67,9 +67,10 @@ export function CrmSidebar(props: {
<Show when={props.onCollapse}>
<Tooltip label="Collapse CRM sidebar">
<Button
+ aria-label="Collapse CRM sidebar"
+ tooltip="Collapse CRM sidebar"
variant="ghost"
- size="icon-sm"
- label="Collapse CRM sidebar"
+ size="icon-xs"
onClick={props.onCollapse}
>
<SidebarIcon class="size-4" />
diff --git a/apps/web/src/features/crm/components/pipeline-dialog.tsx b/apps/web/src/features/crm/components/pipeline-dialog.tsx
index 4175e2c422..a0e96afe46 100644
--- a/apps/web/src/features/crm/components/pipeline-dialog.tsx
+++ b/apps/web/src/features/crm/components/pipeline-dialog.tsx
@@ -85,14 +85,15 @@ export function PipelineDialog(props: {
/>
</EntityComposer.Title>
<Button
+ variant="ghost"
tabIndex={-1}
aria-label="Close"
tooltip="Close"
- size="icon-composer"
+ size="icon-md"
disabled={pending()}
onClick={close}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</EntityComposer.Header>
<EntityComposer.Main class="gap-4">
diff --git a/apps/web/src/features/crm/components/pipeline-entry-cards.tsx b/apps/web/src/features/crm/components/pipeline-entry-cards.tsx
index ba6a4d6508..88134ab3fb 100644
--- a/apps/web/src/features/crm/components/pipeline-entry-cards.tsx
+++ b/apps/web/src/features/crm/components/pipeline-entry-cards.tsx
@@ -125,11 +125,13 @@ function PipelineEntryCard(props: {
<Show when={props.onOpenPipeline}>
{(open) => (
<Button
+ variant="ghost"
+ aria-label={`Open ${props.entry.pipeline.name}`}
+ tooltip={`Open ${props.entry.pipeline.name}`}
size="icon-sm"
- label={`Open ${props.entry.pipeline.name}`}
onClick={() => open()()}
>
- <ArrowUpRightIcon />
+ <ArrowUpRightIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Show>
diff --git a/apps/web/src/features/crm/crm-link.tsx b/apps/web/src/features/crm/crm-link.tsx
index 6287bca6da..c9118329c7 100644
--- a/apps/web/src/features/crm/crm-link.tsx
+++ b/apps/web/src/features/crm/crm-link.tsx
@@ -4,6 +4,7 @@ import { CrmCopyLinkButton as View } from './views/copy-link-button';
export function CrmCopyLinkButton(props: {
type: 'company' | 'contact';
id: string;
+ grouped?: boolean;
}) {
return (
<CrmProvider value={createAppCrmContext()}>
diff --git a/apps/web/src/features/crm/pipeline-adapter.tsx b/apps/web/src/features/crm/pipeline-adapter.tsx
index 29f5d0a135..3f213e3df0 100644
--- a/apps/web/src/features/crm/pipeline-adapter.tsx
+++ b/apps/web/src/features/crm/pipeline-adapter.tsx
@@ -303,7 +303,7 @@ function PipelineToolbar(props: {
actions={
<>
<Show when={props.canEdit}>
- <Button variant="outline" onClick={() => props.onCompose({})}>
+ <Button variant="secondary" onClick={() => props.onCompose({})}>
<PlusIcon class="size-4" />
{props.pipeline.recordType === 'company'
? 'Add deal'
diff --git a/apps/web/src/features/crm/record-tasks-adapter.tsx b/apps/web/src/features/crm/record-tasks-adapter.tsx
index 4e7ca4b948..c3127ddfbb 100644
--- a/apps/web/src/features/crm/record-tasks-adapter.tsx
+++ b/apps/web/src/features/crm/record-tasks-adapter.tsx
@@ -87,7 +87,7 @@ function RecordTasksBody(props: { scope: CrmRecordScope }) {
actions={
<>
<TasksControls />
- <Button variant="outline" onClick={composeTask}>
+ <Button variant="secondary" onClick={composeTask}>
<PlusIcon class="size-4" />
New task
</Button>
diff --git a/apps/web/src/features/crm/views/add-pipeline-record.tsx b/apps/web/src/features/crm/views/add-pipeline-record.tsx
index f04c7a8a23..f21fac0e72 100644
--- a/apps/web/src/features/crm/views/add-pipeline-record.tsx
+++ b/apps/web/src/features/crm/views/add-pipeline-record.tsx
@@ -371,10 +371,10 @@ export function AddPipelineRecordDialog(
<Dialog.CloseButton
tabIndex={-1}
aria-label="Close"
- class={buttonClasses({ size: 'icon-composer' })}
+ class={buttonClasses({ size: 'icon-md' })}
disabled={pending()}
>
- <XIcon />
+ <XIcon class="size-4 shrink-0 touch:size-6" />
</Dialog.CloseButton>
</EntityComposer.Header>
<EntityComposer.Main class="gap-5 overflow-y-auto px-5 py-5">
@@ -404,7 +404,7 @@ export function AddPipelineRecordDialog(
</EntityComposer.Main>
<EntityComposer.Footer class="items-center justify-end border-t border-edge-muted/60 px-5 py-3">
<Button
- variant="outline"
+ variant="secondary"
class="gap-3 not-touch:h-[33.75px] not-touch:px-[15px]"
disabled={pending()}
onClick={close}
diff --git a/apps/web/src/features/crm/views/company-detail.tsx b/apps/web/src/features/crm/views/company-detail.tsx
index dc963e05ff..2973c406e6 100644
--- a/apps/web/src/features/crm/views/company-detail.tsx
+++ b/apps/web/src/features/crm/views/company-detail.tsx
@@ -93,7 +93,7 @@ export function Company(props: {
onOpenContact={props.onOpenContact}
actions={
<Button
- variant="outline"
+ variant="secondary"
// Contact emails are pinned to the company's primary
// domain; disabled until the company has loaded.
disabled={!company()?.domains[0]}
diff --git a/apps/web/src/features/crm/views/copy-link-button.tsx b/apps/web/src/features/crm/views/copy-link-button.tsx
index 575c7e1256..5eaba0bd8c 100644
--- a/apps/web/src/features/crm/views/copy-link-button.tsx
+++ b/apps/web/src/features/crm/views/copy-link-button.tsx
@@ -1,19 +1,21 @@
import LinkIcon from '@icon/system/regular/link.svg';
-import { CopyButton } from '@ui';
+import { Button, ButtonGroup, CopyButton } from '@ui';
import { useCrmContext } from '../context/crm-context';
export function CrmCopyLinkButton(props: {
id: string;
type: 'company' | 'contact';
+ grouped?: boolean;
}) {
const { copyRecordLink } = useCrmContext();
const copyLink = () => copyRecordLink({ type: props.type, id: props.id });
return (
<CopyButton
+ aria-label={`Copy ${props.type} link`}
+ as={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
- size="icon-md"
- label={`Copy ${props.type} link`}
+ size={props.grouped ? 'icon-sm' : 'icon-md'}
tooltip={`Copy ${props.type} link`}
onClick={copyLink}
>
diff --git a/apps/web/src/features/crm/views/create-company.tsx b/apps/web/src/features/crm/views/create-company.tsx
index 88066b5187..aafaa82c2e 100644
--- a/apps/web/src/features/crm/views/create-company.tsx
+++ b/apps/web/src/features/crm/views/create-company.tsx
@@ -123,14 +123,15 @@ export function CreateCompanyModal(props: {
/>
</EntityComposer.Title>
<Button
+ variant="ghost"
tabIndex={-1}
aria-label="Close"
tooltip="Close"
- size="icon-composer"
+ size="icon-md"
disabled={createCompanyMutation.isPending}
onClick={close}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</EntityComposer.Header>
<EntityComposer.Main class="gap-4">
diff --git a/apps/web/src/features/crm/views/create-contact.tsx b/apps/web/src/features/crm/views/create-contact.tsx
index 2609660f5d..f2d737a132 100644
--- a/apps/web/src/features/crm/views/create-contact.tsx
+++ b/apps/web/src/features/crm/views/create-contact.tsx
@@ -199,14 +199,15 @@ export function CreateContactModal(props: {
/>
</EntityComposer.Title>
<Button
+ variant="ghost"
tabIndex={-1}
aria-label="Close"
tooltip="Close"
- size="icon-composer"
+ size="icon-md"
disabled={createContactMutation.isPending}
onClick={close}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</EntityComposer.Header>
<EntityComposer.Main class="gap-4">
diff --git a/apps/web/src/features/crm/views/crm-settings.tsx b/apps/web/src/features/crm/views/crm-settings.tsx
index 627426fdfd..a68f90c9fd 100644
--- a/apps/web/src/features/crm/views/crm-settings.tsx
+++ b/apps/web/src/features/crm/views/crm-settings.tsx
@@ -74,7 +74,7 @@ function DisableCrmDialog(props: {
<Panel depth={2} class="max-h-[75vh] text-ink rounded-xl">
<Panel.Header class="px-2 gap-1">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
Disable CRM
@@ -107,7 +107,7 @@ function DisableCrmDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={
props.pending || props.confirmation !== DISABLE_CRM_PHRASE
}
@@ -202,7 +202,7 @@ function CrmEnablementSection() {
<Panel depth={2} class="max-h-[75vh] text-ink rounded-xl">
<Panel.Header class="px-2 gap-1">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
Enable CRM
@@ -222,7 +222,7 @@ function CrmEnablementSection() {
Cancel
</Button>
<Button
- variant="outline"
+ variant="secondary"
disabled={patchCrmMutation.isPending}
onClick={() => handleEnable(false)}
>
@@ -236,7 +236,7 @@ function CrmEnablementSection() {
</Show>
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={patchCrmMutation.isPending}
onClick={() => handleEnable(true)}
>
@@ -436,7 +436,7 @@ function StageEditorRow(props: {
<Tooltip label="Save">
<Button
aria-label="Save stage name"
- variant="accent"
+ variant="primary"
size="icon-sm"
disabled={props.pending || !hasChanged()}
onClick={commit}
@@ -580,7 +580,7 @@ function StagesSection() {
when={dealStages.isCustomized()}
fallback={
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={pending()}
onClick={handleCustomize}
@@ -592,7 +592,7 @@ function StagesSection() {
}
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={blocked()}
onClick={() => setShowResetModal(true)}
@@ -646,7 +646,7 @@ function StagesSection() {
}}
/>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="shrink-0"
disabled={newStageName().trim() === '' || pending()}
diff --git a/apps/web/src/features/crm/views/crm-workspace.tsx b/apps/web/src/features/crm/views/crm-workspace.tsx
index 4b80321ae7..12d0f1b97b 100644
--- a/apps/web/src/features/crm/views/crm-workspace.tsx
+++ b/apps/web/src/features/crm/views/crm-workspace.tsx
@@ -37,7 +37,7 @@ import ArrowLeftIcon from '@icon/system/regular/arrow-left.svg';
import FileCsvIcon from '@icon/system/regular/file-csv.svg';
import ListIcon from '@icon/system/regular/list.svg';
import PlusIcon from '@icon/system/regular/plus.svg';
-import { Button, Dropdown, Tooltip } from '@ui';
+import { Button, ButtonGroup, Dropdown, Tooltip } from '@ui';
import { tourTarget } from '@ui/components/Tour';
import {
createEffect,
@@ -97,9 +97,10 @@ function NavigationToggle(props: {
fallback={
<Tooltip label="Expand CRM sidebar">
<Button
+ aria-label="Expand CRM sidebar"
+ tooltip="Expand CRM sidebar"
variant="ghost"
size="icon-sm"
- label="Expand CRM sidebar"
ref={toggleTarget}
onClick={props.onExpand}
>
@@ -536,9 +537,10 @@ export function CrmWorkspaceView(props: {
</NavigationToggle>
<Tooltip label="Back">
<Button
+ aria-label="Close CRM settings"
+ tooltip="Close CRM settings"
variant="ghost"
size="icon-sm"
- label="Close CRM settings"
onClick={settings.close}
>
<ArrowLeftIcon class="size-4" />
@@ -691,7 +693,7 @@ export function CrmWorkspaceView(props: {
onValueChange={searchPeople}
/>
<Button
- variant="outline"
+ variant="secondary"
class="ml-auto shrink-0"
onClick={() => openCreateContactModal()}
>
@@ -717,20 +719,19 @@ export function CrmWorkspaceView(props: {
>
<Show when={!peopleActive()}>
<HeaderActionGroup label="Company filters">
- <UnifiedFilterDropdown hideLabel variant="ghost" />
+ <UnifiedFilterDropdown grouped hideLabel variant="ghost" />
</HeaderActionGroup>
<HeaderActionGroup label="Company view options">
- <SoupViewContextSort />
- <SoupViewContextGroup hideLabel variant="ghost" />
- <CompanyDisplayMenu />
+ <SoupViewContextSort grouped />
+ <SoupViewContextGroup grouped hideLabel variant="ghost" />
+ <CompanyDisplayMenu grouped />
<Suspense>
- <CompanyViewsMenu hideLabel />
+ <CompanyViewsMenu grouped hideLabel />
</Suspense>
<Show when={listsEnabled() && activeList()}>
{(list) => (
- <Button
+ <ButtonGroup.Button
variant="ghost"
- size="md"
onClick={() =>
setEditing({
id: list().id,
@@ -740,7 +741,7 @@ export function CrmWorkspaceView(props: {
}
>
Edit list
- </Button>
+ </ButtonGroup.Button>
)}
</Show>
</HeaderActionGroup>
diff --git a/apps/web/src/features/crm/views/export-companies.tsx b/apps/web/src/features/crm/views/export-companies.tsx
index 484d0395cd..64a152d12b 100644
--- a/apps/web/src/features/crm/views/export-companies.tsx
+++ b/apps/web/src/features/crm/views/export-companies.tsx
@@ -291,7 +291,7 @@ export function CrmExport(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={
pending() ||
!selectedColumns().length ||
diff --git a/apps/web/src/features/crm/views/import-companies.tsx b/apps/web/src/features/crm/views/import-companies.tsx
index dc13c9d533..d661b5ae21 100644
--- a/apps/web/src/features/crm/views/import-companies.tsx
+++ b/apps/web/src/features/crm/views/import-companies.tsx
@@ -103,11 +103,11 @@ export function CrmImport(props: {
/>
<div class="flex flex-wrap items-center gap-3">
<Button
- variant="outline"
+ variant="secondary"
disabled={pending()}
onClick={() => fileInput.click()}
>
- <UploadIcon />
+ <UploadIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
{fileName() ? 'Change file' : 'Choose file'}
</Button>
<span
@@ -224,7 +224,7 @@ export function CrmImport(props: {
Close
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={pending() || !runnable()}
onClick={() => fireAndForget(run(), 'crm')}
>
diff --git a/apps/web/src/features/crm/views/pipeline-import.tsx b/apps/web/src/features/crm/views/pipeline-import.tsx
index 3ce1c2c977..55a0a285c3 100644
--- a/apps/web/src/features/crm/views/pipeline-import.tsx
+++ b/apps/web/src/features/crm/views/pipeline-import.tsx
@@ -106,7 +106,7 @@ export function PipelineImport(props: {
Close
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={reading() || pending() || !plan()}
onClick={() => fireAndForget(run(), 'crm')}
>
diff --git a/apps/web/src/features/crm/views/pipeline.tsx b/apps/web/src/features/crm/views/pipeline.tsx
index bae70adb58..efbbc07bd8 100644
--- a/apps/web/src/features/crm/views/pipeline.tsx
+++ b/apps/web/src/features/crm/views/pipeline.tsx
@@ -147,33 +147,35 @@ export function PipelineView(props: {
<DotsThreeIcon class="size-4" />
</Dropdown.Trigger>
<Dropdown.Content class="min-w-44">
- <Show when={canEdit()}>
- <Dropdown.Item onSelect={() => queueMicrotask(editTitle)}>
- <PencilIcon class="size-4" />
- Rename
- </Dropdown.Item>
- </Show>
- <Show when={transfer}>
- <Dropdown.Item
- disabled={exporter?.pending()}
- onSelect={() => fireAndForget(exportCsv(), 'crm')}
- >
- <DownloadIcon class="size-4" />
- Export CSV
- </Dropdown.Item>
+ <Dropdown.Group>
<Show when={canEdit()}>
- <Dropdown.Item onSelect={() => setImporting(true)}>
- <UploadIcon class="size-4" />
- Import CSV
+ <Dropdown.Item onSelect={() => queueMicrotask(editTitle)}>
+ <PencilIcon class="size-4" />
+ Rename
+ </Dropdown.Item>
+ </Show>
+ <Show when={transfer}>
+ <Dropdown.Item
+ disabled={exporter?.pending()}
+ onSelect={() => fireAndForget(exportCsv(), 'crm')}
+ >
+ <DownloadIcon class="size-4" />
+ Export CSV
+ </Dropdown.Item>
+ <Show when={canEdit()}>
+ <Dropdown.Item onSelect={() => setImporting(true)}>
+ <UploadIcon class="size-4" />
+ Import CSV
+ </Dropdown.Item>
+ </Show>
+ </Show>
+ <Show when={isOwner()}>
+ <Dropdown.Item onSelect={() => setDeleting(true)}>
+ <TrashIcon class="size-4" />
+ Trash pipeline
</Dropdown.Item>
</Show>
- </Show>
- <Show when={isOwner()}>
- <Dropdown.Item onSelect={() => setDeleting(true)}>
- <TrashIcon class="size-4" />
- Trash pipeline
- </Dropdown.Item>
- </Show>
+ </Dropdown.Group>
</Dropdown.Content>
</Dropdown>
</Show>
@@ -198,9 +200,10 @@ export function PipelineView(props: {
actions={
<Show when={isTouchDevice()}>
<Button
+ aria-label="Pipeline actions"
+ tooltip="Pipeline actions"
variant="ghost"
size="icon-md"
- label="Pipeline actions"
onClick={openActions}
>
<DotsThreeIcon class="size-4" />
@@ -251,7 +254,7 @@ export function PipelineView(props: {
</label>
<Button
type="submit"
- variant="outline"
+ variant="secondary"
disabled={
pending() ||
!name().trim() ||
diff --git a/apps/web/src/features/crm/views/record-detail.tsx b/apps/web/src/features/crm/views/record-detail.tsx
index a915228b4b..d3e62dba26 100644
--- a/apps/web/src/features/crm/views/record-detail.tsx
+++ b/apps/web/src/features/crm/views/record-detail.tsx
@@ -205,7 +205,11 @@ export function CrmRecordDetail(props: {
</div>
<div class="ml-auto flex shrink-0 items-center gap-2 touch:gap-1">
<HeaderActionGroup label="Sharing">
- <CrmCopyLinkButton type={current().type} id={current().id} />
+ <CrmCopyLinkButton
+ grouped
+ type={current().type}
+ id={current().id}
+ />
</HeaderActionGroup>
<SidePanel.Toggle />
</div>
@@ -334,7 +338,7 @@ function DetailError(props: {
<div class="flex size-full flex-col items-center justify-center gap-3 text-sm text-ink-muted">
<p>This {props.record} couldn’t be loaded.</p>
<div class="flex gap-2">
- <Button variant="outline" size="sm" onClick={props.onRetry}>
+ <Button variant="secondary" size="sm" onClick={props.onRetry}>
Try again
</Button>
<Button variant="ghost" size="sm" onClick={props.onBack}>
diff --git a/apps/web/src/features/crm/views/saved-views-menu.tsx b/apps/web/src/features/crm/views/saved-views-menu.tsx
index 937bbf6c00..74cd983b18 100644
--- a/apps/web/src/features/crm/views/saved-views-menu.tsx
+++ b/apps/web/src/features/crm/views/saved-views-menu.tsx
@@ -6,7 +6,7 @@ import PushPinIcon from '@icon/system/regular/push-pin.svg';
import SlidersIcon from '@icon/system/regular/sliders-horizontal.svg';
import StackIcon from '@icon/system/regular/stack.svg';
import TrashIcon from '@icon/system/regular/trash.svg';
-import { Button, cn, Dropdown, Tabs, Tooltip } from '@ui';
+import { Button, ButtonGroup, cn, Dropdown, Tabs, Tooltip } from '@ui';
import { createSignal, For, type JSX, Show } from 'solid-js';
import { unwrap } from 'solid-js/store';
import { useCrmContext } from '../context/crm-context';
@@ -54,9 +54,10 @@ const SavedViewRow = (props: {
{(onSetDefault) => (
<Tooltip label={props.isDefault ? 'Remove default' : 'Set as default'}>
<Button
+ aria-label={props.isDefault ? 'Remove default' : 'Set as default'}
+ tooltip={props.isDefault ? 'Remove default' : 'Set as default'}
variant="ghost"
size="icon-sm"
- label={props.isDefault ? 'Remove default' : 'Set as default'}
class={cn(
'size-6 shrink-0 p-1 text-ink-muted',
!props.isDefault &&
@@ -71,9 +72,10 @@ const SavedViewRow = (props: {
</Show>
<Tooltip label="Copy link">
<Button
+ aria-label="Copy link"
+ tooltip="Copy link"
variant="ghost"
size="icon-sm"
- label="Copy link"
class="size-6 shrink-0 p-1 text-ink-muted opacity-0 group-hover:opacity-100 focus-visible:opacity-100"
onClick={props.onCopyLink}
>
@@ -84,9 +86,10 @@ const SavedViewRow = (props: {
{(onDelete) => (
<Tooltip label="Delete view">
<Button
+ aria-label="Delete view"
+ tooltip="Delete view"
variant="ghost"
size="icon-sm"
- label="Delete view"
class="size-6 shrink-0 p-1 text-ink-muted opacity-0 group-hover:opacity-100 focus-visible:opacity-100"
onClick={() => onDelete()()}
>
@@ -108,7 +111,9 @@ const EmptyViewsHint = (props: { children: JSX.Element }) => (
* list/board mode, stage/owner sub-filters, tab), plus share links that
* encode the same state into the URL (see `queries/saved-view-codec.ts`).
*/
-export function CompanyViewsMenu(props: { hideLabel?: boolean } = {}) {
+export function CompanyViewsMenu(
+ props: { hideLabel?: boolean; grouped?: boolean } = {}
+) {
const copyShareLink = useCrmContext().copyViewLink;
const {
soup,
@@ -179,15 +184,21 @@ export function CompanyViewsMenu(props: { hideLabel?: boolean } = {}) {
}
};
+ const triggerSize = () => {
+ if (!props.hideLabel) return 'sm';
+ return props.grouped ? 'icon-sm' : 'icon-md';
+ };
+
return (
<Dropdown open={open()} onOpenChange={handleOpenChange}>
<Dropdown.Trigger
+ tooltip={props.hideLabel ? 'Views' : undefined}
+ as={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
- size={props.hideLabel ? 'icon-md' : 'sm'}
- label={props.hideLabel ? 'Views' : undefined}
+ size={triggerSize()}
aria-label={props.hideLabel ? 'Views' : undefined}
>
- <StackIcon />
+ <StackIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
<Show when={!props.hideLabel}>
<span>Views</span>
</Show>
@@ -291,7 +302,7 @@ export function CompanyViewsMenu(props: { hideLabel?: boolean } = {}) {
]}
/>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={!saveName().trim()}
onClick={saveCurrentView}
@@ -320,7 +331,7 @@ export function CompanyViewsMenu(props: { hideLabel?: boolean } = {}) {
* captured by saved views. Admins/owners additionally get a toggle to view
* the hidden-companies set (backed by the active/hidden tab presets).
*/
-export function CompanyDisplayMenu() {
+export function CompanyDisplayMenu(props: { grouped?: boolean } = {}) {
const { options, toggleListColumn } = useCrmDisplayOptions();
const { activeTab } = useCrmWorkspace();
const { applyTabPreset } = useApplyPreset();
@@ -332,11 +343,13 @@ export function CompanyDisplayMenu() {
<Dropdown>
<Tooltip label="Display options">
<Dropdown.Trigger
+ aria-label="Display options"
+ tooltip="Display options"
+ as={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
- size="icon-md"
- label="Display options"
+ size={props.grouped ? 'icon-sm' : 'icon-md'}
>
- <SlidersIcon />
+ <SlidersIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
</Tooltip>
diff --git a/apps/web/src/features/database-query/views/query-editor.tsx b/apps/web/src/features/database-query/views/query-editor.tsx
index 18f3b6f3b2..340c05e714 100644
--- a/apps/web/src/features/database-query/views/query-editor.tsx
+++ b/apps/web/src/features/database-query/views/query-editor.tsx
@@ -237,7 +237,12 @@ export function QueryEditor(props: {
</div>
<Show when={!canAccept()}>
<div class="flex items-center justify-end gap-2">
- <Button type="submit" size="sm" disabled={!canAsk()}>
+ <Button
+ variant="primary"
+ type="submit"
+ size="sm"
+ disabled={!canAsk()}
+ >
<Show
when={busy()}
fallback={
@@ -437,7 +442,7 @@ export function QueryEditor(props: {
<Button variant="ghost" size="sm" onClick={editPrompt}>
Edit
</Button>
- <Button size="sm" onClick={accept}>
+ <Button variant="primary" size="sm" onClick={accept}>
{props.saveLabel ?? 'Insert'}
<Hotkey shortcut="enter" theme="current" aria-hidden="true" />
</Button>
diff --git a/apps/web/src/features/database/components/board-lane-header.tsx b/apps/web/src/features/database/components/board-lane-header.tsx
index 0663af5563..f53d344eb7 100644
--- a/apps/web/src/features/database/components/board-lane-header.tsx
+++ b/apps/web/src/features/database/components/board-lane-header.tsx
@@ -68,9 +68,13 @@ export function BoardLaneHeader(props: {
</Show>
<Show when={props.onAdd}>
<Button
+ variant="ghost"
+ aria-label={`Add record to ${props.label}`}
+ tooltip={{
+ content: `Add record to ${props.label}`,
+ disabled: true,
+ }}
size="icon-xs"
- label={`Add record to ${props.label}`}
- tooltipDisabled
title={`Add record to ${props.label}`}
onClick={props.onAdd}
>
@@ -189,10 +193,14 @@ function LaneColor(props: { option: EditableOption; children: JSX.Element }) {
onOpenChange={() => setError('')}
>
<Popover.Trigger
+ variant="ghost"
+ aria-label={`Change ${props.option.option.label} color`}
+ tooltip={{
+ content: `Change ${props.option.option.label} color`,
+ disabled: true,
+ }}
as={Button}
size="icon-xs"
- label={`Change ${props.option.option.label} color`}
- tooltipDisabled
data-kanban-no-drag
>
{props.children}
diff --git a/apps/web/src/features/database/components/board-menu.tsx b/apps/web/src/features/database/components/board-menu.tsx
index fcd0a08730..63daf044a2 100644
--- a/apps/web/src/features/database/components/board-menu.tsx
+++ b/apps/web/src/features/database/components/board-menu.tsx
@@ -22,7 +22,12 @@ type BoardMenuItemProps = {
export function BoardMenu(props: BoardMenuItemProps) {
return (
<Dropdown>
- <Dropdown.Trigger variant="ghost" size="md" square label="Board menu">
+ <Dropdown.Trigger
+ aria-label="Board menu"
+ tooltip="Board menu"
+ variant="ghost"
+ size="icon-md"
+ >
<DotsIcon class="size-4" />
</Dropdown.Trigger>
<Dropdown.Content class="min-w-48">
diff --git a/apps/web/src/features/database/components/csv-import-dialog.tsx b/apps/web/src/features/database/components/csv-import-dialog.tsx
index faafd31179..d52263dbe8 100644
--- a/apps/web/src/features/database/components/csv-import-dialog.tsx
+++ b/apps/web/src/features/database/components/csv-import-dialog.tsx
@@ -130,7 +130,7 @@ export function CsvImportDialog(props: {
</Button>
<Button
type="submit"
- variant="accent"
+ variant="primary"
disabled={pending() || !name().trim()}
>
{pending()
diff --git a/apps/web/src/features/database/components/database-board.tsx b/apps/web/src/features/database/components/database-board.tsx
index 4984cc2d6f..862b0ea50d 100644
--- a/apps/web/src/features/database/components/database-board.tsx
+++ b/apps/web/src/features/database/components/database-board.tsx
@@ -674,9 +674,10 @@ function BoardCard(props: {
>
<KanbanHandle label={`Drag ${title()}`}>
<Button
+ variant="ghost"
+ aria-label={`Drag ${title()}`}
+ tooltip={{ content: `Drag ${title()}`, disabled: true }}
size="icon-xs"
- label={`Drag ${title()}`}
- tooltipDisabled
class="size-6 touch-none text-ink-muted"
title="Drag to another group, or use the Move menu"
tabindex={-1}
@@ -712,9 +713,10 @@ function BoardCard(props: {
<KanbanBoard.CardActions>
<Show when={props.renderCell}>
<Button
+ variant="ghost"
+ aria-label={`Open ${title()}`}
+ tooltip={{ content: `Open ${title()}`, disabled: true }}
size="icon-xs"
- label={`Open ${title()}`}
- tooltipDisabled
title="Open record details"
onClick={() => props.onOpen(props.row.rowId)}
>
diff --git a/apps/web/src/features/database/components/database-editor-toolbar.tsx b/apps/web/src/features/database/components/database-editor-toolbar.tsx
index 48c98d194f..d83c72e19b 100644
--- a/apps/web/src/features/database/components/database-editor-toolbar.tsx
+++ b/apps/web/src/features/database/components/database-editor-toolbar.tsx
@@ -4,6 +4,7 @@ import FunnelIcon from '@icon/system/regular/funnel-simple.svg';
import PlusIcon from '@icon/system/regular/plus.svg';
import SortAscendingIcon from '@icon/system/regular/sort-ascending.svg';
import StackIcon from '@icon/system/regular/stack.svg';
+import { ButtonGroup } from '@ui';
import { Button } from '@ui/components/Button';
import { Dropdown } from '@ui/components/Dropdown';
import { For, type JSX, Show } from 'solid-js';
@@ -50,7 +51,8 @@ export function DatabaseEditorToolbar(props: {
{(current) => (
<Dropdown placement="bottom-start">
<Dropdown.Trigger
- label="Group board by"
+ as={ButtonGroup.Button}
+ aria-label="Group board by"
tooltip="Group by"
size="icon-md"
variant="ghost"
@@ -95,6 +97,7 @@ export function DatabaseEditorToolbar(props: {
<ToolbarPopover
label="Filter"
compact
+ grouped
count={filterConditionCount(props.view.query.filter)}
icon={<FunnelIcon class="size-4 touch:size-3.5" />}
>
@@ -111,6 +114,7 @@ export function DatabaseEditorToolbar(props: {
<ToolbarPopover
label="Sort"
compact
+ grouped
count={sort().length}
icon={<SortAscendingIcon class="size-4 touch:size-3.5" />}
>
@@ -127,7 +131,7 @@ export function DatabaseEditorToolbar(props: {
<Show when={props.onCreateRecord}>
<Button
size="md"
- variant="outline"
+ variant="secondary"
aria-label={
props.creating
? 'Saving record'
diff --git a/apps/web/src/features/database/components/database-load-state.tsx b/apps/web/src/features/database/components/database-load-state.tsx
index a8295f5d14..7a2a2d5c5a 100644
--- a/apps/web/src/features/database/components/database-load-state.tsx
+++ b/apps/web/src/features/database/components/database-load-state.tsx
@@ -18,7 +18,7 @@ export function DatabaseLoadFailure(props: {
<WarningIcon class="size-7 text-ink-muted" />
<p class="text-sm font-medium">{props.title}</p>
<p class="max-w-96 text-xs text-ink-muted">{props.message}</p>
- <Button size="sm" class="gap-2" onClick={props.onRetry}>
+ <Button variant="ghost" size="sm" class="gap-2" onClick={props.onRetry}>
<ArrowClockwiseIcon class="size-3.5" />
Try again
</Button>
diff --git a/apps/web/src/features/database/components/database-relation-cell.tsx b/apps/web/src/features/database/components/database-relation-cell.tsx
index d886b0e076..f20cc11648 100644
--- a/apps/web/src/features/database/components/database-relation-cell.tsx
+++ b/apps/web/src/features/database/components/database-relation-cell.tsx
@@ -383,9 +383,13 @@ export function DatabaseRelationCell(props: DatabaseRelationCellProps) {
</Button>
<Show when={editable()}>
<Button
+ variant="ghost"
+ aria-label={`Remove ${name(id)}`}
+ tooltip={{
+ content: `Remove ${name(id)}`,
+ disabled: true,
+ }}
size="icon-xs"
- label={`Remove ${name(id)}`}
- tooltipDisabled
onClick={() => toggle(id)}
>
<XIcon class="size-3" />
@@ -450,6 +454,7 @@ export function DatabaseRelationCell(props: DatabaseRelationCellProps) {
'Related records could not be loaded.'}
</p>
<Button
+ variant="ghost"
size="xs"
class="mt-1"
onClick={() => fireAndForget(refresh(), 'database')}
@@ -469,6 +474,7 @@ export function DatabaseRelationCell(props: DatabaseRelationCellProps) {
{saving() ? 'Saving…' : props.source.name()}
</span>
<Button
+ variant="primary"
size="xs"
onClick={() => fireAndForget(finish(), 'database')}
>
diff --git a/apps/web/src/features/database/components/database-search.tsx b/apps/web/src/features/database/components/database-search.tsx
index 58b29a5877..b191e375c9 100644
--- a/apps/web/src/features/database/components/database-search.tsx
+++ b/apps/web/src/features/database/components/database-search.tsx
@@ -1,7 +1,7 @@
import { HeaderActionGroup } from '@components/app/HeaderActionGroup';
import MagnifyingGlassIcon from '@icon/system/regular/magnifying-glass.svg';
import XIcon from '@icon/system/regular/x.svg';
-import { Button } from '@ui/components/Button';
+import { ButtonGroup } from '@ui';
import { InputGroup } from '@ui/components/InputGroup';
import {
createMemo,
@@ -70,18 +70,18 @@ export function DatabaseSearch(props: {
when={props.isOpen}
fallback={
<HeaderActionGroup label="Search">
- <Button
+ <ButtonGroup.Button
+ aria-label="Search"
ref={searchButton}
type="button"
variant="ghost"
size="icon-md"
- label="Search"
aria-keyshortcuts="Control+F Meta+F"
tooltip="Search every table"
onClick={() => props.onOpen()}
>
<MagnifyingGlassIcon class="size-4 touch:size-3.5" />
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
}
>
@@ -137,9 +137,12 @@ export function DatabaseSearch(props: {
/>
<InputGroup.Addon align="inline-end">
<InputGroup.Button
+ aria-label={props.term ? 'Clear search' : 'Close search'}
+ tooltip={{
+ content: props.term ? 'Clear search' : 'Close search',
+ disabled: true,
+ }}
size="icon-xs"
- label={props.term ? 'Clear search' : 'Close search'}
- tooltipDisabled
onClick={() => {
if (props.term) changeTerm('');
else closeAndRestore();
diff --git a/apps/web/src/features/database/components/database-table-notices.tsx b/apps/web/src/features/database/components/database-table-notices.tsx
index 3ab58539c4..c7a66dc72a 100644
--- a/apps/web/src/features/database/components/database-table-notices.tsx
+++ b/apps/web/src/features/database/components/database-table-notices.tsx
@@ -40,6 +40,7 @@ export function SaveFailureNotice(props: {
<p class="mt-1 text-ink-muted">{props.message}</p>
</div>
<Button
+ variant="primary"
size="xs"
class="shrink-0"
disabled={props.pending}
@@ -50,6 +51,7 @@ export function SaveFailureNotice(props: {
<Show when={props.onDiscard}>
{(discard) => (
<Button
+ variant="ghost"
size="xs"
class="shrink-0"
disabled={props.pending}
@@ -60,9 +62,10 @@ export function SaveFailureNotice(props: {
)}
</Show>
<Button
+ variant="ghost"
+ aria-label="Dismiss save error"
+ tooltip={{ content: 'Dismiss save error', disabled: true }}
size="icon-xs"
- label="Dismiss save error"
- tooltipDisabled
onClick={props.onDismiss}
>
<XIcon class="size-3.5" />
@@ -108,13 +111,19 @@ export function HiddenRecordNotice(props: {
<p class="font-medium text-ink">{props.title}</p>
<p class="mt-1 text-ink-muted">{props.message}</p>
</div>
- <Button size="xs" class="shrink-0 text-accent" onClick={props.onOpen}>
+ <Button
+ variant="ghost"
+ size="xs"
+ class="shrink-0 text-accent"
+ onClick={props.onOpen}
+ >
Open record
</Button>
<Button
+ variant="ghost"
+ aria-label="Dismiss record notice"
+ tooltip={{ content: 'Dismiss record notice', disabled: true }}
size="icon-xs"
- label="Dismiss record notice"
- tooltipDisabled
onClick={props.onDismiss}
>
<XIcon class="size-3.5" />
@@ -137,12 +146,18 @@ export function DraftFailureNotice(props: {
class="flex items-center gap-3 border-b border-edge-muted px-4 py-2 text-xs text-ink-muted"
>
<span class="flex-1">{props.message}</span>
- <Button size="xs" disabled={props.pending} onClick={props.onAction}>
+ <Button
+ variant="primary"
+ size="xs"
+ disabled={props.pending}
+ onClick={props.onAction}
+ >
{props.actionLabel}
</Button>
<Show when={props.onDiscard}>
{(discard) => (
<Button
+ variant="ghost"
size="xs"
disabled={props.pending}
onClick={() => discard()()}
diff --git a/apps/web/src/features/database/components/database-toolbar.tsx b/apps/web/src/features/database/components/database-toolbar.tsx
index 9210d7d7f6..593af535e5 100644
--- a/apps/web/src/features/database/components/database-toolbar.tsx
+++ b/apps/web/src/features/database/components/database-toolbar.tsx
@@ -180,7 +180,7 @@ export function DatabaseToolbar(props: DatabaseToolbarProps) {
<Button
ref={allRecordsButton}
type="button"
- variant="outline"
+ variant="secondary"
size="md"
aria-pressed={!props.selectedViewId}
onClick={() => props.onSelectView()}
@@ -246,9 +246,10 @@ export function DatabaseToolbar(props: DatabaseToolbarProps) {
<Show when={props.canEdit}>
<Dropdown placement="bottom-start">
<Dropdown.Trigger
+ aria-label="New view"
+ tooltip="New view"
size="icon-md"
variant="ghost"
- label="New view"
class="ml-1.5 shrink-0"
disabled={creating()}
>
@@ -388,10 +389,10 @@ function ViewTab(props: {
<ContextMenu>
<Tooltip label={props.view.name}>
<ContextMenu.Trigger
+ tooltip={{ content: undefined, disabled: true }}
as={Button}
- variant="outline"
+ variant="secondary"
size="md"
- tooltipDisabled
type="button"
{...(props.canReorder ? sortable.dragActivators : {})}
data-view-id={props.view.id}
diff --git a/apps/web/src/features/database/components/database-view-filters.tsx b/apps/web/src/features/database/components/database-view-filters.tsx
index bc15ec32bc..9cfdc583bb 100644
--- a/apps/web/src/features/database/components/database-view-filters.tsx
+++ b/apps/web/src/features/database/components/database-view-filters.tsx
@@ -273,9 +273,10 @@ function ConditionEditor(props: {
)}
</Show>
<Button
+ aria-label="Remove filter"
+ tooltip="Remove filter"
variant="ghost"
size="icon-md"
- label="Remove filter"
onClick={props.onRemove}
>
<XIcon class="size-4 touch:size-3.5" />
diff --git a/apps/web/src/features/database/components/formula-editor.tsx b/apps/web/src/features/database/components/formula-editor.tsx
index 96cc4fd08e..68119b80c6 100644
--- a/apps/web/src/features/database/components/formula-editor.tsx
+++ b/apps/web/src/features/database/components/formula-editor.tsx
@@ -310,7 +310,7 @@ export function FormulaEditor(props: {
>
{(column) => (
<Button
- variant="outline"
+ variant="secondary"
size="xs"
disabled={!tools()}
onClick={() => {
@@ -347,7 +347,7 @@ export function FormulaEditor(props: {
Cancel
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={!canSave()}
onClick={() => fireAndForget(save(), 'database')}
diff --git a/apps/web/src/features/database/components/new-board-group.tsx b/apps/web/src/features/database/components/new-board-group.tsx
index 3d5f181ab9..3b71ec9125 100644
--- a/apps/web/src/features/database/components/new-board-group.tsx
+++ b/apps/web/src/features/database/components/new-board-group.tsx
@@ -72,7 +72,7 @@ export function NewBoardGroup(props: {
<h2 class="text-sm font-medium">Create a group</h2>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
class="gap-2"
onClick={() => {
setDraft('');
@@ -122,13 +122,18 @@ export function NewBoardGroup(props: {
</p>
</Show>
<div class="mt-3 flex items-center justify-end gap-2">
- <Button size="sm" disabled={pending()} onClick={cancel}>
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={pending()}
+ onClick={cancel}
+ >
Cancel
</Button>
<Button
size="sm"
type="submit"
- variant="cta"
+ variant="primary"
disabled={pending() || !draft().trim()}
>
{pending() ? 'Adding…' : 'Add group'}
diff --git a/apps/web/src/features/database/components/option-editor.tsx b/apps/web/src/features/database/components/option-editor.tsx
index b7facbf967..dfbe126458 100644
--- a/apps/web/src/features/database/components/option-editor.tsx
+++ b/apps/web/src/features/database/components/option-editor.tsx
@@ -75,11 +75,11 @@ export function OptionEditor(props: {
gutter={6}
>
<Popover.Trigger
+ aria-label={`Edit ${props.option.label}`}
+ tooltip={{ content: `Edit ${props.option.label}`, disabled: true }}
as={Button}
variant="ghost"
size="icon-xs"
- label={`Edit ${props.option.label}`}
- tooltipDisabled
class={props.class}
onPointerDown={(event: PointerEvent) => event.stopPropagation()}
onClick={(event: MouseEvent) => event.stopPropagation()}
@@ -169,7 +169,11 @@ export function OptionEditor(props: {
>
Delete
</Button>
- <Button size="xs" onClick={() => setConfirming(false)}>
+ <Button
+ variant="ghost"
+ size="xs"
+ onClick={() => setConfirming(false)}
+ >
Cancel
</Button>
</div>
diff --git a/apps/web/src/features/database/components/record-panel.tsx b/apps/web/src/features/database/components/record-panel.tsx
index 3d026c85d9..16be29b0d1 100644
--- a/apps/web/src/features/database/components/record-panel.tsx
+++ b/apps/web/src/features/database/components/record-panel.tsx
@@ -93,28 +93,30 @@ export function RecordPanel(props: RecordPanelProps) {
</span>
</Show>
<Button
+ variant="ghost"
+ aria-label="Previous record"
+ tooltip={{ content: 'Previous record', disabled: true }}
size="icon-sm"
- label="Previous record"
- tooltipDisabled
disabled={props.position <= 0}
onClick={() => props.onNavigate(-1)}
>
- <ArrowUpIcon />
+ <ArrowUpIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ variant="ghost"
+ aria-label="Next record"
+ tooltip={{ content: 'Next record', disabled: true }}
size="icon-sm"
- label="Next record"
- tooltipDisabled
disabled={props.position < 0 || props.position >= props.total - 1}
onClick={() => props.onNavigate(1)}
>
- <ArrowDownIcon />
+ <ArrowDownIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Dialog.CloseButton
aria-label="Close record"
class={buttonClasses({ size: 'icon-sm' })}
>
- <XIcon />
+ <XIcon class="size-3.5 shrink-0 touch:size-6" />
</Dialog.CloseButton>
</div>
<div class="min-h-0 overflow-auto px-5 py-4">
@@ -145,7 +147,8 @@ export function RecordPanel(props: RecordPanelProps) {
class="hover:text-failure-ink"
onClick={props.onRequestDelete}
>
- <TrashIcon /> Delete record
+ <TrashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />{' '}
+ Delete record
</Button>
</div>
</Show>
@@ -156,7 +159,12 @@ export function RecordPanel(props: RecordPanelProps) {
class="flex items-center gap-3 border-t border-warning/20 bg-warning/5 px-5 py-3 text-xs text-ink-muted"
>
<span class="flex-1">{props.saveError}</span>
- <Button size="xs" disabled={props.pending} onClick={props.onRetry}>
+ <Button
+ variant="ghost"
+ size="xs"
+ disabled={props.pending}
+ onClick={props.onRetry}
+ >
Retry
</Button>
</div>
diff --git a/apps/web/src/features/database/components/sort-panel.tsx b/apps/web/src/features/database/components/sort-panel.tsx
index b4fca7ff47..1d523d6915 100644
--- a/apps/web/src/features/database/components/sort-panel.tsx
+++ b/apps/web/src/features/database/components/sort-panel.tsx
@@ -126,9 +126,10 @@ export function SortPanel(props: {
}
/>
<Button
+ variant="ghost"
+ aria-label="Remove sort"
+ tooltip={{ content: 'Remove sort', disabled: true }}
size="icon-sm"
- label="Remove sort"
- tooltipDisabled
onClick={() =>
setSort(withSort(sort(), key().column, null))
}
diff --git a/apps/web/src/features/database/components/timeline-menu.tsx b/apps/web/src/features/database/components/timeline-menu.tsx
index 211df2a8aa..e6983cf51a 100644
--- a/apps/web/src/features/database/components/timeline-menu.tsx
+++ b/apps/web/src/features/database/components/timeline-menu.tsx
@@ -28,7 +28,12 @@ type TimelineMenuItemProps = {
export function TimelineMenu(props: TimelineMenuItemProps) {
return (
<Dropdown>
- <Dropdown.Trigger variant="ghost" size="md" square label="Timeline menu">
+ <Dropdown.Trigger
+ variant="ghost"
+ size="icon-md"
+ aria-label="Timeline menu"
+ tooltip="Timeline menu"
+ >
<DotsIcon class="size-4" />
</Dropdown.Trigger>
<Dropdown.Content class="min-w-48">
diff --git a/apps/web/src/features/database/components/view-control-popover.tsx b/apps/web/src/features/database/components/view-control-popover.tsx
index d462070410..b537e64cd0 100644
--- a/apps/web/src/features/database/components/view-control-popover.tsx
+++ b/apps/web/src/features/database/components/view-control-popover.tsx
@@ -1,12 +1,14 @@
import XIcon from '@icon/system/regular/x.svg';
import { Popover } from '@kobalte/core/popover';
import { Button } from '@ui/components/Button';
+import { ButtonGroup } from '@ui/components/ButtonGroup';
import { type JSX, Show } from 'solid-js';
export function ToolbarPopover(props: {
label: string;
count?: number;
compact?: boolean;
+ grouped?: boolean;
icon: JSX.Element;
children: JSX.Element;
}) {
@@ -19,11 +21,11 @@ export function ToolbarPopover(props: {
overflowPadding={8}
>
<Popover.Trigger
- as={Button}
+ aria-label={`${props.label}${props.count ? ` ${props.count}` : ''}`}
+ as={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
size={props.compact && !props.count ? 'icon-md' : 'md'}
class={props.count ? 'text-accent' : undefined}
- label={`${props.label}${props.count ? ` ${props.count}` : ''}`}
tooltip={props.label}
>
{props.icon}
diff --git a/apps/web/src/features/database/views/database-board-view.tsx b/apps/web/src/features/database/views/database-board-view.tsx
index 4d217c68e5..430c11deed 100644
--- a/apps/web/src/features/database/views/database-board-view.tsx
+++ b/apps/web/src/features/database/views/database-board-view.tsx
@@ -137,6 +137,7 @@ export function DatabaseBoardView(props: DatabaseBoardViewProps) {
<Show when={props.onViewChange}>
{(changeView) => (
<Button
+ variant="ghost"
size="sm"
class="mt-3"
onClick={() =>
diff --git a/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx b/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx
index 33adbb85d1..68672dd99d 100644
--- a/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx
+++ b/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx
@@ -232,7 +232,7 @@ export default function ProjectionPlayground() {
<section class="flex gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={projection.query.isFetching}
onClick={() => projection.query.refetch()}
@@ -240,7 +240,7 @@ export default function ProjectionPlayground() {
Send request
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={busy()}
onClick={() => fireAndForget(regenerate(), 'devtools')}
diff --git a/apps/web/src/features/dictation/components/dictation-controls.tsx b/apps/web/src/features/dictation/components/dictation-controls.tsx
index e505ed927a..96c89cc748 100644
--- a/apps/web/src/features/dictation/components/dictation-controls.tsx
+++ b/apps/web/src/features/dictation/components/dictation-controls.tsx
@@ -16,15 +16,15 @@ export function DictationButton(props: {
return (
<Show when={isDictationAvailable()}>
<Button
+ aria-label={props.dictation.label()}
variant="ghost"
- size="icon-composer"
+ size="icon-md"
class="text-composer-ink"
- label={props.dictation.label()}
tooltip={props.dictation.label()}
disabled={props.disabled || props.dictation.disabled()}
onClick={() => fireAndForget(props.dictation.start(), 'dictation')}
>
- <MicrophoneIcon />
+ <MicrophoneIcon class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
);
@@ -60,10 +60,11 @@ export function DictationPanel(props: { dictation: DictationController }) {
</span>
</div>
<Button
+ aria-label="Cancel dictation"
+ tooltip="Cancel dictation"
variant="ghost"
- size="icon-composer"
+ size="icon-md"
class="text-composer-ink"
- label="Cancel dictation"
ref={(element) =>
queueMicrotask(() => {
if (element.isConnected) element.focus();
@@ -71,20 +72,21 @@ export function DictationPanel(props: { dictation: DictationController }) {
}
onClick={props.dictation.cancel}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
+ aria-label="Use dictation"
+ tooltip="Use dictation"
variant="ghost"
- size="icon-composer"
+ size="icon-md"
class="text-composer-ink"
- label="Use dictation"
disabled={
props.dictation.phase() === 'starting' ||
props.dictation.phase() === 'finishing'
}
onClick={() => fireAndForget(props.dictation.confirm(), 'dictation')}
>
- <CheckIcon />
+ <CheckIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
diff --git a/apps/web/src/features/drive-view/components/FileDetail.tsx b/apps/web/src/features/drive-view/components/FileDetail.tsx
index e7e82cd9eb..45ef9d698a 100644
--- a/apps/web/src/features/drive-view/components/FileDetail.tsx
+++ b/apps/web/src/features/drive-view/components/FileDetail.tsx
@@ -86,7 +86,7 @@ function FileDetailBodyState(props: {
<pre class="max-h-48 max-w-full overflow-auto whitespace-pre-wrap text-left text-failure text-xs">
{String(props.error)}
</pre>
- <Button variant="outline" size="sm" onClick={props.onAction}>
+ <Button variant="secondary" size="sm" onClick={props.onAction}>
{props.actionLabel ?? 'Reset'}
</Button>
</div>
diff --git a/apps/web/src/features/drive-view/components/folder-composer.tsx b/apps/web/src/features/drive-view/components/folder-composer.tsx
index 0a7d49f31d..e9ca43ad88 100644
--- a/apps/web/src/features/drive-view/components/folder-composer.tsx
+++ b/apps/web/src/features/drive-view/components/folder-composer.tsx
@@ -61,14 +61,15 @@ export function FolderComposer(props: {
<div class="flex-1 flex items-center">
<Show when={props.onExpand}>
<Button
+ variant="ghost"
tabIndex={-1}
- size="icon-composer"
+ size="icon-md"
aria-label="Continue editing in split"
tooltip="Continue editing in split"
disabled={props.busy}
onClick={props.onExpand}
>
- <ArrowsOutIcon />
+ <ArrowsOutIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -76,8 +77,7 @@ export function FolderComposer(props: {
<Button
tabIndex={-1}
size="sm"
- variant="outline"
- depth={3}
+ variant="secondary"
disabled={props.busy}
onClick={() => {
props.onClear();
@@ -88,14 +88,15 @@ export function FolderComposer(props: {
</Button>
</Show>
<Button
+ variant="ghost"
tabIndex={-1}
- size="icon-composer"
+ size="icon-md"
aria-label="Close"
tooltip="Close"
disabled={props.busy}
onClick={props.onClose}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</EntityComposer.Header>
<EntityComposer.Main class="gap-4">
@@ -142,7 +143,7 @@ export function FolderComposer(props: {
<div class="flex flex-wrap justify-center gap-2">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.busy}
onClick={props.onFiles}
>
@@ -150,7 +151,7 @@ export function FolderComposer(props: {
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.busy}
onClick={props.onFolder}
>
@@ -188,13 +189,14 @@ export function FolderComposer(props: {
: entry.file.name}
</span>
<Button
+ variant="ghost"
size="icon-sm"
aria-label={`Remove ${entry.file.name}`}
tooltip="Remove"
disabled={props.busy}
onClick={() => props.onRemove(entry)}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</li>
)}
diff --git a/apps/web/src/features/drive-view/drive-create-menu.tsx b/apps/web/src/features/drive-view/drive-create-menu.tsx
index cc768ba8fa..4bc21d7903 100644
--- a/apps/web/src/features/drive-view/drive-create-menu.tsx
+++ b/apps/web/src/features/drive-view/drive-create-menu.tsx
@@ -47,7 +47,7 @@ function SidebarTrigger(props: { label: string }) {
function ToolbarTrigger(props: { label: string }) {
return (
- <Dropdown.Trigger variant="outline" size="md" aria-label={props.label}>
+ <Dropdown.Trigger variant="secondary" size="md" aria-label={props.label}>
<PlusIcon class="size-4" />
<span>{t('create.new')}</span>
<CaretDownIcon class="size-3" />
diff --git a/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx b/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx
index 8e8004e857..ec94503a02 100644
--- a/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx
+++ b/apps/web/src/features/drive-view/filters/use-drive-filters.test.tsx
@@ -6,7 +6,7 @@ import {
screen,
waitFor,
} from '@solidjs/testing-library';
-import { createSignal, type ParentProps } from 'solid-js';
+import { createSignal } from 'solid-js';
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import type { DriveState } from '../core/types';
import { createDriveState } from '../primitives/drive-state';
@@ -26,13 +26,12 @@ vi.mock('@property/tags/use-tag-filter-group', () => ({
}));
vi.mock('@queries/contacts/contacts', () => ({ useContacts: () => () => [] }));
vi.mock('@ui', async () => ({
+ ...(await import('@ui/components/Button')),
+ ...(await import('@ui/components/ButtonGroup')),
...(await import('@ui/utils/classname')),
...(await import('@ui/components/Dropdown')),
...(await import('@ui/components/Layer')),
}));
-vi.mock('@ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
vi.mock('@core/mobile/isTouchDevice', () => ({ isTouchDevice: () => false }));
vi.mock('@core/mobile/inputModality', () => ({ isModality: () => false }));
diff --git a/apps/web/src/features/drive-view/views/MarkdownDetail.tsx b/apps/web/src/features/drive-view/views/MarkdownDetail.tsx
index 0ebff5ee4f..ab3ff889a6 100644
--- a/apps/web/src/features/drive-view/views/MarkdownDetail.tsx
+++ b/apps/web/src/features/drive-view/views/MarkdownDetail.tsx
@@ -64,7 +64,7 @@ export function MarkdownDetailBodyState(props: {
<pre class="max-h-48 max-w-full overflow-auto whitespace-pre-wrap text-left text-failure text-xs">
{String(props.error)}
</pre>
- <Button variant="outline" size="sm" onClick={props.onAction}>
+ <Button variant="secondary" size="sm" onClick={props.onAction}>
{props.actionLabel ?? 'Reset'}
</Button>
</div>
diff --git a/apps/web/src/features/drive-view/views/drive-filter-menu.tsx b/apps/web/src/features/drive-view/views/drive-filter-menu.tsx
index 4f9f65945f..2c6b4fc48f 100644
--- a/apps/web/src/features/drive-view/views/drive-filter-menu.tsx
+++ b/apps/web/src/features/drive-view/views/drive-filter-menu.tsx
@@ -4,10 +4,13 @@ import {
useViewControlHotkeys,
} from '@app/components/view-shell';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import type { ButtonSize } from '@ui';
import { createSignal } from 'solid-js';
import { useDriveFilters } from '../filters/use-drive-filters';
-export function DriveFilterMenu() {
+export function DriveFilterMenu(
+ props: { grouped?: boolean; size?: ButtonSize } = {}
+) {
const filters = useDriveFilters();
const panel = useSplitPanelOrThrow();
@@ -31,6 +34,8 @@ export function DriveFilterMenu() {
return (
<div class="relative shrink-0">
<ListFilterDropdown
+ grouped={props.grouped}
+ size={props.size}
label="Filter files"
open={open()}
onOpenChange={setOpen}
diff --git a/apps/web/src/features/drive-view/views/drive-header.tsx b/apps/web/src/features/drive-view/views/drive-header.tsx
index cf91e03018..2403bfa0df 100644
--- a/apps/web/src/features/drive-view/views/drive-header.tsx
+++ b/apps/web/src/features/drive-view/views/drive-header.tsx
@@ -56,15 +56,17 @@ export function DriveHeader() {
title={<DriveBreadcrumbsOutlet aria-label="Drive location" />}
>
<Show when={state.value().location.kind === 'tab'}>
- <HeaderActionGroup label="File filters">
+ <HeaderActionGroup label="File filters" size="md">
<Suspense>
- <DriveFilterMenu />
+ <DriveFilterMenu grouped size="icon-md" />
</Suspense>
</HeaderActionGroup>
</Show>
<Show when={!isRecent()}>
- <HeaderActionGroup label="File view options">
+ <HeaderActionGroup label="File view options" size="md">
<ListSortDropdown
+ grouped
+ size="icon-md"
label="Sort files"
value={state.value().sort}
onChange={state.setSort}
diff --git a/apps/web/src/features/drive-view/views/drive-list.tsx b/apps/web/src/features/drive-view/views/drive-list.tsx
index a5b35383b5..f78183da95 100644
--- a/apps/web/src/features/drive-view/views/drive-list.tsx
+++ b/apps/web/src/features/drive-view/views/drive-list.tsx
@@ -280,7 +280,7 @@ export function DriveList() {
>
Databases couldn’t be loaded.
<Button
- variant="outline"
+ variant="secondary"
onClick={() => fireAndForget(refresh(), 'drive-view')}
>
Try again
@@ -293,7 +293,7 @@ export function DriveList() {
<div class="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 text-sm text-ink-muted">
<span>Files couldn’t be loaded.</span>
<Button
- variant="outline"
+ variant="secondary"
onClick={() => fireAndForget(refresh(), 'drive-view')}
>
Try again
@@ -329,20 +329,23 @@ export function DriveList() {
<span>{emptyMessage()}</span>
<Show when={source.error()}>
<Button
- variant="outline"
+ variant="secondary"
onClick={() => fireAndForget(refresh(), 'drive-view')}
>
Try again
</Button>
</Show>
<Show when={hasFilters()}>
- <Button variant="outline" onClick={state.clearFilters}>
+ <Button
+ variant="secondary"
+ onClick={state.clearFilters}
+ >
Clear filters
</Button>
</Show>
<Show when={!forceEmptyState() && source.hasMore()}>
<Button
- variant="outline"
+ variant="secondary"
disabled={source.isFetching()}
onClick={() =>
fireAndForget(loadMore(), 'drive-view')
@@ -496,7 +499,7 @@ export function DriveList() {
>
More files couldn’t be loaded.
<Button
- variant="outline"
+ variant="secondary"
onClick={() =>
fireAndForget(loadMore(), 'drive-view')
}
diff --git a/apps/web/src/features/drive-view/views/drive-sidebar.tsx b/apps/web/src/features/drive-view/views/drive-sidebar.tsx
index d1612461e0..452a6dd2a7 100644
--- a/apps/web/src/features/drive-view/views/drive-sidebar.tsx
+++ b/apps/web/src/features/drive-view/views/drive-sidebar.tsx
@@ -167,7 +167,7 @@ export function DriveSidebarContent(props: { onNavigate?: () => void }) {
<CollapsibleSection.Indicator />
</CollapsibleSection.Trigger>
<CollapsibleSection.Action
- label="Search folders"
+ aria-label="Search folders"
onClick={() => {
const open = !searchingFolders();
diff --git a/apps/web/src/features/email-compose/browser-test/fixture.tsx b/apps/web/src/features/email-compose/browser-test/fixture.tsx
index f02565fb24..347c676a8b 100644
--- a/apps/web/src/features/email-compose/browser-test/fixture.tsx
+++ b/apps/web/src/features/email-compose/browser-test/fixture.tsx
@@ -283,14 +283,18 @@ function Fixture() {
/>
</Show>
<div class="ml-auto flex shrink-0 items-center gap-1">
- <Button label="Delete draft" size="icon-composer">
- <TrashIcon />
+ <Button
+ aria-label="Delete draft"
+ tooltip="Delete draft"
+ size="icon-md"
+ >
+ <TrashIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
- <Button label="Attach" size="icon-composer">
- <PaperclipIcon />
+ <Button aria-label="Attach" tooltip="Attach" size="icon-md">
+ <PaperclipIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
- <Button label="Format" size="icon-composer">
- <TextAa />
+ <Button aria-label="Format" tooltip="Format" size="icon-md">
+ <TextAa class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<div class="shrink-0">
<EmailDateSelector
@@ -307,9 +311,8 @@ function Fixture() {
appearance="composer"
disabled={actionDisabled()}
aria-label={actionLabel()}
- tooltip={actionLabel()}
+ tooltip={{ content: actionLabel(), shortcut: 'cmd+enter' }}
onClick={submit}
- shortcut="cmd+enter"
/>
</div>
</div>
diff --git a/apps/web/src/features/email-compose/components/draft-sync-status.tsx b/apps/web/src/features/email-compose/components/draft-sync-status.tsx
index 87501f41b0..abbc1f93b5 100644
--- a/apps/web/src/features/email-compose/components/draft-sync-status.tsx
+++ b/apps/web/src/features/email-compose/components/draft-sync-status.tsx
@@ -26,7 +26,7 @@ export function DraftSyncStatus(props: {
<Show when={state().action || props.error}>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.busy}
onClick={props.onRetry}
>
@@ -36,7 +36,7 @@ export function DraftSyncStatus(props: {
<Show when={state().canKeepEditing}>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.busy}
onClick={props.onKeepEditing}
>
diff --git a/apps/web/src/features/email-compose/components/email-date-selector.tsx b/apps/web/src/features/email-compose/components/email-date-selector.tsx
index 6bf9bcff56..bb806a966e 100644
--- a/apps/web/src/features/email-compose/components/email-date-selector.tsx
+++ b/apps/web/src/features/email-compose/components/email-date-selector.tsx
@@ -111,7 +111,10 @@ export const EmailDateSelector: VoidComponent<EmailDateSelectorProps> = (
</Show>
}
triggerClass={cn(
- buttonClasses({ size: props.mobile ? 'icon-sm' : 'icon-composer' }),
+ buttonClasses({
+ variant: 'ghost',
+ size: props.mobile ? 'icon-sm' : 'icon-md',
+ }),
props.selectedTime &&
!isCompact() &&
'min-w-0 max-w-full shrink gap-1 aspect-auto! bg-accent/20 text-accent hover:bg-accent/15! hover:text-accent! not-touch:min-w-[33.75px] not-touch:w-auto! not-touch:px-2'
@@ -134,7 +137,7 @@ export const EmailDateSelector: VoidComponent<EmailDateSelectorProps> = (
<div class="flex min-w-0 items-center gap-1">
<ClockIcon
class={cn(
- 'touch:size-6',
+ 'size-4 shrink-0 touch:size-6',
props.selectedTime && 'text-accent'
)}
/>
diff --git a/apps/web/src/features/email-compose/components/email-schedule-summary.tsx b/apps/web/src/features/email-compose/components/email-schedule-summary.tsx
index bab62b4bdc..2d14b66200 100644
--- a/apps/web/src/features/email-compose/components/email-schedule-summary.tsx
+++ b/apps/web/src/features/email-compose/components/email-schedule-summary.tsx
@@ -131,6 +131,7 @@ function ScheduleSummaryAction(props: {
return (
<Show when={props.summary.action}>
<Button
+ variant="ghost"
size="sm"
aria-label={props.summary.accessibleActionLabel}
tooltip={props.summary.accessibleActionLabel}
diff --git a/apps/web/src/features/email-compose/components/mobile-compose-actions.tsx b/apps/web/src/features/email-compose/components/mobile-compose-actions.tsx
index 964052d9ae..a15690a11d 100644
--- a/apps/web/src/features/email-compose/components/mobile-compose-actions.tsx
+++ b/apps/web/src/features/email-compose/components/mobile-compose-actions.tsx
@@ -18,12 +18,14 @@ export function MobileComposeActions(props: {
<HeaderIsland class="h-(--mobile-chrome-button-size) p-[5px]">
<Show when={props.attachRef}>
<Button
+ aria-label="Attach"
+ tooltip="Attach"
ref={props.attachRef}
- label="Attach"
+ variant="ghost"
size="icon-sm"
disabled={props.editingDisabled}
>
- <Paperclip />
+ <Paperclip class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
{props.scheduleControl}
diff --git a/apps/web/src/features/email-compose/components/mobile-reply-toolbar.tsx b/apps/web/src/features/email-compose/components/mobile-reply-toolbar.tsx
index 3067e5f345..3b490a4e22 100644
--- a/apps/web/src/features/email-compose/components/mobile-reply-toolbar.tsx
+++ b/apps/web/src/features/email-compose/components/mobile-reply-toolbar.tsx
@@ -19,8 +19,14 @@ export function MobileReplyToolbar(props: {
return (
<div class="sticky top-0 z-10 flex shrink-0 flex-wrap items-center justify-between gap-2 bg-surface px-(--mobile-chrome-gutter) pb-3 pt-[calc(var(--safe-top,0px)+12px)]">
<HeaderIsland class="size-(--mobile-chrome-button-size) justify-center p-0">
- <Button label="Go Back" size="icon-sm" onClick={props.onBack}>
- <CaretLeft />
+ <Button
+ aria-label="Go Back"
+ tooltip="Go Back"
+ variant="ghost"
+ size="icon-sm"
+ onClick={props.onBack}
+ >
+ <CaretLeft class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</HeaderIsland>
<div class="ml-auto">
diff --git a/apps/web/src/features/email-compose/queued-send-status.tsx b/apps/web/src/features/email-compose/queued-send-status.tsx
index a4a81de3b6..ec8bf230c4 100644
--- a/apps/web/src/features/email-compose/queued-send-status.tsx
+++ b/apps/web/src/features/email-compose/queued-send-status.tsx
@@ -129,6 +129,7 @@ export function QueuedSendStatus(props: {
</Show>
<Show when={hasMoreServerEmailSends()}>
<Button
+ variant="secondary"
onClick={() =>
fireAndForget(loadMoreServerEmailSends(), 'email-more-sends')
}
@@ -188,6 +189,7 @@ function ServerSendStatus(props: { row: ServerEmailSend }) {
</Show>
</div>
<Button
+ variant="ghost"
disabled={working()}
onClick={() => fireAndForget(action(), 'email-server-send')}
>
@@ -288,6 +290,7 @@ function SendStatus(props: {
when={status() !== 'SENDING' && status() !== 'DELIVERY_UNCONFIRMED'}
>
<Button
+ variant="ghost"
disabled={
working() ||
(emailSendLocked(props.intent) &&
@@ -304,6 +307,7 @@ function SendStatus(props: {
}
>
<Button
+ variant="ghost"
disabled={working()}
onClick={() =>
fireAndForget(checkStatus(), 'email-compose-check-send')
diff --git a/apps/web/src/features/email-compose/views/compose-layout.tsx b/apps/web/src/features/email-compose/views/compose-layout.tsx
index 8c7e48decc..c88d0c9f9a 100644
--- a/apps/web/src/features/email-compose/views/compose-layout.tsx
+++ b/apps/web/src/features/email-compose/views/compose-layout.tsx
@@ -258,6 +258,7 @@ export function ComposeLayout(props: {
<div class="flex shrink-0 items-center">
<Show when={!isCcVisible()}>
<Button
+ variant="ghost"
size="sm"
onClick={() => setShowCc(true)}
disabled={ctx.disabled()}
@@ -267,6 +268,7 @@ export function ComposeLayout(props: {
</Show>
<Show when={!isBccVisible()}>
<Button
+ variant="ghost"
size="sm"
onClick={() => setShowBcc(true)}
disabled={ctx.disabled()}
diff --git a/apps/web/src/features/email-compose/views/compose-toolbar.tsx b/apps/web/src/features/email-compose/views/compose-toolbar.tsx
index 36119f1f47..e148365d21 100644
--- a/apps/web/src/features/email-compose/views/compose-toolbar.tsx
+++ b/apps/web/src/features/email-compose/views/compose-toolbar.tsx
@@ -48,16 +48,18 @@ export function EmailComposeToolbar(props: {
<div class="flex shrink-0 items-center gap-1">
<Show when={ctx.hasDraft()}>
<Button
+ variant="ghost"
onClick={ctx.onDelete}
tooltip="Delete draft"
- size="icon-composer"
+ size="icon-md"
disabled={ctx.disabled()}
>
- <Trash />
+ <Trash class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Show when={!ctx.hideAttachments}>
<Button
+ variant="ghost"
ref={(el) =>
fileSelector(el, () => ({
multiple: true,
@@ -65,19 +67,20 @@ export function EmailComposeToolbar(props: {
}))
}
tooltip="Attach"
- size="icon-composer"
+ size="icon-md"
disabled={ctx.disabled()}
>
- <PaperclipIcon />
+ <PaperclipIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Button
+ variant="ghost"
tooltip="Format"
- size="icon-composer"
+ size="icon-md"
disabled={ctx.disabled()}
onClick={() => setShowFormatRibbon(!showFormatRibbon())}
>
- <TextAa />
+ <TextAa class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Show when={ctx.scheduleEnabled}>
<div class="shrink-0">
@@ -98,11 +101,12 @@ export function EmailComposeToolbar(props: {
onClick={() => ctx.onSend()}
disabled={ctx.isSavingDraft?.() || ctx.primaryActionDisabled()}
pending={ctx.isSending()}
- tooltip={
- ctx.sendUnavailableReason?.() ?? ctx.schedule.actionLabel()
- }
+ tooltip={{
+ content:
+ ctx.sendUnavailableReason?.() ?? ctx.schedule.actionLabel(),
+ shortcut: 'cmd+enter',
+ }}
aria-label={ctx.schedule.actionLabel()}
- shortcut="cmd+enter"
/>
</div>
</div>
diff --git a/apps/web/src/features/email-compose/views/reply-envelope.tsx b/apps/web/src/features/email-compose/views/reply-envelope.tsx
index e6ca4f4f39..5bc8eddd7f 100644
--- a/apps/web/src/features/email-compose/views/reply-envelope.tsx
+++ b/apps/web/src/features/email-compose/views/reply-envelope.tsx
@@ -165,6 +165,7 @@ export function ReplyEnvelope(props: ReplyEnvelopeProps) {
<div class="flex items-center ml-auto shrink-0">
<Show when={!showCc()}>
<Button
+ variant="ghost"
size="sm"
disabled={props.disabled()}
onClick={() => {
@@ -177,6 +178,7 @@ export function ReplyEnvelope(props: ReplyEnvelopeProps) {
</Show>
<Show when={!showBcc()}>
<Button
+ variant="ghost"
size="sm"
disabled={props.disabled()}
onClick={() => {
diff --git a/apps/web/src/features/email-compose/views/reply-input.tsx b/apps/web/src/features/email-compose/views/reply-input.tsx
index 7a7305c2d0..7ef75c3ad0 100644
--- a/apps/web/src/features/email-compose/views/reply-input.tsx
+++ b/apps/web/src/features/email-compose/views/reply-input.tsx
@@ -449,17 +449,18 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {
const AttachButton = () => (
<Button
+ variant="ghost"
ref={(el) =>
fileSelector(el, () => ({
multiple: true,
onSelect: handleAddAttachments,
}))
}
- size="icon-composer"
+ size="icon-md"
tooltip="Attach"
disabled={editingDisabled()}
>
- <Paperclip />
+ <Paperclip class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
@@ -727,7 +728,7 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {
setComposerExpanded(true);
}}
>
- <DotsThree />
+ <DotsThree class="size-3.5 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
@@ -752,12 +753,12 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {
as={Button}
variant="ghost"
size="icon-sm"
- class="size-5 rounded bg-transparent p-0 text-ink-extra-muted hover:text-ink-muted [&_:where(svg)]:size-5"
+ class="size-5 rounded bg-transparent p-0 text-ink-extra-muted hover:text-ink-muted"
pressed={form.replyAppended()}
disabled={editingDisabled()}
onChange={toggleQuotedText}
>
- <DotsThree />
+ <DotsThree class="size-5 shrink-0" />
</KToggleButton>
</Tooltip>
</div>
@@ -790,12 +791,13 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {
>
<div class="flex shrink-0 items-center gap-1">
<Button
+ variant="ghost"
onClick={deleteDraftAndReset}
tooltip={savedDraftId() ? 'Delete draft' : 'Discard'}
- size="icon-composer"
+ size="icon-md"
disabled={editingDisabled()}
>
- <Trash />
+ <Trash class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<AttachButton />
<Show
@@ -823,8 +825,10 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {
pending={isSending()}
hidden={sendActionHidden()}
onClick={() => sendEmail()}
- tooltip={sendUnavailableReason() ?? scheduleActionLabel()}
- shortcut={sendUnavailableReason() ? undefined : 'cmd+enter'}
+ tooltip={{
+ content: sendUnavailableReason() ?? scheduleActionLabel(),
+ shortcut: sendUnavailableReason() ? undefined : 'cmd+enter',
+ }}
aria-label={scheduleActionLabel()}
/>
</div>
diff --git a/apps/web/src/features/email-message/components/calendar-file-preview.tsx b/apps/web/src/features/email-message/components/calendar-file-preview.tsx
index a39cc2b292..60e6b87b7d 100644
--- a/apps/web/src/features/email-message/components/calendar-file-preview.tsx
+++ b/apps/web/src/features/email-message/components/calendar-file-preview.tsx
@@ -41,24 +41,20 @@ export function CalendarFilePreview(props: {
{props.fileName || 'Calendar file'}
</Dialog.Title>
<Show when={props.onDownload}>
- <Button
- variant="outline"
- depth={3}
- onClick={() => props.onDownload?.()}
- >
- <DownloadSimple />
+ <Button variant="secondary" onClick={() => props.onDownload?.()}>
+ <DownloadSimple class="size-4 shrink-0 touch:size-6" />
Download .ics
</Button>
</Show>
<Button
- label="Close"
+ aria-label="Close"
+ tooltip="Close"
variant="ghost"
size="icon-md"
- depth={3}
class="mobile:hidden"
onClick={() => props.onClose()}
>
- <X />
+ <X class="size-4 shrink-0 touch:size-6" />
</Button>
</Panel.Header>
<Panel.Body class="max-h-[70vh] overflow-y-auto px-6 pb-3">
diff --git a/apps/web/src/features/email-message/components/calendar-invite-card.tsx b/apps/web/src/features/email-message/components/calendar-invite-card.tsx
index 7c9cee3fea..019091fd0b 100644
--- a/apps/web/src/features/email-message/components/calendar-invite-card.tsx
+++ b/apps/web/src/features/email-message/components/calendar-invite-card.tsx
@@ -366,7 +366,7 @@ export function CalendarInviteCard(props: {
}
>
<Button
- variant="strong"
+ variant="secondary"
onClick={() => props.actions?.connectCalendar?.()}
>
Connect calendar
@@ -374,7 +374,7 @@ export function CalendarInviteCard(props: {
</Show>
<Show when={conference() && props.actions?.openExternal}>
<Button
- variant="cta"
+ variant="primary"
aria-label="Join meeting"
onClick={() => props.actions?.openExternal?.(conference()!)}
>
@@ -384,9 +384,10 @@ export function CalendarInviteCard(props: {
</Show>
<Show when={props.actions?.openCalendar}>
<Button
- variant="outline"
+ aria-label="Open in calendar"
+ tooltip="Open in calendar"
+ variant="secondary"
size="icon-md"
- label="Open in calendar"
onClick={(event) =>
props.actions?.openCalendar?.({
openInNewSplit: event.shiftKey,
diff --git a/apps/web/src/features/email-message/components/email-message-top-bar.tsx b/apps/web/src/features/email-message/components/email-message-top-bar.tsx
index c8ac982b02..5edd2faa7e 100644
--- a/apps/web/src/features/email-message/components/email-message-top-bar.tsx
+++ b/apps/web/src/features/email-message/components/email-message-top-bar.tsx
@@ -174,7 +174,6 @@ function HeaderTopRow(props: {
<Button
variant="ghost"
size="icon-sm"
- noTouchResize
onClick={(e) => {
e.stopPropagation();
props.onToggle();
diff --git a/apps/web/src/features/email-message/components/message-actions.tsx b/apps/web/src/features/email-message/components/message-actions.tsx
index 61543fb53c..aa816f4f23 100644
--- a/apps/web/src/features/email-message/components/message-actions.tsx
+++ b/apps/web/src/features/email-message/components/message-actions.tsx
@@ -36,10 +36,8 @@ export function MessageActions(props: {
variant="ghost"
size="icon-sm"
class="size-6 p-0"
- noTouchResize
onClick={onChangeReplyType('reply-all')}
- tooltip="Reply"
- hotkey={TOKENS.email.reply}
+ tooltip={{ content: 'Reply', hotkey: TOKENS.email.reply }}
>
<ArrowBendUpLeft class="size-3.5" />
</Button>
@@ -49,10 +47,8 @@ export function MessageActions(props: {
variant="ghost"
size="icon-sm"
class="size-6 p-0"
- noTouchResize
onClick={onChangeReplyType('forward')}
- tooltip="Forward"
- hotkey={TOKENS.email.forward}
+ tooltip={{ content: 'Forward', hotkey: TOKENS.email.forward }}
>
<ArrowBendUpRight class="size-3.5" />
</Button>
diff --git a/apps/web/src/features/email-message/views/email-message-body.tsx b/apps/web/src/features/email-message/views/email-message-body.tsx
index ede9da3865..ac2bcbddc7 100644
--- a/apps/web/src/features/email-message/views/email-message-body.tsx
+++ b/apps/web/src/features/email-message/views/email-message-body.tsx
@@ -56,16 +56,17 @@ export function EmailMessageBody(props: EmailMessageBodyProps) {
<Show when={!showFullHTML() && hasHiddenReplyStructure()}>
<div class="flex items-center mt-1.5 mb-2">
<Button
+ aria-label="Show quoted text"
+ tooltip="Show quoted text"
variant="ghost"
size="icon-sm"
- label="Show quoted text"
onClick={() => setShowFullHTML(true)}
class={cn(
'text-ink-extra-muted hover:text-ink-muted',
props.isFocused ? 'hover:bg-surface' : 'hover:bg-active'
)}
>
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
diff --git a/apps/web/src/features/email-message/views/message-operation-recovery.tsx b/apps/web/src/features/email-message/views/message-operation-recovery.tsx
index a6f949b25f..2d1e7ff944 100644
--- a/apps/web/src/features/email-message/views/message-operation-recovery.tsx
+++ b/apps/web/src/features/email-message/views/message-operation-recovery.tsx
@@ -76,7 +76,11 @@ export function MessageOperationRecovery(props: {
editing.
</p>
<Show when={props.onReloadDraft}>
- <Button size="sm" variant="outline" onClick={props.onReloadDraft}>
+ <Button
+ size="sm"
+ variant="secondary"
+ onClick={props.onReloadDraft}
+ >
Reload draft
</Button>
</Show>
@@ -123,7 +127,7 @@ export function MessageOperationRecovery(props: {
<div class="flex gap-2">
<Button
size="sm"
- variant="strong"
+ variant="secondary"
disabled={
pending() ||
((decision()?.action === 'retry_send' ||
@@ -159,7 +163,7 @@ export function MessageOperationRecovery(props: {
{(action) => (
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={pending()}
onClick={() => {
if (
diff --git a/apps/web/src/features/email-thread/calendar-invitation.test.tsx b/apps/web/src/features/email-thread/calendar-invitation.test.tsx
index 3b0ac22ac5..d0e73c221d 100644
--- a/apps/web/src/features/email-thread/calendar-invitation.test.tsx
+++ b/apps/web/src/features/email-thread/calendar-invitation.test.tsx
@@ -307,9 +307,7 @@ it('leaves before opening the calendar so a dialog around the card can close fir
onNavigate={() => order.push('leave')}
/>
));
- // The mocked Button forwards `label` as an attribute, not an accessible name.
- const open = document.querySelector('button[label="Open in calendar"]');
- if (!open) throw new Error('Open in calendar is missing');
+ const open = screen.getByRole('button', { name: 'Open in calendar' });
fireEvent.click(open);
expect(order).toEqual(['leave', 'open event']);
});
@@ -327,8 +325,7 @@ it('asks for a new split when Open in calendar is shift-clicked', () => {
openCalendar={(target) => opened.push(target.openInNewSplit)}
/>
));
- const open = document.querySelector('button[label="Open in calendar"]');
- if (!open) throw new Error('Open in calendar is missing');
+ const open = screen.getByRole('button', { name: 'Open in calendar' });
fireEvent.click(open);
fireEvent.click(open, { shiftKey: true });
expect(opened).toEqual([false, true]);
diff --git a/apps/web/src/features/email-thread/components/copy-subject-button.tsx b/apps/web/src/features/email-thread/components/copy-subject-button.tsx
index a3b3fc85f6..26912cd170 100644
--- a/apps/web/src/features/email-thread/components/copy-subject-button.tsx
+++ b/apps/web/src/features/email-thread/components/copy-subject-button.tsx
@@ -27,7 +27,6 @@ export function CopySubjectButton(props: {
<CopyButton
variant="ghost"
size="icon-sm"
- noTouchResize
aria-label="Copy subject"
class={cn('align-middle text-inherit', props.class)}
onClick={handleCopy}
diff --git a/apps/web/src/features/email-thread/views/bottom-reply-buttons.tsx b/apps/web/src/features/email-thread/views/bottom-reply-buttons.tsx
index 926d845ee9..9f2ea6a85f 100644
--- a/apps/web/src/features/email-thread/views/bottom-reply-buttons.tsx
+++ b/apps/web/src/features/email-thread/views/bottom-reply-buttons.tsx
@@ -25,13 +25,9 @@ function ReplyActionButton(props: {
disabled?: boolean;
onClick: () => void;
}) {
- const viewContext = useEmailThreadViewContext();
return (
<Button
- // Button owns its Layer; floating actions use the dock's chrome depth.
- depth={viewContext.thread.isTouch() ? 3 : undefined}
- variant="outline"
- glass={false}
+ variant="secondary"
aria-label={props.ariaLabel}
disabled={props.disabled}
class={cn(
diff --git a/apps/web/src/features/email-thread/views/email-participants.tsx b/apps/web/src/features/email-thread/views/email-participants.tsx
index 54b5826c8b..d5e16075b6 100644
--- a/apps/web/src/features/email-thread/views/email-participants.tsx
+++ b/apps/web/src/features/email-thread/views/email-participants.tsx
@@ -118,9 +118,8 @@ export function EmailParticipants() {
</Key>
<Show when={hiddenCount() > 0}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- noTouchResize
onClick={() => setExpanded((v) => !v)}
class={badgeTriggerClasses({
variant: 'outline',
diff --git a/apps/web/src/features/email-view/components/EmailControls.tsx b/apps/web/src/features/email-view/components/EmailControls.tsx
index 15fbdee9fe..4de2ef2105 100644
--- a/apps/web/src/features/email-view/components/EmailControls.tsx
+++ b/apps/web/src/features/email-view/components/EmailControls.tsx
@@ -3,7 +3,7 @@ import { HeaderActionGroup } from '@components/app/HeaderActionGroup';
import { TOKENS } from '@core/hotkey/tokens';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import ColumnsIcon from '@icon/system/regular/columns.svg';
-import { Button } from '@ui';
+import { ButtonGroup } from '@ui';
import { Show } from 'solid-js';
import { useEmailView } from '../email-view-context';
import { useEmailFilters } from '../filters/use-email-filters';
@@ -22,10 +22,12 @@ export function EmailControls(props: EmailControlsProps) {
return (
<>
<div class="contents @max-[640px]/split-header:hidden">
- <HeaderActionGroup label="Email filters">
- <EmailInboxMenu />
- <div class="relative shrink-0">
+ <HeaderActionGroup label="Email filters" size="md">
+ <EmailInboxMenu grouped />
+ <div class="relative flex shrink-0 items-center">
<ListFilterDropdown
+ grouped
+ size="icon-md"
label="Filter email"
open={props.filterOpen}
onOpenChange={props.onFilterOpenChange}
@@ -43,19 +45,26 @@ export function EmailControls(props: EmailControlsProps) {
</div>
</HeaderActionGroup>
</div>
- <HeaderActionGroup label="Email view options">
+ <HeaderActionGroup label="Email view options" size="md">
<Show when={!isTouchDevice()}>
- <Button
+ <ButtonGroup.Button
+ aria-label={
+ readingPane() ? 'Hide reading pane' : 'Show reading pane'
+ }
+ tooltip={{
+ content: readingPane()
+ ? 'Hide reading pane'
+ : 'Show reading pane',
+ hotkey: TOKENS.email.toggleReadingPane,
+ }}
variant="ghost"
size="icon-md"
- label={readingPane() ? 'Hide reading pane' : 'Show reading pane'}
- hotkey={TOKENS.email.toggleReadingPane}
aria-pressed={readingPane()}
class={readingPane() ? 'text-ink' : 'text-ink-muted'}
onClick={() => setReadingPane(!readingPane())}
>
<ColumnsIcon class="size-4" />
- </Button>
+ </ButtonGroup.Button>
</Show>
</HeaderActionGroup>
</>
diff --git a/apps/web/src/features/email-view/components/EmailDetailView.tsx b/apps/web/src/features/email-view/components/EmailDetailView.tsx
index ccb44731a3..4bf8578809 100644
--- a/apps/web/src/features/email-view/components/EmailDetailView.tsx
+++ b/apps/web/src/features/email-view/components/EmailDetailView.tsx
@@ -247,7 +247,7 @@ export function EmailDetailView(props: {
{/* The subject sits atop the thread, so the header only goes
back; the reading pane already shows the list beside it. */}
<Show when={!pane}>
- <Button size="icon-md" label="Back" onClick={closeThread}>
+ <Button size="icon-md" aria-label="Back" onClick={closeThread}>
<ArrowLeftIcon />
</Button>
</Show>
@@ -257,6 +257,7 @@ export function EmailDetailView(props: {
share={
<Show when={ENABLE_EMAIL_SHARING}>
<ShareTrigger
+ size="md"
onClick={openShare}
id={props.thread.id}
blockType="email"
diff --git a/apps/web/src/features/email-view/components/EmailHeader.tsx b/apps/web/src/features/email-view/components/EmailHeader.tsx
index db7391a5f9..65ac825b15 100644
--- a/apps/web/src/features/email-view/components/EmailHeader.tsx
+++ b/apps/web/src/features/email-view/components/EmailHeader.tsx
@@ -148,6 +148,7 @@ export function EmailHeader(props: EmailHeaderProps) {
<Tabs
ref={tourTarget(EMAIL_TOUR.signalNoise)}
aria-label="Inbox view"
+ size="md"
class="shrink-0"
options={[
{ value: 'important', label: EMAIL_TAB_LABELS.important },
diff --git a/apps/web/src/features/email-view/components/EmailInboxSelector.tsx b/apps/web/src/features/email-view/components/EmailInboxSelector.tsx
index 3ceb51d3a9..eb9c29505a 100644
--- a/apps/web/src/features/email-view/components/EmailInboxSelector.tsx
+++ b/apps/web/src/features/email-view/components/EmailInboxSelector.tsx
@@ -11,7 +11,14 @@ import CheckIcon from '@icon/system/regular/check.svg';
import PlusIcon from '@icon/system/regular/plus.svg';
import TrayIcon from '@icon/system/regular/tray.svg';
import { useMailAccountsQuery } from '@queries/email/mail-accounts';
-import { AvatarGroup, Button, cn, Dropdown, pressHandlers } from '@ui';
+import {
+ AvatarGroup,
+ Button,
+ ButtonGroup,
+ cn,
+ Dropdown,
+ pressHandlers,
+} from '@ui';
import { createMemo, For, type JSX, Show } from 'solid-js';
import { fromInboxOptions } from '../../email-compose/core/email-sender';
import { useEmailView } from '../email-view-context';
@@ -385,7 +392,7 @@ export function EmailInboxFilter(props: { class?: string }) {
* Icon-only trigger the narrow header falls back to while the sidebar is
* collapsed; opens the same single-select list as a menu.
*/
-export function EmailInboxMenu(props: { class?: string }) {
+export function EmailInboxMenu(props: { class?: string; grouped?: boolean }) {
const selection = useInboxSelection();
const radioValue = () => {
@@ -402,19 +409,24 @@ export function EmailInboxMenu(props: { class?: string }) {
<Show when={selection.hasMultipleInboxes()}>
<Dropdown placement="bottom-end">
<Dropdown.Trigger
+ as={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
size="icon-md"
- depth={2}
aria-label={`Inbox: ${selection.label()}`}
tooltip={selection.label()}
class={cn('shrink-0', props.class)}
>
- <Show
- when={selection.selectedOption()}
- fallback={<AllInboxesAvatar options={selection.options()} />}
+ <span
+ aria-hidden="true"
+ class="inline-flex size-4 shrink-0 items-center justify-center"
>
- {(option) => <InboxAvatar option={option()} size="sm" />}
- </Show>
+ <Show
+ when={selection.selectedOption()}
+ fallback={<AllInboxesAvatar options={selection.options()} />}
+ >
+ {(option) => <InboxAvatar option={option()} size="sm" />}
+ </Show>
+ </span>
</Dropdown.Trigger>
<Dropdown.Content class="min-w-56">
<Dropdown.Group>
diff --git a/apps/web/src/features/email-view/components/EmailList.tsx b/apps/web/src/features/email-view/components/EmailList.tsx
index 9139e4c85c..c0de3e906b 100644
--- a/apps/web/src/features/email-view/components/EmailList.tsx
+++ b/apps/web/src/features/email-view/components/EmailList.tsx
@@ -675,7 +675,7 @@ export function EmailList(props: EmailListProps) {
>
<span>Email couldn’t be loaded.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(source.refresh(), 'email-view')
@@ -911,9 +911,8 @@ export function EmailList(props: EmailListProps) {
}
>
<Button
- variant="outline"
- size="sm"
- depth={2}
+ variant="secondary"
+ size="xs"
disabled={loadMore().isLoading}
class="bg-surface"
>
diff --git a/apps/web/src/features/email-view/components/EmailRowActions.tsx b/apps/web/src/features/email-view/components/EmailRowActions.tsx
index fa360408d7..fb3f94ace2 100644
--- a/apps/web/src/features/email-view/components/EmailRowActions.tsx
+++ b/apps/web/src/features/email-view/components/EmailRowActions.tsx
@@ -46,12 +46,14 @@ export function EmailStarAction(props: {
)}
>
<Button
+ aria-label={props.starred ? 'Unstar email' : 'Star email'}
variant="ghost"
size="icon-sm"
- label={props.starred ? 'Unstar email' : 'Star email'}
class={props.starred ? 'text-ink-muted' : 'text-ink-extra-muted'}
- tooltip={props.starred ? 'Remove from favorites' : 'Add to favorites'}
- hotkey={TOKENS.email.star}
+ tooltip={{
+ content: props.starred ? 'Remove from favorites' : 'Add to favorites',
+ hotkey: TOKENS.email.star,
+ }}
aria-pressed={props.starred}
disabled={props.pending}
onClick={props.onStar}
@@ -75,14 +77,15 @@ export function EmailRowActions(props: {
return (
<EmailActionGroup onFocus={props.onFocus}>
<Button
+ aria-label={props.archived ? 'Unarchive email' : 'Archive email'}
+ tooltip={{
+ content: props.archived ? 'Unarchive email' : 'Archive email',
+ hotkey: props.archived
+ ? TOKENS.entity.action.markNotDone
+ : TOKENS.entity.action.markDone,
+ }}
variant="ghost"
size="icon-sm"
- label={props.archived ? 'Unarchive email' : 'Archive email'}
- hotkey={
- props.archived
- ? TOKENS.entity.action.markNotDone
- : TOKENS.entity.action.markDone
- }
class="text-ink-extra-muted"
disabled={!props.canArchive || props.pending}
onClick={props.onArchive}
@@ -92,10 +95,13 @@ export function EmailRowActions(props: {
</Show>
</Button>
<Button
+ aria-label="Open command menu"
+ tooltip={{
+ content: 'Open command menu',
+ hotkey: TOKENS.global.commandMenu,
+ }}
variant="ghost"
size="icon-sm"
- label="Open command menu"
- hotkey={TOKENS.global.commandMenu}
class="text-ink-extra-muted"
onClick={props.onCommands}
>
diff --git a/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx b/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx
index 7e1d12d3fc..080b36b6c4 100644
--- a/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx
+++ b/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx
@@ -29,7 +29,7 @@ export const EntitySelectionToolbarModal = (
variant="ghost"
onClick={props.onClose}
>
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<span class="text-ink font-normal flex-1 whitespace-nowrap">
{t('entityActions.selectedCount', {
@@ -40,9 +40,8 @@ export const EntitySelectionToolbarModal = (
<Show when={props.onAction}>
<Button
onClick={props.onAction}
- variant="outline"
+ variant="secondary"
class="p-1 pl-2 bg-surface"
- depth={3}
>
<span>{t('entityActions.actions')}</span>
<Hotkey token={TOKENS.global.commandMenu} theme="subtle" />
@@ -51,9 +50,8 @@ export const EntitySelectionToolbarModal = (
{props.children}
<Button
onClick={props.onClose}
- variant="outline"
+ variant="secondary"
class="p-1 pl-2 bg-surface"
- depth={3}
>
<span>{t('entityActions.clear')}</span>
<Hotkey shortcut="escape" theme="subtle" />
diff --git a/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx b/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx
index d892cfe06d..3cac5c4b37 100644
--- a/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx
+++ b/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx
@@ -84,7 +84,7 @@ export const BulkDeleteView = (props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
onClick={() => fireAndForget(handleDelete(), 'bulk-delete')}
>
{multi() ? `Delete ${entities().length} items` : 'Delete item'}
diff --git a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx
index 6f15c55047..7552745769 100644
--- a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx
+++ b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx
@@ -602,7 +602,7 @@ export const BulkMoveToProjectView = (props: {
/>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
class="shrink-0"
disabled={!newFolderName().trim() || isSavingFolder()}
onClick={submitNewFolder}
@@ -616,7 +616,7 @@ export const BulkMoveToProjectView = (props: {
tooltip="Cancel"
onClick={cancelCreatingFolder}
>
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
@@ -629,7 +629,7 @@ export const BulkMoveToProjectView = (props: {
</Button>
<Button
type="button"
- variant="strong"
+ variant="secondary"
onClick={() => fireAndForget(finishEditing(), 'bulk-move-to-project')}
disabled={!selectedProject()}
>
diff --git a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
index ff7875dbab..913dde47da 100644
--- a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
+++ b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
@@ -156,7 +156,7 @@ export const BulkRenameEntitiesView = (props: {
<Button type="button" variant="ghost" onClick={props.onCancel}>
Cancel
</Button>
- <Button type="submit" variant="strong">
+ <Button type="submit" variant="secondary">
{multi()
? `Rename ${props.entities.length} ${props.entities.length === 1 ? 'item' : 'items'}`
: 'Save name'}
diff --git a/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx b/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx
index b140a29f09..4345df7f50 100644
--- a/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx
+++ b/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx
@@ -38,6 +38,7 @@ export function EntityActionSelection(props: {
</For>
<Show when={props.entities.length > 2}>
<Button
+ variant="ghost"
type="button"
size="sm"
disabled={props.disabled}
diff --git a/apps/web/src/features/entity/components/PrAgentSessionsChip.tsx b/apps/web/src/features/entity/components/PrAgentSessionsChip.tsx
index b92f4dc200..56897e098f 100644
--- a/apps/web/src/features/entity/components/PrAgentSessionsChip.tsx
+++ b/apps/web/src/features/entity/components/PrAgentSessionsChip.tsx
@@ -22,12 +22,12 @@ export function PrAgentSessionChip(props: {
}) {
return (
<Button
+ aria-label={`Open agent session: ${props.label}`}
+ tooltip={`Open agent session: ${props.label}`}
variant="ghost"
size="xs"
- noTouchResize
class={cn(rowPillTriggerClasses('max-w-48'), props.class)}
title={props.label}
- label={`Open agent session: ${props.label}`}
disabled={props.disabled}
onClick={(event) => {
event.stopPropagation();
@@ -54,12 +54,12 @@ export function PrAgentSessionsCountChip(
return (
<Dropdown open={props.open} onOpenChange={props.onOpenChange}>
<Dropdown.Trigger
+ aria-label={`Show ${label()}`}
+ tooltip={`Show ${label()}`}
variant="ghost"
size="xs"
- noTouchResize
class={cn(rowPillTriggerClasses('max-w-48'), props.class)}
title={label()}
- label={`Show ${label()}`}
onClick={(event: MouseEvent) => event.stopPropagation()}
onKeyDown={(event: KeyboardEvent) => {
if (event.key === 'Enter' || event.key === ' ')
diff --git a/apps/web/src/features/entity/composed/list-entity/channel.tsx b/apps/web/src/features/entity/composed/list-entity/channel.tsx
index 0a87e88aa2..a1da48e4cb 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 (
<Button
type="button"
- variant="accent"
+ variant="primary"
size="sm"
class={props.class ?? 'shrink-0'}
disabled={joinMutation.isPending}
diff --git a/apps/web/src/features/entity/composed/list-entity/foreign.tsx b/apps/web/src/features/entity/composed/list-entity/foreign.tsx
index 944f40629d..077786e5c9 100644
--- a/apps/web/src/features/entity/composed/list-entity/foreign.tsx
+++ b/apps/web/src/features/entity/composed/list-entity/foreign.tsx
@@ -209,6 +209,7 @@ function checkDurationText(
function CheckStateIcon(props: {
state: CheckVisualState;
circle?: boolean;
+ size?: 'md';
class?: string;
}) {
return (
@@ -221,14 +222,41 @@ function CheckStateIcon(props: {
<Show when={props.state === 'success'}>
<Show
when={props.circle}
- fallback={<Check class="size-3 text-success" />}
+ fallback={
+ <Check
+ class={cn(
+ props.size === 'md' ? 'size-4' : 'size-3',
+ 'text-success'
+ )}
+ />
+ }
>
- <CheckCircle class="size-5 text-success" />
+ <CheckCircle
+ class={cn(
+ props.size === 'md' ? 'size-4' : 'size-5',
+ 'text-success'
+ )}
+ />
</Show>
</Show>
<Show when={props.state === 'failure'}>
- <Show when={props.circle} fallback={<X class="size-3 text-failure" />}>
- <XCircle class="size-5 text-failure" />
+ <Show
+ when={props.circle}
+ fallback={
+ <X
+ class={cn(
+ props.size === 'md' ? 'size-4' : 'size-3',
+ 'text-failure'
+ )}
+ />
+ }
+ >
+ <XCircle
+ class={cn(
+ props.size === 'md' ? 'size-4' : 'size-5',
+ 'text-failure'
+ )}
+ />
</Show>
</Show>
<Show when={props.state === 'pending'}>
@@ -254,7 +282,12 @@ function CheckStateIcon(props: {
</div>
</Show>
<Show when={props.state === 'skipped'}>
- <MinusCircle class="size-5 text-ink-extra-muted/50" />
+ <MinusCircle
+ class={cn(
+ props.size === 'md' ? 'size-4' : 'size-5',
+ 'text-ink-extra-muted/50'
+ )}
+ />
</Show>
<Show when={props.state === 'none'}>
<div class="relative size-4 inline-flex items-center justify-center">
@@ -282,7 +315,8 @@ function GithubPullRequestChecksPopover(props: {
<div class="flex items-start gap-2 py-2 pl-4 border-b border-b-edge">
<CheckStateIcon
state={checkState(props.entity)}
- class="mt-1 [&_svg]:size-4"
+ size="md"
+ class="mt-1"
/>
<div class="flex min-w-0 flex-col">
<div
@@ -391,11 +425,10 @@ export function GithubPullRequestChecksIndicator(props: {
type="button"
variant="ghost"
size="icon-sm"
- noTouchResize={true}
- class="[&_:where(svg)]:size-4 shrink-0"
+ class="shrink-0"
onClick={(event) => event.stopPropagation()}
>
- <CheckStateIcon state={checkState(props.entity)} />
+ <CheckStateIcon state={checkState(props.entity)} size="md" />
</Popover.Trigger>
<Popover.Portal>
<Popover.Content
diff --git a/apps/web/src/features/entity/extractors-notification/notification-content.tsx b/apps/web/src/features/entity/extractors-notification/notification-content.tsx
index c0ffb6d93c..62741f3bcf 100644
--- a/apps/web/src/features/entity/extractors-notification/notification-content.tsx
+++ b/apps/web/src/features/entity/extractors-notification/notification-content.tsx
@@ -72,6 +72,7 @@ export function DocumentMentionPill(props: {
<EntityIcon targetType={targetType()} size="xs" />
<span class="truncate min-w-0">{documentName()}</span>
<Button
+ variant="ghost"
class="absolute -top-1.5 -right-1.5 size-5 bg-surface border border-edge-muted/50 p-0 place-items-center hidden group-hover:grid hover:bg-accent! hover:text-surface!"
tooltip="Mark as done"
onClick={(e) => {
diff --git a/apps/web/src/features/entity/extractors-notification/notification-row.tsx b/apps/web/src/features/entity/extractors-notification/notification-row.tsx
index ec97b62400..bd92d00e91 100644
--- a/apps/web/src/features/entity/extractors-notification/notification-row.tsx
+++ b/apps/web/src/features/entity/extractors-notification/notification-row.tsx
@@ -193,6 +193,7 @@ function HeaderTrailing(props: {
</span>
<Show when={props.canMarkDone}>
<Button
+ variant="ghost"
onClick={(e) => {
e.stopPropagation();
props.onMarkAsDone();
diff --git a/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx b/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx
index fc80a5b790..d7a899acfa 100644
--- a/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx
+++ b/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx
@@ -153,7 +153,9 @@ export function NotificationStackRow(props: {
</span>
<Show when={canMarkDone()}>
<Button
+ variant="ghost"
onClick={handleMarkAsDone}
+ aria-label={t('entityActions.markDone')}
tooltip={t('entityActions.markDoneCommand')}
class="text-ink-muted hover:text-accent hover:bg-accent/10 hidden group-hover/notif:grid p-0 place-items-center size-5"
>
diff --git a/apps/web/src/features/external-chat/components/chat-details.tsx b/apps/web/src/features/external-chat/components/chat-details.tsx
index a7c624a649..abcdfda49f 100644
--- a/apps/web/src/features/external-chat/components/chat-details.tsx
+++ b/apps/web/src/features/external-chat/components/chat-details.tsx
@@ -167,7 +167,7 @@ export function ChatDetails(props: {
? 'Only its owner can reply.'
: `Only ${label()} members can send.`}
</p>
- <Button variant="outline" size="sm" onClick={() => props.onShare()}>
+ <Button variant="secondary" size="sm" onClick={() => props.onShare()}>
Share…
</Button>
</div>
diff --git a/apps/web/src/features/external-chat/views/external-chat-view.test.tsx b/apps/web/src/features/external-chat/views/external-chat-view.test.tsx
index 91fe4e7c19..1675aa5c66 100644
--- a/apps/web/src/features/external-chat/views/external-chat-view.test.tsx
+++ b/apps/web/src/features/external-chat/views/external-chat-view.test.tsx
@@ -699,7 +699,7 @@ it('opens members, sharing and syncing in the side panel', async () => {
});
const { share } = mount(fake);
expect(screen.queryByRole('list', { name: 'WhatsApp members' })).toBeNull();
- fireEvent.click(screen.getByRole('button', { name: /side panel/i }));
+ fireEvent.click(screen.getByRole('button', { name: 'Show details' }));
const members = await screen.findByRole('list', {
name: 'WhatsApp members',
@@ -734,7 +734,7 @@ it('lets the owner stop syncing a direct chat from its details', async () => {
chat: { ...chat, kind: 'direct', name: 'Ana Ruiz', members: [] },
});
mount(fake);
- fireEvent.click(screen.getByRole('button', { name: /side panel/i }));
+ fireEvent.click(screen.getByRole('button', { name: 'Show details' }));
expect(
await screen.findByRole('button', { name: 'Stop syncing' })
).toBeTruthy();
@@ -747,7 +747,7 @@ it('keeps syncing controls from a shared viewer', async () => {
chat: { ...chat, accessLevel: 'view', canSend: false },
});
mount(fake);
- fireEvent.click(screen.getByRole('button', { name: /side panel/i }));
+ fireEvent.click(screen.getByRole('button', { name: 'Show details' }));
expect(await screen.findByRole('button', { name: 'Share…' })).toBeTruthy();
expect(screen.queryByRole('button', { name: 'Stop syncing' })).toBeNull();
});
diff --git a/apps/web/src/features/external-chat/views/external-chat-view.tsx b/apps/web/src/features/external-chat/views/external-chat-view.tsx
index f212d42bd3..09ce549eae 100644
--- a/apps/web/src/features/external-chat/views/external-chat-view.tsx
+++ b/apps/web/src/features/external-chat/views/external-chat-view.tsx
@@ -602,7 +602,7 @@ export function ExternalChatView(props: {
from its owner.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() => {
source.chat.refetch();
@@ -847,7 +847,7 @@ export function ExternalChatView(props: {
}
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={props.onConnect}
>
diff --git a/apps/web/src/features/gtm-invite/InviteLinksPortal.tsx b/apps/web/src/features/gtm-invite/InviteLinksPortal.tsx
index c17ce34567..51399f89bc 100644
--- a/apps/web/src/features/gtm-invite/InviteLinksPortal.tsx
+++ b/apps/web/src/features/gtm-invite/InviteLinksPortal.tsx
@@ -76,7 +76,7 @@ export function InviteLinksPortal() {
body="This page is for Macro staff."
action={
<Button
- variant="cta"
+ variant="primary"
size="lg"
onClick={() =>
navigate(
@@ -286,7 +286,12 @@ function CreateLinkForm(props: { onCreated: (link: GtmInviteLink) => void }) {
/>
</div>
<div class="flex items-center justify-end gap-3">
- <Button variant="cta" size="lg" type="submit" disabled={!canSubmit()}>
+ <Button
+ variant="primary"
+ size="lg"
+ type="submit"
+ disabled={!canSubmit()}
+ >
<LinkIcon class="size-4" />
{create.isPending ? 'Creating…' : 'Create link'}
</Button>
@@ -315,7 +320,11 @@ function LatestLinkCard(props: { link: GtmInviteLink }) {
{formatFreeMonths(props.link.freeMonths)} · expires in{' '}
{formatTimeLeft(props.link.expiresAt).replace(' left', '')}
</span>
- <Button variant="strong" size="sm" onClick={() => copyLink(props.link)}>
+ <Button
+ variant="secondary"
+ size="sm"
+ onClick={() => copyLink(props.link)}
+ >
<CopyIcon class="size-4" />
Copy link
</Button>
diff --git a/apps/web/src/features/gtm-invite/InviteOfferPanel.tsx b/apps/web/src/features/gtm-invite/InviteOfferPanel.tsx
index 240a96d7b8..0dd955dd6d 100644
--- a/apps/web/src/features/gtm-invite/InviteOfferPanel.tsx
+++ b/apps/web/src/features/gtm-invite/InviteOfferPanel.tsx
@@ -81,7 +81,7 @@ export function InviteOfferPanel(props: {
<div class="flex flex-col gap-3">
<Button
- variant="cta"
+ variant="primary"
size="xl"
disabled={props.finishing}
onClick={() => props.onStartCheckout()}
diff --git a/apps/web/src/features/gtm-invite/InviteWelcome.tsx b/apps/web/src/features/gtm-invite/InviteWelcome.tsx
index 46d4891f3b..92e442e11b 100644
--- a/apps/web/src/features/gtm-invite/InviteWelcome.tsx
+++ b/apps/web/src/features/gtm-invite/InviteWelcome.tsx
@@ -164,7 +164,7 @@ export function InviteWelcome() {
</div>
<div class="flex flex-col gap-3">
<Button
- variant="cta"
+ variant="primary"
size="xl"
disabled={redeem.isPending}
onClick={onContinue}
@@ -239,7 +239,11 @@ function UnavailableInvite(props: { title: string; body: string }) {
</p>
</div>
<div class="flex gap-3">
- <Button variant="outline" size="lg" onClick={() => navigate('/login')}>
+ <Button
+ variant="secondary"
+ size="lg"
+ onClick={() => navigate('/login')}
+ >
Log in
</Button>
</div>
diff --git a/apps/web/src/features/home/components/HomeFilters.tsx b/apps/web/src/features/home/components/HomeFilters.tsx
index ce9d2bbd34..e9a5d15abf 100644
--- a/apps/web/src/features/home/components/HomeFilters.tsx
+++ b/apps/web/src/features/home/components/HomeFilters.tsx
@@ -218,13 +218,13 @@ export function HomeFilterDropdown() {
label="Filter Home"
customTrigger={
<Dropdown.Trigger
+ aria-label="Filter Home"
+ tooltip="Filter Home"
ref={tourTarget(HOME_TOUR.filter)}
variant="ghost"
- size="icon-sm"
- class="size-(--sidebar-control-size)"
- label="Filter Home"
+ size="icon-xs"
>
- <FilterIcon class="size-4" />
+ <FilterIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
}
groups={HOME_FILTER_GROUPS}
diff --git a/apps/web/src/features/home/components/HomeList.tsx b/apps/web/src/features/home/components/HomeList.tsx
index 878a03f447..20de3cd3ea 100644
--- a/apps/web/src/features/home/components/HomeList.tsx
+++ b/apps/web/src/features/home/components/HomeList.tsx
@@ -587,7 +587,7 @@ export function HomeList(props: HomeListProps) {
>
<span>Home couldn’t be loaded.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() => fireAndForget(source.refresh(), 'home')}
>
diff --git a/apps/web/src/features/home/home-section-boundary.tsx b/apps/web/src/features/home/home-section-boundary.tsx
index 293b4fffaa..c662e04801 100644
--- a/apps/web/src/features/home/home-section-boundary.tsx
+++ b/apps/web/src/features/home/home-section-boundary.tsx
@@ -45,9 +45,8 @@ function HomeSectionError(props: HomeSectionErrorProps) {
<div class="mt-2 flex gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={2}
class="w-fit bg-surface"
onClick={props.reset}
>
diff --git a/apps/web/src/features/inbox/AdminConsentRequiredDialog.tsx b/apps/web/src/features/inbox/AdminConsentRequiredDialog.tsx
index 2f369015b1..32603400fa 100644
--- a/apps/web/src/features/inbox/AdminConsentRequiredDialog.tsx
+++ b/apps/web/src/features/inbox/AdminConsentRequiredDialog.tsx
@@ -58,14 +58,12 @@ export function AdminConsentRequiredDialog(props: {
<div class="pt-3 flex flex-col-reverse sm:flex-row sm:justify-end sm:items-center gap-3">
<Button
variant="ghost"
- depth={3}
onClick={() => props.onConnectDifferentAccount()}
>
Connect a different account
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="secondary"
disabled={props.adminConsentUrl === undefined}
onClick={() => fireAndForget(copyApprovalLink(), 'inbox-link')}
>
diff --git a/apps/web/src/features/inbox/ShareInboxConflictDialog.tsx b/apps/web/src/features/inbox/ShareInboxConflictDialog.tsx
index b52149f659..6edd2386ed 100644
--- a/apps/web/src/features/inbox/ShareInboxConflictDialog.tsx
+++ b/apps/web/src/features/inbox/ShareInboxConflictDialog.tsx
@@ -38,10 +38,10 @@ 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="ghost" depth={3} onClick={() => props.onCancel()}>
+ <Button variant="ghost" onClick={() => props.onCancel()}>
Cancel
</Button>
- <Button variant="strong" depth={3} onClick={() => props.onShare()}>
+ <Button variant="secondary" 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.tsx
index 371f9aa74a..11b4323a49 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="outline"
+ variant="secondary"
onClick={() => {
setFileName('');
setParseError('');
@@ -345,7 +345,7 @@ export default function ImportLinear() {
</div>
<div class="border-t border-edge p-4 flex items-center gap-3 shrink-0">
- <Button onClick={runImport} disabled={!canImport()}>
+ <Button variant="primary" onClick={runImport} disabled={!canImport()}>
Import tasks
</Button>
<Show when={runningProgress()}>
diff --git a/apps/web/src/features/local-runtime/browser-test/fixture.tsx b/apps/web/src/features/local-runtime/browser-test/fixture.tsx
index ac6ae175aa..38384ed115 100644
--- a/apps/web/src/features/local-runtime/browser-test/fixture.tsx
+++ b/apps/web/src/features/local-runtime/browser-test/fixture.tsx
@@ -92,7 +92,7 @@ function Fixture() {
const [action, setAction] = createSignal('');
return (
<main class="min-h-screen bg-panel p-6">
- <Button type="button" variant="outline" onClick={() => setOpen(true)}>
+ <Button type="button" variant="secondary" onClick={() => setOpen(true)}>
Open setup
</Button>
<p role="status" aria-label="Preview action" class="mt-3 text-sm">
diff --git a/apps/web/src/features/local-runtime/views/local-runtime-setup-dialog.tsx b/apps/web/src/features/local-runtime/views/local-runtime-setup-dialog.tsx
index 3eeb22b44c..51682457a1 100644
--- a/apps/web/src/features/local-runtime/views/local-runtime-setup-dialog.tsx
+++ b/apps/web/src/features/local-runtime/views/local-runtime-setup-dialog.tsx
@@ -30,7 +30,7 @@ export function LocalRuntimeSetupDialog(props: {
<Button
variant="ghost"
size="icon-sm"
- label={t('localRuntime.close')}
+ tooltip={t('localRuntime.close')}
aria-label={t('localRuntime.close')}
onClick={() => props.onClose()}
>
diff --git a/apps/web/src/features/local-runtime/views/local-runtime-setup-panel.tsx b/apps/web/src/features/local-runtime/views/local-runtime-setup-panel.tsx
index 0ce8ec4b09..ae6a0c3de9 100644
--- a/apps/web/src/features/local-runtime/views/local-runtime-setup-panel.tsx
+++ b/apps/web/src/features/local-runtime/views/local-runtime-setup-panel.tsx
@@ -168,7 +168,7 @@ export function LocalRuntimeSetupPanel(props: {
<div class="flex items-center gap-2">
<Button
type="button"
- variant="cta"
+ variant="primary"
size="sm"
onClick={() => openSession(state().agent)}
>
@@ -208,7 +208,7 @@ export function LocalRuntimeSetupPanel(props: {
<p class="text-sm text-ink-muted">{t('localRuntime.noAgents')}</p>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
disabled={setup.scanning()}
onClick={() => fireAndForget(setup.scan(), 'local-runtime-setup')}
@@ -245,7 +245,7 @@ export function LocalRuntimeSetupPanel(props: {
<div>
<Button
type="button"
- variant="cta"
+ variant="primary"
size="sm"
disabled={!chosenAgent()}
onClick={start}
@@ -265,7 +265,7 @@ export function LocalRuntimeSetupPanel(props: {
<div>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(setup.run(choices()), 'local-runtime-setup')
diff --git a/apps/web/src/features/meetings/components/meeting-call-heading.tsx b/apps/web/src/features/meetings/components/meeting-call-heading.tsx
index 1a2f1d6e22..69aa034a2c 100644
--- a/apps/web/src/features/meetings/components/meeting-call-heading.tsx
+++ b/apps/web/src/features/meetings/components/meeting-call-heading.tsx
@@ -99,7 +99,11 @@ export function MeetingCallHeading(props: {
if (event.key === 'Escape' && !saving()) setEditing(false);
}}
/>
- <Button type="submit" disabled={saving() || !draft().trim()}>
+ <Button
+ variant="primary"
+ type="submit"
+ disabled={saving() || !draft().trim()}
+ >
{saving() ? 'Saving…' : 'Save'}
</Button>
<Button
diff --git a/apps/web/src/features/meetings/components/meeting-list.tsx b/apps/web/src/features/meetings/components/meeting-list.tsx
index a1fc45c2f5..403607d9d8 100644
--- a/apps/web/src/features/meetings/components/meeting-list.tsx
+++ b/apps/web/src/features/meetings/components/meeting-list.tsx
@@ -42,14 +42,14 @@ export function MeetingList(props: {
<div class="flex gap-2">
<Button
size="sm"
- variant="accent"
+ variant="primary"
onClick={() => props.onJoin(meeting)}
>
Join call
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
onClick={() => props.onCopy(meeting)}
>
Copy link
diff --git a/apps/web/src/features/meetings/manage-meetings-dialog.tsx b/apps/web/src/features/meetings/manage-meetings-dialog.tsx
index a1650be63d..916f5b8687 100644
--- a/apps/web/src/features/meetings/manage-meetings-dialog.tsx
+++ b/apps/web/src/features/meetings/manage-meetings-dialog.tsx
@@ -79,7 +79,7 @@ export function ManageMeetingsDialog(props: { onClose: () => void }) {
Could not load your call links.
</p>
<Button
- variant="outline"
+ variant="secondary"
onClick={() => fireAndForget(meetings.refetch(), 'meetings')}
>
Try again
@@ -107,7 +107,7 @@ export function ManageMeetingsDialog(props: { onClose: () => void }) {
</Switch>
</div>
<div class="flex justify-end pt-4">
- <Button variant="strong" onClick={props.onClose}>
+ <Button variant="secondary" onClick={props.onClose}>
Done
</Button>
</div>
diff --git a/apps/web/src/features/meetings/views/meeting-media-setup.tsx b/apps/web/src/features/meetings/views/meeting-media-setup.tsx
index cc5c834e96..d7e6820c49 100644
--- a/apps/web/src/features/meetings/views/meeting-media-setup.tsx
+++ b/apps/web/src/features/meetings/views/meeting-media-setup.tsx
@@ -127,14 +127,20 @@ export function MeetingMediaSetup(props: {
<div class="absolute inset-x-0 bottom-4 flex justify-center">
<div class="flex items-center gap-1 rounded-xl border border-edge-muted bg-panel p-1 shadow-sm">
<Button
- size="icon-lg"
- class="size-12"
- label={
+ variant="ghost"
+ aria-label={
media.microphoneEnabled()
? 'Turn off microphone'
: 'Turn on microphone'
}
- tooltipPlacement="top"
+ tooltip={{
+ content: media.microphoneEnabled()
+ ? 'Turn off microphone'
+ : 'Turn on microphone',
+ placement: 'top',
+ }}
+ size="icon-lg"
+ class="size-12"
disabled={props.disabled}
aria-pressed={media.microphoneEnabled()}
onClick={() =>
@@ -143,39 +149,56 @@ export function MeetingMediaSetup(props: {
>
<Show
when={media.microphoneEnabled()}
- fallback={<MicrophoneSlash />}
+ fallback={
+ <MicrophoneSlash class="size-5 touch:size-6 shrink-0 pointer-events-none" />
+ }
>
- <Microphone />
+ <Microphone class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
<Button
- size="icon-lg"
- class="size-12"
- label={
+ variant="ghost"
+ aria-label={
media.cameraEnabled() ? 'Turn off camera' : 'Turn on camera'
}
- tooltipPlacement="top"
+ tooltip={{
+ content: media.cameraEnabled()
+ ? 'Turn off camera'
+ : 'Turn on camera',
+ placement: 'top',
+ }}
+ size="icon-lg"
+ class="size-12"
disabled={props.disabled}
aria-pressed={media.cameraEnabled()}
onClick={() => media.setCameraEnabled(!media.cameraEnabled())}
>
<Show
when={media.cameraEnabled()}
- fallback={<VideoCameraSlash />}
+ fallback={
+ <VideoCameraSlash class="size-5 touch:size-6 shrink-0 pointer-events-none" />
+ }
>
- <VideoCamera />
+ <VideoCamera class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
<Button
- size="icon-lg"
- class="size-12"
- disabled={props.disabled || uploading()}
- label={
+ variant="ghost"
+ aria-label={
media.backgroundEffect().type === 'none'
? 'Turn on background'
: 'Turn off background'
}
- tooltipPlacement="top"
+ tooltip={{
+ content:
+ media.backgroundEffect().type === 'none'
+ ? 'Turn on background'
+ : 'Turn off background',
+ placement: 'top',
+ }}
+ size="icon-lg"
+ class="size-12"
+ disabled={props.disabled || uploading()}
aria-pressed={media.backgroundEffect().type !== 'none'}
onClick={() =>
selectBackground(
@@ -185,7 +208,7 @@ export function MeetingMediaSetup(props: {
)
}
>
- <Image />
+ <Image class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</div>
diff --git a/apps/web/src/features/mobile-onboarding/MobileAuthWelcome.tsx b/apps/web/src/features/mobile-onboarding/MobileAuthWelcome.tsx
index 6a71ca4cb2..1ed3b15e18 100644
--- a/apps/web/src/features/mobile-onboarding/MobileAuthWelcome.tsx
+++ b/apps/web/src/features/mobile-onboarding/MobileAuthWelcome.tsx
@@ -27,13 +27,14 @@ export function MobileAuthWelcome() {
</div>
<div class="flex flex-col gap-3 px-8 pb-8">
<Button
- variant="strong"
+ variant="secondary"
size="xl"
onClick={() => navigate('/onboarding')}
>
Create new account
</Button>
<Button
+ variant="secondary"
size="xl"
class="border border-edge-muted"
onClick={() => navigate('/login')}
diff --git a/apps/web/src/features/mobile-onboarding/MobileOnboarding.tsx b/apps/web/src/features/mobile-onboarding/MobileOnboarding.tsx
index 4178b2441b..a8c4ea5286 100644
--- a/apps/web/src/features/mobile-onboarding/MobileOnboarding.tsx
+++ b/apps/web/src/features/mobile-onboarding/MobileOnboarding.tsx
@@ -91,7 +91,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="strong"
+ variant="primary"
size="xl"
class="w-full"
onClick={onContinue}
diff --git a/apps/web/src/features/mobile-onboarding/OnboardingConnectAccounts.tsx b/apps/web/src/features/mobile-onboarding/OnboardingConnectAccounts.tsx
index dbc2f84ba9..91de504d07 100644
--- a/apps/web/src/features/mobile-onboarding/OnboardingConnectAccounts.tsx
+++ b/apps/web/src/features/mobile-onboarding/OnboardingConnectAccounts.tsx
@@ -78,7 +78,7 @@ export function OnboardingConnectAccounts() {
<div>
<div class="flex flex-col gap-2">
<Button
- variant="strong"
+ variant="secondary"
size="xl"
class="border border-edge-muted"
disabled={!isAuthenticated()}
@@ -96,7 +96,7 @@ export function OnboardingConnectAccounts() {
<div class="flex flex-col gap-2">
<Button
- variant="strong"
+ variant="secondary"
size="xl"
class="border border-edge-muted"
disabled={
diff --git a/apps/web/src/features/mobile-onboarding/OnboardingCreateAccount.tsx b/apps/web/src/features/mobile-onboarding/OnboardingCreateAccount.tsx
index efdbcf33a6..019725ebbf 100644
--- a/apps/web/src/features/mobile-onboarding/OnboardingCreateAccount.tsx
+++ b/apps/web/src/features/mobile-onboarding/OnboardingCreateAccount.tsx
@@ -32,7 +32,7 @@ export function OnboardingCreateAccount() {
<div class="flex flex-col gap-2 pt-2">
<Button
- variant="strong"
+ variant="secondary"
size="xl"
onClick={() => startSsoLogin(GOOGLE_GMAIL_IDP)}
>
diff --git a/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx b/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx
index c1d29f204f..f8657424bf 100644
--- a/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx
+++ b/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx
@@ -503,7 +503,7 @@ export default function DocumentWherePlayground() {
<For each={EXAMPLES}>
{(example) => (
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="h-auto justify-start py-1.5"
onClick={() => applyExample(example)}
@@ -594,11 +594,15 @@ export default function DocumentWherePlayground() {
</section>
<section class="flex gap-2">
- <Button variant="outline" size="sm" onClick={loadJsonFromControls}>
+ <Button
+ variant="secondary"
+ size="sm"
+ onClick={loadJsonFromControls}
+ >
Edit JSON
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={loading()}
onClick={() => run()}
@@ -654,7 +658,7 @@ export default function DocumentWherePlayground() {
</div>
<Show when={nextCursor()}>
<Button
- variant="outline"
+ variant="secondary"
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.tsx
index 35975473f0..e1b155e7ad 100644
--- a/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx
+++ b/apps/web/src/features/next-soup/soup-view/NewCallButton.tsx
@@ -105,7 +105,7 @@ export function NewCallButton(props: { presentation?: 'sidebar' | 'toolbar' }) {
<div class="flex flex-col text-ink">
<div class="shrink-0 flex flex-row items-center px-2 gap-1 border-b border-b-edge-muted h-10">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
New Call
@@ -123,7 +123,7 @@ export function NewCallButton(props: { presentation?: 'sidebar' | 'toolbar' }) {
/>
<div class="flex justify-end">
<Button
- variant="strong"
+ variant="primary"
size="sm"
disabled={isSubmitting()}
onClick={handleStartCall}
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/consolidated-filter-chip.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/consolidated-filter-chip.tsx
index 27941e960e..c9d26bf1ab 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/consolidated-filter-chip.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/consolidated-filter-chip.tsx
@@ -379,6 +379,7 @@ export const ConsolidatedFilterChip = (props: ConsolidatedFilterChipProps) => {
<ChipDivider mobile={props.mobile} />
<Button
+ variant="ghost"
class={cn(
'rounded-none h-full not-disabled:hover:text-failure',
props.mobile && 'bg-active border-none'
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx
index 39ac23414a..59bec80195 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/group-dropdown.tsx
@@ -3,10 +3,18 @@ import type {
GroupOptionId,
} from '@app/features/next-soup/soup-view/group-options';
import StackSimpleIcon from '@icon/system/regular/stack-simple.svg';
-import { type ButtonVariant, Dropdown, SingleSelectCheck, Tooltip } from '@ui';
+import {
+ Button,
+ ButtonGroup,
+ type ButtonVariant,
+ Dropdown,
+ SingleSelectCheck,
+ Tooltip,
+} from '@ui';
import { type Component, For, Show } from 'solid-js';
interface GroupDropdownProps {
+ grouped?: boolean;
value: () => GroupOptionId;
onChange: (value: GroupOptionId) => void;
options: GroupOption[];
@@ -17,6 +25,10 @@ interface GroupDropdownProps {
}
export const GroupDropdown: Component<GroupDropdownProps> = (props) => {
+ const triggerSize = () => {
+ if (!props.hideLabel) return 'sm';
+ return props.grouped ? 'icon-sm' : 'icon-md';
+ };
return (
<Dropdown
open={props.open}
@@ -25,12 +37,12 @@ export const GroupDropdown: Component<GroupDropdownProps> = (props) => {
>
<Tooltip label="Group">
<Dropdown.Trigger
- variant={props.variant ?? 'outline'}
- size={props.hideLabel ? 'icon-md' : 'sm'}
- depth={2}
+ as={props.grouped ? ButtonGroup.Button : Button}
+ variant={props.variant ?? 'secondary'}
+ size={triggerSize()}
aria-label={props.hideLabel ? 'Group' : undefined}
>
- <StackSimpleIcon />
+ <StackSimpleIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
<Show when={!props.hideLabel}>
<span>Group</span>
</Show>
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.tsx
index 68cfba542f..e2e1d0a65a 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
@@ -65,16 +65,15 @@ export function InboxSelector() {
>
<Combobox.Trigger
as={Button}
- variant="outline"
+ variant="secondary"
size="sm"
- depth={2}
aria-label={selectorProps.hideLabel ? label() : undefined}
class={cn(
'bg-surface gap-1',
selectorProps.hideLabel ? 'px-1' : 'max-w-50'
)}
>
- <TrayIcon />
+ <TrayIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
<Show when={!selectorProps.hideLabel}>
<span class="truncate">{label()}</span>
</Show>
@@ -85,9 +84,8 @@ export function InboxSelector() {
const ConnectAnotherAccount = (buttonProps: { hideLabel?: boolean }) => (
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={2}
aria-label={
buttonProps.hideLabel ? t('viewMenus.connectAnotherAccount') : undefined
}
@@ -97,7 +95,7 @@ export function InboxSelector() {
class={cn('bg-surface gap-1', buttonProps.hideLabel && 'px-1')}
onClick={() => addInbox()}
>
- <TrayIcon />
+ <TrayIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
<Show when={!buttonProps.hideLabel}>
<span class="truncate">{t('viewMenus.connectAnotherAccount')}</span>
</Show>
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/search/search-facet-chip.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/search/search-facet-chip.tsx
index 0f79857823..77765f94d7 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/search/search-facet-chip.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/search/search-facet-chip.tsx
@@ -218,6 +218,7 @@ export const SearchFacetChip = (props: SearchFacetChipProps) => (
<Show when={!props.facet.isDefault()}>
<ChipDivider />
<Button
+ variant="ghost"
class="rounded-none h-full not-disabled:hover:text-failure"
aria-label={`Clear ${props.facet.label} filter`}
size="icon-sm"
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/sort-dropdown.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/sort-dropdown.tsx
index 6daec496a7..916130bc8e 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/sort-dropdown.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/sort-dropdown.tsx
@@ -4,10 +4,11 @@ import type {
} from '@app/features/next-soup/soup-view/sort-options';
import { TOKENS } from '@core/hotkey/tokens';
import SortIcon from '@icon/system/regular/sort-ascending.svg';
-import { Dropdown, SingleSelectCheck } from '@ui';
+import { Button, ButtonGroup, Dropdown, SingleSelectCheck } from '@ui';
import { type Component, For, Show } from 'solid-js';
interface SortDropdownProps {
+ grouped?: boolean;
/** Current sort value */
value: () => SystemSortOption;
/** Handler for sort change */
@@ -30,12 +31,13 @@ export const SortDropdown: Component<SortDropdownProps> = (props) => {
placement="bottom-start"
>
<Dropdown.Trigger
+ aria-label="Sort"
+ tooltip={{ content: 'Sort', hotkey: TOKENS.soup.sort }}
+ as={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
- size="icon-md"
- label="Sort"
- hotkey={TOKENS.soup.sort}
+ size={props.grouped ? 'icon-sm' : 'icon-md'}
>
- <SortIcon />
+ <SortIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content>
<Dropdown.Group>
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.tsx
index 21dba37974..1897812133 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
@@ -20,7 +20,7 @@ interface SoupActiveFiltersBarProps {
*/
const AddFilterButton = () => (
<Dropdown.Trigger variant="ghost" size="icon-sm" tooltip="Add filters">
- <Plus />
+ <Plus class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
);
@@ -48,11 +48,11 @@ export function SoupActiveFiltersBar(props: SoupActiveFiltersBarProps) {
<div class="flex items-center shrink-0">
<Button
onClick={() => props.onClearAll()}
- variant="outline"
+ variant="secondary"
size="sm"
tooltip="Clear active filters"
>
- <XIcon />
+ <XIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
<span class="hidden @min-[300px]/split:inline">Clear all</span>
</Button>
</div>
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx
index 0228fa2721..0ac50f4944 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-group.tsx
@@ -13,6 +13,7 @@ import type { ButtonVariant } from '@ui';
import { createMemo, createSignal, Show } from 'solid-js';
export const SoupViewContextGroup = (props: {
+ grouped?: boolean;
hideLabel?: boolean;
variant?: ButtonVariant;
}) => {
@@ -50,6 +51,7 @@ export const SoupViewContextGroup = (props: {
<Show when={groupByEnabled().enabled}>
<Show when={isComponentListView('tasks')}>
<GroupDropdown
+ grouped={props.grouped}
value={value}
onChange={onChange}
options={TASK_GROUP_OPTIONS}
@@ -63,6 +65,7 @@ export const SoupViewContextGroup = (props: {
applies to the list mode. */}
<Show when={extensions?.groupOptions?.visible()}>
<GroupDropdown
+ grouped={props.grouped}
value={value}
onChange={onChange}
options={extensions?.groupOptions?.options ?? []}
@@ -74,6 +77,7 @@ export const SoupViewContextGroup = (props: {
</Show>
<Show when={component() === 'tag'}>
<GroupDropdown
+ grouped={props.grouped}
value={value}
onChange={onChange}
options={TAG_VIEW_GROUP_OPTIONS}
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-sort.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-sort.tsx
index 3860b5f51b..8340654b77 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-sort.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/soup-view-context-sort.tsx
@@ -16,11 +16,12 @@ import { TOKENS } from '@core/hotkey/tokens';
import { createMemo, createSignal, Match, Switch } from 'solid-js';
type SortOpenProps = {
+ grouped?: boolean;
open: boolean;
onOpenChange: (open: boolean) => void;
};
-export const SoupViewContextSort = () => {
+export const SoupViewContextSort = (props: { grouped?: boolean } = {}) => {
const panel = useSplitPanelOrThrow();
const [sortOpen, setSortOpen] = createSignal(false);
@@ -49,6 +50,7 @@ export const SoupViewContextSort = () => {
};
const openProps = (): SortOpenProps => ({
+ grouped: props.grouped,
open: sortOpen(),
onOpenChange: setSortOpen,
});
@@ -105,6 +107,7 @@ const InboxSort = (props: SortOpenProps) => {
return (
<SortDropdown
+ grouped={props.grouped}
value={sort.value}
onChange={sort.onChange}
options={sort.options}
@@ -119,6 +122,7 @@ const AgentsSort = (props: SortOpenProps) => {
return (
<SortDropdown
+ grouped={props.grouped}
value={sort.value}
onChange={sort.onChange}
options={sort.options}
@@ -133,6 +137,7 @@ const MailSort = (props: SortOpenProps) => {
return (
<SortDropdown
+ grouped={props.grouped}
value={sort.value}
onChange={sort.onChange}
options={sort.options}
@@ -147,6 +152,7 @@ const DocumentsSort = (props: SortOpenProps) => {
return (
<SortDropdown
+ grouped={props.grouped}
value={sort.value}
onChange={sort.onChange}
options={sort.options}
@@ -161,6 +167,7 @@ const TasksSort = (props: SortOpenProps) => {
return (
<SortDropdown
+ grouped={props.grouped}
value={sort.value}
onChange={sort.onChange}
options={sort.options}
@@ -175,6 +182,7 @@ const ChannelsSort = (props: SortOpenProps) => {
return (
<SortDropdown
+ grouped={props.grouped}
value={sort.value}
onChange={sort.onChange}
options={sort.options}
@@ -189,6 +197,7 @@ const FilesSort = (props: SortOpenProps) => {
return (
<SortDropdown
+ grouped={props.grouped}
value={sort.value}
onChange={sort.onChange}
options={sort.options}
diff --git a/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx b/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
index 39b06b15d8..4410e95ed2 100644
--- a/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
+++ b/apps/web/src/features/next-soup/soup-view/filters-bar/unified-filter-dropdown.tsx
@@ -33,7 +33,14 @@ import { PropertyValueIcon } from '@property/component/propertyValue/PropertyVal
import { PROPERTY_OPTION_IDS, SYSTEM_PROPERTY_IDS } from '@property/constants';
import { useGithubLinkStatusQuery } from '@queries/auth';
import { useContacts } from '@queries/contacts/contacts';
-import { type ButtonVariant, cn, Dropdown, Tooltip } from '@ui';
+import {
+ Button,
+ ButtonGroup,
+ type ButtonVariant,
+ cn,
+ Dropdown,
+ Tooltip,
+} from '@ui';
import {
type Accessor,
batch,
@@ -493,6 +500,7 @@ export const VIEW_FILTER_CATEGORIES: Record<ListView, FilterCategory[]> = {
};
interface UnifiedFilterDropdownProps {
+ grouped?: boolean;
/** View-specific refinements alongside the shared filters. */
children?: JSX.Element;
/** Optional controlled open state */
@@ -830,6 +838,11 @@ export const UnifiedFilterDropdown = (
return undefined;
};
+ const triggerSize = () => {
+ if (!props.hideLabel) return 'sm';
+ return props.grouped ? 'icon-sm' : 'icon-md';
+ };
+
return (
<Show
when={
@@ -854,14 +867,14 @@ export const UnifiedFilterDropdown = (
hotkey={TOKENS.soup.filter}
>
<Dropdown.Trigger
- variant={props.variant ?? 'outline'}
- size={props.hideLabel ? 'icon-md' : 'sm'}
- depth={2}
+ as={props.grouped ? ButtonGroup.Button : Button}
+ variant={props.variant ?? 'secondary'}
+ size={triggerSize()}
aria-label={
props.hideLabel ? t('viewMenus.filter') : undefined
}
>
- <FilterIcon />
+ <FilterIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
<Show when={!props.hideLabel}>
<span>{t('viewMenus.filter')}</span>
</Show>
diff --git a/apps/web/src/features/next-soup/soup-view/search-ask-ai-button.tsx b/apps/web/src/features/next-soup/soup-view/search-ask-ai-button.tsx
index 6d51dcebb6..269063f865 100644
--- a/apps/web/src/features/next-soup/soup-view/search-ask-ai-button.tsx
+++ b/apps/web/src/features/next-soup/soup-view/search-ask-ai-button.tsx
@@ -47,7 +47,6 @@ export function SearchAskAiButton() {
<Button
variant="ghost"
size="md"
- depth={2}
tooltip="Ask AI"
class="shrink-0"
disabled={isAsking()}
diff --git a/apps/web/src/features/next-soup/soup-view/soup-view-tabs.tsx b/apps/web/src/features/next-soup/soup-view/soup-view-tabs.tsx
index 01b477016b..2d6791e41b 100644
--- a/apps/web/src/features/next-soup/soup-view/soup-view-tabs.tsx
+++ b/apps/web/src/features/next-soup/soup-view/soup-view-tabs.tsx
@@ -264,7 +264,7 @@ export const CollapsedSoupViewTabs = () => {
return (
<Dropdown placement="bottom-start">
- <Dropdown.Trigger variant="outline" size="md">
+ <Dropdown.Trigger variant="secondary" size="md">
{selected()?.label}
<CaretDownIcon class="size-3 text-ink-extra-muted" />
</Dropdown.Trigger>
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.tsx
index 14f4da3467..afc06971ea 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
@@ -418,13 +418,14 @@ export const SoupView = (props: SoupViewProps) => {
<Show when={docsUrl()}>
{(url) => (
<Button
+ aria-label="View documentation"
+ tooltip="View documentation"
size="icon-sm"
variant="ghost"
class="@max-[380px]/split-header:hidden"
- label="View documentation"
onClick={() => openExternalUrl(url())}
>
- <InfoIcon />
+ <InfoIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Show>
@@ -475,6 +476,7 @@ export const SoupView = (props: SoupViewProps) => {
<Show when={props.filterBarVariant !== 'tag'}>
<HeaderActionGroup label="Filters">
<UnifiedFilterDropdown
+ grouped
hideLabel
variant="ghost"
open={filterOpen}
@@ -484,9 +486,9 @@ export const SoupView = (props: SoupViewProps) => {
</Show>
<HeaderActionGroup label="View options">
<Show when={!isComponentListView('home')}>
- <SoupViewContextSort />
+ <SoupViewContextSort grouped />
</Show>
- <SoupViewContextGroup hideLabel variant="ghost" />
+ <SoupViewContextGroup grouped hideLabel variant="ghost" />
</HeaderActionGroup>
<Show when={props.showCreateButton !== false}>
<SoupViewCreateButton />
@@ -1208,7 +1210,7 @@ const SoupViewListContent = (props: SoupViewListProps) => {
soupNavigationTouchHighlight(el);
}}
scrollerRef={setListScrollerRef}
- virtualizerClass={'scrollbar-hidden space-y-2'}
+ virtualizerClass="scrollbar-hidden space-y-2"
class="overflow-hidden flex min-w-0"
virtualizerRef={registerVirtualizerHandler}
onScrollBottom={debouncedFetchMore}
@@ -1304,9 +1306,8 @@ const SoupViewListContent = (props: SoupViewListProps) => {
}
fallback={
<Button
- variant="outline"
- size="sm"
- depth={2}
+ variant="secondary"
+ size="xs"
class={cn({
'bg-surface': !highlighted(),
'border-transparent':
@@ -1320,9 +1321,8 @@ const SoupViewListContent = (props: SoupViewListProps) => {
}
>
<Button
- variant="outline"
- size="sm"
- depth={2}
+ variant="secondary"
+ size="xs"
class={cn({
'bg-surface': !highlighted(),
'border-transparent':
diff --git a/apps/web/src/features/notifications/components/Playground.tsx b/apps/web/src/features/notifications/components/Playground.tsx
index b372bba7e3..0691e3e75b 100644
--- a/apps/web/src/features/notifications/components/Playground.tsx
+++ b/apps/web/src/features/notifications/components/Playground.tsx
@@ -242,7 +242,7 @@ function PermissionButton(props: { platformNotif: any }) {
when={props.platformNotif.permission() === 'granted'}
fallback={
<Button
- variant="accent"
+ variant="primary"
onClick={() => props.platformNotif.requestPermission()}
>
Enable Browser Notifications
@@ -293,7 +293,7 @@ function CustomBuilder(props: {
<div class="pt-4 border-t border-edge-muted">
<Button
- variant="accent"
+ variant="primary"
onClick={() => props.onTest(props.customNotification)}
>
🔔 Test Browser Notification
@@ -370,7 +370,7 @@ function NotificationDetail(props: {
</p>
</div>
<Button
- variant="accent"
+ variant="primary"
onClick={() => props.onTest(props.notification)}
>
🔔 Test Notification
diff --git a/apps/web/src/features/onboarding/components/team-panels.tsx b/apps/web/src/features/onboarding/components/team-panels.tsx
index 55bfdfc72c..65462bff2b 100644
--- a/apps/web/src/features/onboarding/components/team-panels.tsx
+++ b/apps/web/src/features/onboarding/components/team-panels.tsx
@@ -49,7 +49,7 @@ export function InvitesPanel(props: {
{invite.invitedBy} invited you to their team
</span>
<Button
- variant="cta"
+ variant="primary"
size="sm"
class="ml-auto shrink-0"
disabled={props.joining}
diff --git a/apps/web/src/features/paywall/components/ai-usage-limit-dialog.tsx b/apps/web/src/features/paywall/components/ai-usage-limit-dialog.tsx
index fffbbee67c..1a11fddadb 100644
--- a/apps/web/src/features/paywall/components/ai-usage-limit-dialog.tsx
+++ b/apps/web/src/features/paywall/components/ai-usage-limit-dialog.tsx
@@ -67,8 +67,7 @@ export function AiUsageLimitDialogView(props: AiUsageLimitDialogProps) {
<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
<Button
- variant={props.freePlan ? 'accent' : 'ghost'}
- depth={3}
+ variant={props.freePlan ? 'primary' : 'ghost'}
class="px-3 py-1.5"
onClick={props.onOpenSettings}
>
@@ -77,7 +76,6 @@ export function AiUsageLimitDialogView(props: AiUsageLimitDialogProps) {
<div class="flex gap-2 sm:justify-end">
<Button
variant="ghost"
- depth={3}
class="px-3 py-1.5"
onClick={props.onClose}
>
diff --git a/apps/web/src/features/paywall/components/paywall-view.tsx b/apps/web/src/features/paywall/components/paywall-view.tsx
index a5973e81ff..d588b81528 100644
--- a/apps/web/src/features/paywall/components/paywall-view.tsx
+++ b/apps/web/src/features/paywall/components/paywall-view.tsx
@@ -52,7 +52,7 @@ export function PaywallView(props: {
<p role="alert" class="text-sm text-ink-muted">
Couldn't load your available plans. Please try again.
</p>
- <Button size="sm" variant="outline" onClick={props.onRetry}>
+ <Button size="sm" variant="secondary" onClick={props.onRetry}>
Try again
</Button>
</div>
@@ -93,7 +93,7 @@ export function PaywallView(props: {
>
Dismiss
</Button>
- <Button size="sm" variant="cta" onClick={props.onManagePlan}>
+ <Button size="sm" variant="primary" onClick={props.onManagePlan}>
Manage plan
</Button>
</footer>
diff --git a/apps/web/src/features/projects/components/project-collaborators.tsx b/apps/web/src/features/projects/components/project-collaborators.tsx
index a6709366fd..0ca9f12c5f 100644
--- a/apps/web/src/features/projects/components/project-collaborators.tsx
+++ b/apps/web/src/features/projects/components/project-collaborators.tsx
@@ -65,7 +65,7 @@ export function ProjectCollaborators(props: {
setPicking(value);
}}
>
- <Dropdown.Trigger disabled={props.pending} variant="outline">
+ <Dropdown.Trigger disabled={props.pending} variant="secondary">
Manage collaborators
</Dropdown.Trigger>
<Dropdown.Content portalScope="local" class="min-w-72 p-3">
@@ -89,6 +89,7 @@ export function ProjectCollaborators(props: {
</Button>
<Button
size="sm"
+ variant="primary"
disabled={props.pending}
onClick={() => fireAndForget(save([...selected()]), 'projects')}
>
diff --git a/apps/web/src/features/projects/components/project-row-menu.test.tsx b/apps/web/src/features/projects/components/project-row-menu.test.tsx
index f01195a8ea..340032eb43 100644
--- a/apps/web/src/features/projects/components/project-row-menu.test.tsx
+++ b/apps/web/src/features/projects/components/project-row-menu.test.tsx
@@ -1,14 +1,11 @@
import { cleanup, render, screen, waitFor } from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ProjectRow } from '../context/projects-context';
import type { ProjectAccess } from '../core/project';
import { ProjectMenuDropdown } from './project-row-menu';
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
-vi.mock('@app/components/ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
+
vi.mock('@entity', () => ({
InlineEntity: (props: { entity: { name: string } }) => props.entity.name,
}));
diff --git a/apps/web/src/features/projects/components/project-row-menu.tsx b/apps/web/src/features/projects/components/project-row-menu.tsx
index 8710b69e8e..c9c1067a9e 100644
--- a/apps/web/src/features/projects/components/project-row-menu.tsx
+++ b/apps/web/src/features/projects/components/project-row-menu.tsx
@@ -273,11 +273,12 @@ export function ProjectMenuDropdown(props: ProjectMenuProps) {
return (
<Dropdown placement="bottom-start">
<Dropdown.Trigger
+ aria-label={t('entityActions.projectActions')}
+ tooltip={t('entityActions.projectActions')}
variant="ghost"
size="icon-sm"
- label={t('entityActions.projectActions')}
>
- <DotsThreeIcon />
+ <DotsThreeIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content class="min-w-64 max-w-[min(22rem,calc(100vw-1rem))] text-xs text-ink-muted">
<Dropdown.Group>
diff --git a/apps/web/src/features/projects/components/project-task-search.tsx b/apps/web/src/features/projects/components/project-task-search.tsx
index e12e56cea8..80594c3dba 100644
--- a/apps/web/src/features/projects/components/project-task-search.tsx
+++ b/apps/web/src/features/projects/components/project-task-search.tsx
@@ -24,16 +24,16 @@ export function ProjectTaskSearch(props: {
when={expanded()}
fallback={
<Button
+ aria-label={label()}
+ tooltip={label()}
ref={trigger}
- variant="outline"
+ variant="secondary"
size="icon-md"
- noTouchResize
- label={label()}
aria-expanded={false}
aria-controls={inputId}
onClick={() => setExpanded(true)}
>
- <MagnifyingGlassIcon />
+ <MagnifyingGlassIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
}
>
diff --git a/apps/web/src/features/projects/components/rename-project-dialog.tsx b/apps/web/src/features/projects/components/rename-project-dialog.tsx
index 957f050aa6..f5e3accd5b 100644
--- a/apps/web/src/features/projects/components/rename-project-dialog.tsx
+++ b/apps/web/src/features/projects/components/rename-project-dialog.tsx
@@ -71,18 +71,12 @@ export function RenameProjectDialog(props: {
<Button
type="button"
variant="ghost"
- depth={2}
disabled={pending()}
onClick={() => props.onOpenChange(false)}
>
Cancel
</Button>
- <Button
- type="submit"
- variant="strong"
- depth={2}
- disabled={!canSubmit()}
- >
+ <Button type="submit" variant="primary" disabled={!canSubmit()}>
{pending() ? 'Saving…' : 'Save name'}
</Button>
</ActionDialogShell.Footer>
diff --git a/apps/web/src/features/projects/project-description.tsx b/apps/web/src/features/projects/project-description.tsx
index 50ddd49624..2d0b866266 100644
--- a/apps/web/src/features/projects/project-description.tsx
+++ b/apps/web/src/features/projects/project-description.tsx
@@ -31,7 +31,7 @@ function DescriptionSession(props: {
}
/>
<Show when={session.connectionError()}>
- <Button size="sm" onClick={props.onRetry}>
+ <Button variant="ghost" size="sm" onClick={props.onRetry}>
Retry description
</Button>
</Show>
diff --git a/apps/web/src/features/projects/project-detail.tsx b/apps/web/src/features/projects/project-detail.tsx
index 6c8cacd466..1e255736b2 100644
--- a/apps/web/src/features/projects/project-detail.tsx
+++ b/apps/web/src/features/projects/project-detail.tsx
@@ -348,6 +348,7 @@ function ProjectDetailHost(props: ProjectDetailProps) {
longer have access.
</p>
<Button
+ variant="ghost"
onClick={() => fireAndForget(source.refresh(), 'projects')}
>
Try again
diff --git a/apps/web/src/features/projects/projects.tsx b/apps/web/src/features/projects/projects.tsx
index a524e0c7cb..f087382de3 100644
--- a/apps/web/src/features/projects/projects.tsx
+++ b/apps/web/src/features/projects/projects.tsx
@@ -84,7 +84,10 @@ function ProjectsContent(props: ParentProps) {
<ErrorBoundary
fallback={(_, reset) => (
<div role="alert" class="p-4">
- Could not load projects. <Button onClick={reset}>Try again</Button>
+ Could not load projects.{' '}
+ <Button variant="ghost" onClick={reset}>
+ Try again
+ </Button>
</div>
)}
>
diff --git a/apps/web/src/features/projects/views/add-project-tasks.test.tsx b/apps/web/src/features/projects/views/add-project-tasks.test.tsx
index fb9447c35a..7cc258524e 100644
--- a/apps/web/src/features/projects/views/add-project-tasks.test.tsx
+++ b/apps/web/src/features/projects/views/add-project-tasks.test.tsx
@@ -1,5 +1,5 @@
import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
-import type { Accessor, ParentProps } from 'solid-js';
+import type { Accessor } from 'solid-js';
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import type { ProjectDetail } from '../core/project';
import { AddProjectTasks } from './add-project-tasks';
@@ -12,9 +12,7 @@ vi.mock('@ui', async () => ({
...(await import('@app/components/ui/utils/classname')),
Hotkey: () => null,
}));
-vi.mock('@app/components/ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
+
vi.mock('@core/component/HoverCard', () => ({
useIsInsideHoverCard: () => false,
}));
diff --git a/apps/web/src/features/projects/views/add-project-tasks.tsx b/apps/web/src/features/projects/views/add-project-tasks.tsx
index 58a129a448..37ff96ec42 100644
--- a/apps/web/src/features/projects/views/add-project-tasks.tsx
+++ b/apps/web/src/features/projects/views/add-project-tasks.tsx
@@ -57,7 +57,7 @@ export function AddProjectTasks(props: { project: ProjectDetail }) {
}}
placement="bottom-end"
>
- <Dropdown.Trigger variant="outline" size="md">
+ <Dropdown.Trigger variant="secondary" size="md">
<ListPlusIcon class="size-4" />
Add existing tasks
</Dropdown.Trigger>
@@ -96,12 +96,17 @@ export function AddProjectTasks(props: { project: ProjectDetail }) {
event.stopPropagation();
}}
>
- <Button size="sm" disabled={saving()} onClick={close}>
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={saving()}
+ onClick={close}
+ >
Cancel
</Button>
<Button
size="sm"
- variant="cta"
+ variant="primary"
disabled={saving() || !selected().size}
onClick={() => fireAndForget(add(), 'projects')}
>
diff --git a/apps/web/src/features/projects/views/create-project.test.tsx b/apps/web/src/features/projects/views/create-project.test.tsx
index c8df95ef90..9847003f70 100644
--- a/apps/web/src/features/projects/views/create-project.test.tsx
+++ b/apps/web/src/features/projects/views/create-project.test.tsx
@@ -3,7 +3,7 @@ import { focusPopoverInput } from '@components/app/split-layout/utils/focusPopov
import type { EditorControls } from '@core/component/LexicalMarkdown/builder/types';
import type { Property } from '@property/types';
import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
-import { type ComponentProps, type ParentProps, Show } from 'solid-js';
+import { type ComponentProps, Show } from 'solid-js';
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import {
type ProjectsContext,
@@ -20,11 +20,9 @@ vi.mock('@ui', async () => ({
...(await import('@app/components/ui/components/Button')),
...(await import('@app/components/ui/components/Checkbox')),
...(await import('@app/components/ui/components/EntityComposer')),
+ ...(await import('@app/components/ui/components/ToggleSwitch')),
...(await import('@app/components/ui/utils/classname')),
}));
-vi.mock('@app/components/ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
vi.mock('@core/mobile/isTouchDevice', () => ({ isTouchDevice: () => false }));
// The date picker is covered separately; exercise its real save contract here.
@@ -183,7 +181,7 @@ it('hands its draft and one create with the drafted values to the host the momen
const title = screen.getByRole('textbox', { name: 'Project name' });
expect(document.activeElement).toBe(title);
expect(
- screen.getByRole('checkbox', { name: 'Share with my team' })
+ screen.getByRole('switch', { name: 'Share with my team' })
).toHaveProperty('checked', true);
expect(screen.getByRole('button', { name: /Create Project/ })).toHaveProperty(
'disabled',
@@ -197,7 +195,7 @@ it('hands its draft and one create with the drafted values to the host the momen
}
);
fireEvent.click(screen.getByRole('button', { name: 'Set due date' }));
- fireEvent.click(screen.getByRole('checkbox', { name: 'Share with my team' }));
+ fireEvent.click(screen.getByRole('switch', { name: 'Share with my team' }));
fireEvent.click(screen.getByRole('button', { name: /Create Project/ }));
expect(service.create).toHaveBeenCalledOnce();
expect(service.create).toHaveBeenCalledWith({
diff --git a/apps/web/src/features/projects/views/create-project.tsx b/apps/web/src/features/projects/views/create-project.tsx
index 89471d1a63..deebfdc09b 100644
--- a/apps/web/src/features/projects/views/create-project.tsx
+++ b/apps/web/src/features/projects/views/create-project.tsx
@@ -2,7 +2,7 @@ import type { EditorControls } from '@core/component/LexicalMarkdown/builder/typ
import ArrowsOutIcon from '@icon/system/regular/arrows-out.svg';
import XIcon from '@icon/system/regular/x.svg';
import { PropertyValuePill } from '@property/component/PropertyValuePill';
-import { Button, Checkbox, EntityComposer } from '@ui';
+import { Button, EntityComposer, ToggleSwitch } from '@ui';
import { $getRoot } from 'lexical';
import { For, onMount, Show } from 'solid-js';
import { ProjectDescriptionComposer } from '../components/project-description-composer';
@@ -66,14 +66,15 @@ export function CreateProject(props: {
<div class="flex-1 flex items-center">
<Show when={props.onContinueInSplit}>
<Button
+ variant="ghost"
tabIndex={-1}
aria-label="Continue editing in split"
tooltip="Continue editing in split"
- size="icon-composer"
+ size="icon-md"
disabled={composer.pending()}
onClick={() => props.onContinueInSplit?.(composer.snapshot())}
>
- <ArrowsOutIcon />
+ <ArrowsOutIcon class="size-4 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
@@ -86,10 +87,9 @@ export function CreateProject(props: {
>
<Button
tabIndex={-1}
- size="sm"
- variant="outline"
- depth={3}
- class="bg-surface px-3"
+ tooltip="Clear Draft"
+ size="xs"
+ variant="secondary"
disabled={composer.pending()}
onClick={() => {
composer.clear();
@@ -101,14 +101,15 @@ export function CreateProject(props: {
</Button>
</Show>
<Button
+ variant="ghost"
tabIndex={-1}
aria-label="Close"
tooltip="Close"
- size="icon-composer"
+ size="icon-md"
disabled={composer.pending()}
onClick={props.onClose}
>
- <XIcon />
+ <XIcon class="size-4 shrink-0 pointer-events-none" />
</Button>
</EntityComposer.Header>
<EntityComposer.Main class="min-h-28 justify-between">
@@ -156,6 +157,8 @@ export function CreateProject(props: {
<For each={definitions.properties()}>
{(property) => (
<PropertyValuePill
+ variant="secondary"
+ size="xs"
property={withProjectPropertyValue(
property,
composer.drafts().get(property.propertyDefinitionId)
@@ -194,18 +197,18 @@ export function CreateProject(props: {
)}
</Show>
<EntityComposer.Footer class="items-center flex-wrap">
- <Checkbox
+ <ToggleSwitch
+ class="shrink-0 ml-0.5"
checked={composer.shareWithTeam()}
disabled={composer.pending()}
onChange={composer.setShareWithTeam}
- >
- <Checkbox.Control />
- <Checkbox.Label class="text-xs text-ink-muted font-normal whitespace-nowrap">
- Share with my team
- </Checkbox.Label>
- </Checkbox>
+ label="Share with my team"
+ labelClass="text-xs text-ink-muted font-normal whitespace-nowrap"
+ />
<EntityComposer.Submit
type="submit"
+ variant="primary"
+ size="sm"
class="ml-auto"
hasContent={Boolean(composer.name().trim())}
disabled={composer.pending() || !composer.name().trim()}
diff --git a/apps/web/src/features/projects/views/project-assignment.test.tsx b/apps/web/src/features/projects/views/project-assignment.test.tsx
index 83cb60133f..397ea0b45b 100644
--- a/apps/web/src/features/projects/views/project-assignment.test.tsx
+++ b/apps/web/src/features/projects/views/project-assignment.test.tsx
@@ -1,5 +1,4 @@
import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
-import type { ParentProps } from 'solid-js';
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import { ProjectAssignment } from './project-assignment';
@@ -14,9 +13,7 @@ vi.mock('@ui', async () => ({
...(await import('@app/components/ui/utils/classname')),
Hotkey: () => null,
}));
-vi.mock('@app/components/ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
+
vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
vi.mock('../context/projects-context', () => ({
useProjectsContext: () => ({
diff --git a/apps/web/src/features/projects/views/project-assignment.tsx b/apps/web/src/features/projects/views/project-assignment.tsx
index 115bf1fa90..7421a99753 100644
--- a/apps/web/src/features/projects/views/project-assignment.tsx
+++ b/apps/web/src/features/projects/views/project-assignment.tsx
@@ -67,6 +67,7 @@ export function ProjectAssignment(props: {
onEscape={close}
/>
<Button
+ variant="ghost"
class="justify-start"
disabled={commands.pending()}
onClick={() => fireAndForget(assign(), 'projects')}
@@ -77,6 +78,7 @@ export function ProjectAssignment(props: {
<For each={source.rows()}>
{(row) => (
<Button
+ variant="ghost"
class="w-full justify-start"
disabled={commands.pending() || !canEditProject(row.project)}
onClick={() =>
@@ -101,7 +103,10 @@ export function ProjectAssignment(props: {
<p role="alert" class="text-sm text-failure">
Could not load projects.
</p>
- <Button onClick={() => fireAndForget(source.refresh(), 'projects')}>
+ <Button
+ variant="ghost"
+ onClick={() => fireAndForget(source.refresh(), 'projects')}
+ >
Try again
</Button>
</Show>
@@ -116,6 +121,7 @@ export function ProjectAssignment(props: {
</Show>
<Show when={source.hasMore()}>
<Button
+ variant="secondary"
disabled={source.loadingMore()}
onClick={() => fireAndForget(source.loadMore(), 'projects')}
>
@@ -135,7 +141,7 @@ export function ProjectAssignment(props: {
</p>
</Show>
<div class="flex justify-end">
- <Button disabled={commands.pending()} onClick={close}>
+ <Button variant="ghost" disabled={commands.pending()} onClick={close}>
Cancel
</Button>
</div>
diff --git a/apps/web/src/features/projects/views/project-tasks-list.tsx b/apps/web/src/features/projects/views/project-tasks-list.tsx
index 7802d2ff03..19711067e6 100644
--- a/apps/web/src/features/projects/views/project-tasks-list.tsx
+++ b/apps/web/src/features/projects/views/project-tasks-list.tsx
@@ -82,7 +82,7 @@ function ProjectTasksListBody(props: ProjectTasksListProps) {
<TasksControls />
{props.addTasksAction}
<Show when={props.onCreateTask}>
- <Button variant="outline" onClick={() => props.onCreateTask?.()}>
+ <Button variant="secondary" onClick={() => props.onCreateTask?.()}>
<PlusIcon class="size-4" />
New task
</Button>
@@ -95,7 +95,11 @@ function ProjectTasksListBody(props: ProjectTasksListProps) {
class="flex items-center gap-3 px-3 pb-2 text-sm text-ink-muted"
>
Some tasks could not be loaded.
- <Button size="sm" onClick={() => source.retryPagination?.()}>
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => source.retryPagination?.()}
+ >
Try again
</Button>
</div>
diff --git a/apps/web/src/features/projects/views/project-workspace.tsx b/apps/web/src/features/projects/views/project-workspace.tsx
index be8747b0ce..856a3b954c 100644
--- a/apps/web/src/features/projects/views/project-workspace.tsx
+++ b/apps/web/src/features/projects/views/project-workspace.tsx
@@ -127,12 +127,14 @@ export function ProjectWorkspace(props: {
/>
</Show>
<div
- class="mb-6 mt-3 flex flex-wrap items-center gap-2"
+ class="mb-6 mt-3 flex flex-row flex-wrap items-center gap-2 text-sm empty:hidden"
aria-label="Project properties"
>
<For each={props.source.properties()}>
{(property) => (
<PropertyValuePill
+ variant="secondary"
+ size="xs"
property={property}
canEdit={canEdit()}
onSave={(property, value) =>
diff --git a/apps/web/src/features/projects/views/projects-collection.test.tsx b/apps/web/src/features/projects/views/projects-collection.test.tsx
index d9fb752864..1cb80f60fc 100644
--- a/apps/web/src/features/projects/views/projects-collection.test.tsx
+++ b/apps/web/src/features/projects/views/projects-collection.test.tsx
@@ -38,9 +38,7 @@ vi.mock('@core/directive/touchHandler', () => ({
options().onLongPress?.()
),
}));
-vi.mock('@app/components/ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
+
// The shell, list engine, and row cells have their own coverage; this suite
// exercises what a row's context menu does to the list.
vi.mock('@app/components/view-shell', () => ({
diff --git a/apps/web/src/features/projects/views/projects-collection.tsx b/apps/web/src/features/projects/views/projects-collection.tsx
index e96ada916c..0de6762891 100644
--- a/apps/web/src/features/projects/views/projects-collection.tsx
+++ b/apps/web/src/features/projects/views/projects-collection.tsx
@@ -39,7 +39,7 @@ import {
SYSTEM_PROPERTY_IDS,
} from '@property/identifiers';
import type { Property, PropertyApiValues } from '@property/types';
-import { Button, Dropdown, Input } from '@ui';
+import { Button, ButtonGroup, Dropdown, Input } from '@ui';
import {
type Accessor,
batch,
@@ -436,6 +436,7 @@ export function ProjectsCollection(props: {
const layoutControl = () => (
<Show when={!isTouchDevice()}>
<ViewLayoutDropdown
+ grouped
label="Project layout"
layouts={props.ganttEnabled ? ['list', 'gantt'] : ['list']}
value={isGantt() ? 'gantt' : 'list'}
@@ -447,6 +448,7 @@ export function ProjectsCollection(props: {
);
const sortControl = () => (
<ListSortDropdown
+ grouped
label="Sort projects"
value={collection.sort()}
options={[
@@ -460,6 +462,7 @@ export function ProjectsCollection(props: {
);
const groupControl = () => (
<ListGroupDropdown
+ grouped
label="Group projects"
value={collection.groupBy()}
options={[
@@ -474,6 +477,7 @@ export function ProjectsCollection(props: {
const filterControl = () => (
<div class="relative shrink-0">
<ListFilterDropdown
+ grouped
label="Filter projects"
groups={filters()}
open={openMenu() === 'filters'}
@@ -501,8 +505,14 @@ export function ProjectsCollection(props: {
);
const dueDateControl = () => (
<Dropdown>
- <Dropdown.Trigger variant="ghost" size="icon-md" label="Filter due date">
- <CalendarIcon />
+ <Dropdown.Trigger
+ as={ButtonGroup.Button}
+ aria-label="Filter due date"
+ tooltip="Filter due date"
+ variant="ghost"
+ size="icon-sm"
+ >
+ <CalendarIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content>
<div class="flex flex-col gap-3 p-2">
@@ -527,6 +537,7 @@ export function ProjectsCollection(props: {
/>
</label>
<Button
+ variant="ghost"
size="sm"
onClick={() => {
collection.setDueAfter('');
@@ -652,6 +663,7 @@ export function ProjectsCollection(props: {
>
<span>Projects couldn’t be loaded.</span>
<Button
+ variant="ghost"
onClick={() =>
fireAndForget(collection.refresh(), 'projects')
}
@@ -666,7 +678,10 @@ export function ProjectsCollection(props: {
{filtered() ? 'No matching projects' : 'No projects yet'}
</span>
<Show when={!filtered()}>
- <Button onClick={() => props.onCreate()}>
+ <Button
+ variant="secondary"
+ onClick={() => props.onCreate()}
+ >
New project
</Button>
</Show>
@@ -768,6 +783,7 @@ export function ProjectsCollection(props: {
class="flex justify-center py-2"
>
<Button
+ variant="secondary"
disabled={collection.loadingMore()}
onClick={() =>
list.activate.key(more().id, {
diff --git a/apps/web/src/features/projects/views/projects-gantt.tsx b/apps/web/src/features/projects/views/projects-gantt.tsx
index 0698dc3eca..9dde301989 100644
--- a/apps/web/src/features/projects/views/projects-gantt.tsx
+++ b/apps/web/src/features/projects/views/projects-gantt.tsx
@@ -90,7 +90,7 @@ export function ProjectsGantt(props: {
>
Projects couldn’t be loaded.
<Button
- variant="outline"
+ variant="secondary"
onClick={() => fireAndForget(collection.refresh(), 'projects')}
>
Try again
diff --git a/apps/web/src/features/projects/views/projects-sidebar.test.tsx b/apps/web/src/features/projects/views/projects-sidebar.test.tsx
index 951ee1a94d..9d71cd5b19 100644
--- a/apps/web/src/features/projects/views/projects-sidebar.test.tsx
+++ b/apps/web/src/features/projects/views/projects-sidebar.test.tsx
@@ -11,7 +11,6 @@ import {
createResource,
createRoot,
createSignal,
- type ParentProps,
} from 'solid-js';
import { afterEach, expect, it, vi } from 'vitest';
import type { ProjectsSource } from '../context/projects-context';
@@ -29,9 +28,7 @@ vi.mock('@ui', async () => ({
...(await import('@app/components/ui/utils/classname')),
...(await import('@app/components/ui/components/Button')),
}));
-vi.mock('@app/components/ui/components/Tooltip', () => ({
- Tooltip: (props: ParentProps) => props.children,
-}));
+
vi.mock('@solid-primitives/resize-observer', () => ({
createResizeObserver: () => {},
}));
diff --git a/apps/web/src/features/projects/views/projects-sidebar.tsx b/apps/web/src/features/projects/views/projects-sidebar.tsx
index daad78b630..b46b295a09 100644
--- a/apps/web/src/features/projects/views/projects-sidebar.tsx
+++ b/apps/web/src/features/projects/views/projects-sidebar.tsx
@@ -63,7 +63,10 @@ export function ProjectsSidebar(props: ProjectsSidebarProps) {
<span class="min-w-0 truncate">My projects</span>
<CollapsibleSection.Indicator />
</CollapsibleSection.Trigger>
- <CollapsibleSection.Action label="New project" onClick={props.onCreate}>
+ <CollapsibleSection.Action
+ aria-label="New project"
+ onClick={props.onCreate}
+ >
<PlusIcon class="size-3.5" />
</CollapsibleSection.Action>
</CollapsibleSection.Header>
diff --git a/apps/web/src/features/property/component/AddPropertyButton.tsx b/apps/web/src/features/property/component/AddPropertyButton.tsx
index f99caae8fe..b8c8bee628 100644
--- a/apps/web/src/features/property/component/AddPropertyButton.tsx
+++ b/apps/web/src/features/property/component/AddPropertyButton.tsx
@@ -1,9 +1,16 @@
import PlusIcon from '@icon/system/regular/plus.svg';
-import { badgeTriggerClasses } from '@ui';
+import {
+ type BadgeSize,
+ type BadgeVariant,
+ badgeTriggerClasses,
+ cn,
+} from '@ui';
import { usePropertiesContext } from '../context/PropertiesContext';
export function AddPropertyButton(props: {
class?: string;
+ variant?: BadgeVariant;
+ size?: BadgeSize;
onClick?: () => void;
}) {
const { openPropertySelector } = usePropertiesContext();
@@ -12,9 +19,9 @@ export function AddPropertyButton(props: {
type="button"
onClick={() => (props.onClick ?? openPropertySelector)()}
class={badgeTriggerClasses({
- variant: 'outline',
- size: 'sm',
- class: props.class,
+ variant: props.variant ?? 'outline',
+ size: props.size ?? 'sm',
+ class: cn('gap-1', props.class),
})}
>
<PlusIcon class="size-3 shrink-0" />
diff --git a/apps/web/src/features/property/component/PropertyValuePill.tsx b/apps/web/src/features/property/component/PropertyValuePill.tsx
index 82446f5053..ce15e02379 100644
--- a/apps/web/src/features/property/component/PropertyValuePill.tsx
+++ b/apps/web/src/features/property/component/PropertyValuePill.tsx
@@ -9,6 +9,8 @@ type PropertyValuePillProps = Pick<
emptyLabel?: JSX.Element;
showLabel?: boolean;
class?: string;
+ variant?: ComponentProps<typeof Property.Pill>['variant'];
+ size?: ComponentProps<typeof Property.Pill>['size'];
hoverActions?: JSX.Element;
hoverTrailingAction?: JSX.Element;
entitySelfFilter?: ComponentProps<
@@ -37,40 +39,46 @@ export function PropertyValuePill(props: PropertyValuePillProps) {
actions={props.hoverActions}
trailingAction={props.hoverTrailingAction}
>
- <Property.Pill class={props.class} variant="outline">
+ <Property.Pill
+ class={props.class}
+ variant={props.variant ?? 'outline'}
+ size={props.size}
+ >
<Show when={props.showLabel && hasValue(props.property)}>
<span class="shrink-0 text-ink-muted">
{props.property.displayName}:
</span>
</Show>
- <Switch
- fallback={
- <Property.Icon
- property={props.property}
- class="size-3 shrink-0"
- />
- }
- >
- <Match when={isMultiUserEntity()}>
- <Property.UserStack property={props.property} maxUsers={2} />
- </Match>
- <Match when={isUserEntity()}>
- <Property.Icon property={props.property} />
- </Match>
- </Switch>
- <Property.Text
- property={props.property}
- resolveSingleEntity={
- props.showLabel ||
- props.property.specificEntityType === 'INITIATIVE'
- }
- class="min-w-0 max-w-60"
- fallback={
- <Property.Empty
- label={props.emptyLabel ?? props.property.displayName}
- />
- }
- />
+ <span class="inline-flex min-w-0 items-center gap-1">
+ <Switch
+ fallback={
+ <Property.Icon
+ property={props.property}
+ class="size-3 shrink-0"
+ />
+ }
+ >
+ <Match when={isMultiUserEntity()}>
+ <Property.UserStack property={props.property} maxUsers={2} />
+ </Match>
+ <Match when={isUserEntity()}>
+ <Property.Icon property={props.property} />
+ </Match>
+ </Switch>
+ <Property.Text
+ property={props.property}
+ resolveSingleEntity={
+ props.showLabel ||
+ props.property.specificEntityType === 'INITIATIVE'
+ }
+ class="min-w-0 max-w-60"
+ fallback={
+ <Property.Empty
+ label={props.emptyLabel ?? props.property.displayName}
+ />
+ }
+ />
+ </span>
<Property.Caret />
</Property.Pill>
</Property.Tooltip>
diff --git a/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx b/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx
index d9961d8963..732365e739 100644
--- a/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx
+++ b/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx
@@ -148,13 +148,14 @@ const OptionInput: Component<OptionInputProps<string | number>> = (props) => {
data-option-id={option().id}
/>
<Button
+ aria-label="Remove option"
+ tooltip="Remove option"
variant="ghost"
size="icon-sm"
- label="Remove option"
onClick={() => props.onRemove(option().id)}
class="shrink-0 text-failure-ink"
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
)}
@@ -559,13 +560,14 @@ export const CreatePropertyModal: Component<CreatePropertyModalProps> = (
Create property
</Dialog.Title>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-sm"
disabled={pending()}
- label="Close"
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</CommandMenuShell.Header>
@@ -770,8 +772,7 @@ export const CreatePropertyModal: Component<CreatePropertyModalProps> = (
Cancel
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="primary"
class={cn('gap-3 ', pending() && 'gap-1.5')}
onClick={handleCreateProperty}
disabled={!canSubmit()}
@@ -781,7 +782,7 @@ export const CreatePropertyModal: Component<CreatePropertyModalProps> = (
fallback={
<>
<span class="size-3 animate-spin">
- <LoadingSpinner />
+ <LoadingSpinner class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</span>
Creating
</>
diff --git a/apps/web/src/features/property/extractors/property-pill-classes.ts b/apps/web/src/features/property/extractors/property-pill-classes.ts
index 75f278fa1c..f1f5cce5fc 100644
--- a/apps/web/src/features/property/extractors/property-pill-classes.ts
+++ b/apps/web/src/features/property/extractors/property-pill-classes.ts
@@ -18,7 +18,7 @@ type PropertyPillClassOptions = {
export function propertyPillClasses(props: PropertyPillClassOptions = {}) {
const options = {
variant: props.variant ?? 'ghost',
- size: props.size ?? 'sm',
+ size: props.size ?? 'xs',
class: cn(
'max-w-full text-left',
props.empty && 'text-ink-extra-muted',
diff --git a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.test.tsx b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.test.tsx
index 8a8aeab1c3..6a62278494 100644
--- a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.test.tsx
+++ b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.test.tsx
@@ -86,7 +86,8 @@ vi.mock('@queries/properties/entity', () => ({
vi.mock('@queries/properties/tags', () => ({
useTagsQuery: () => ({ isSuccess: true, data: [] }),
}));
-vi.mock('@ui', () => ({
+vi.mock('@ui', async () => ({
+ ...(await import('@ui/utils/classname')),
Button: (props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) => (
<button {...props} />
),
diff --git a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
index 0853f23974..9d548863a7 100644
--- a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
+++ b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
@@ -419,7 +419,7 @@ export function EntityPropertiesSection(props: EntityPropertiesSectionProps) {
filteredProperties().length > 0 && 'mt-2'
)}
>
- <AddPropertyButton class="m-px gap-1.5" />
+ <AddPropertyButton size="xs" class="m-px gap-1.5" />
</div>
</Show>
<Modals />
@@ -881,7 +881,6 @@ function NonUserEntityValue(props: { property: Property }) {
<Button
type="button"
variant="ghost"
- depth={0}
size="icon-sm"
aria-label={`Add ${props.property.displayName}`}
onClick={(event) => {
@@ -965,7 +964,6 @@ function EntityCollectionPropertyBody(props: {
<Button
type="button"
variant="ghost"
- depth={0}
size="icon-sm"
class="size-5"
aria-label={`Add ${props.property.displayName}`}
@@ -1068,6 +1066,7 @@ function NonUserEntityChip(props: {
<Show when={props.canEdit && props.onRemove}>
<div class="border-l border-edge-muted" />
<Button
+ variant="ghost"
type="button"
size="icon-sm"
class="flex w-6 p-1 h-full shrink-0 rounded-none text-ink-muted not-disabled:hover:text-failure-ink"
@@ -1077,7 +1076,7 @@ function NonUserEntityChip(props: {
}}
aria-label={`Remove ${name()}`}
>
- <DeleteIcon />
+ <DeleteIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</div>
diff --git a/apps/web/src/features/property/tags/EntityRowTags.tsx b/apps/web/src/features/property/tags/EntityRowTags.tsx
index 2e19b111bd..9d24772942 100644
--- a/apps/web/src/features/property/tags/EntityRowTags.tsx
+++ b/apps/web/src/features/property/tags/EntityRowTags.tsx
@@ -6,7 +6,15 @@ import PlusIcon from '@icon/system/regular/plus.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, badgeTriggerClasses, cn, HoverCard, Layer } from '@ui';
+import {
+ type BadgeSize,
+ type BadgeVariant,
+ 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';
@@ -22,8 +30,7 @@ const DEFAULT_MAX_VISIBLE = 3;
const MAX_OVERFLOW_DOTS = 3;
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';
+const hoverMenuIconButtonClass = 'size-5 shrink-0 p-0.5 text-ink-extra-muted';
function HoverTagRow(props: {
tag: ResolvedTag;
@@ -42,7 +49,6 @@ function HoverTagRow(props: {
type="button"
variant="ghost"
size="icon-sm"
- noTouchResize
tooltip="Filter by tag"
aria-label={`Filter by ${props.tag.label}`}
class={hoverMenuIconButtonClass}
@@ -64,7 +70,6 @@ function HoverTagRow(props: {
type="button"
variant="ghost"
size="icon-sm"
- noTouchResize
tooltip="Edit tag"
aria-label={`Edit ${props.tag.label}`}
class={hoverMenuIconButtonClass}
@@ -244,7 +249,7 @@ function TagOverflow(props: {
createDocTags={props.createDocTags}
triggerClass={badgeTriggerClasses({
variant: 'outline',
- size: 'sm',
+ size: 'xs',
class: 'max-w-[14ch] gap-1.5',
})}
triggerLabel="Edit tags"
@@ -337,6 +342,8 @@ export function EntityRowTags(props: {
export function InlineTagsPill(props: {
docTags: DocTags;
class?: string;
+ variant?: BadgeVariant;
+ size?: BadgeSize;
showPlaceholder?: boolean;
showAddButton?: boolean;
/**
@@ -361,8 +368,8 @@ export function InlineTagsPill(props: {
docTags={props.docTags}
onActiveChange={props.onActiveChange}
triggerClass={badgeTriggerClasses({
- variant: 'outline',
- size: 'sm',
+ variant: props.variant ?? 'outline',
+ size: props.size ?? 'xs',
class: cn(
// Capped so a long tag label truncates instead of squeezing
// whatever shares the row with the pill (e.g. a task title).
@@ -379,48 +386,50 @@ export function InlineTagsPill(props: {
: 'Change or select tags'
}
>
- <Switch>
- <Match when={tags().length === 0 && props.showAddButton}>
- <PlusIcon class="size-3 shrink-0" />
- <span>Add tags</span>
- </Match>
- <Match when={tags().length === 0}>
- <span class="inline-flex min-w-0 items-center gap-1.5 opacity-50">
- <CircleDashedEmpty class="size-3 shrink-0" />
- <span class="min-w-0 truncate @max-2xl/u-list:hidden">
- Tags
- </span>
- </span>
- </Match>
- <Match when={tags().length === 1 && first()}>
- {(tag) => (
- <>
- <TagDot color={tag().color} class="size-2.5" />
+ <span class="inline-flex min-w-0 items-center gap-1">
+ <Switch>
+ <Match when={tags().length === 0 && props.showAddButton}>
+ <PlusIcon class="size-3 shrink-0" />
+ <span>Add tags</span>
+ </Match>
+ <Match when={tags().length === 0}>
+ <span class="inline-flex min-w-0 items-center gap-1 opacity-50">
+ <CircleDashedEmpty class="size-3 shrink-0" />
<span class="min-w-0 truncate @max-2xl/u-list:hidden">
- {tag().label}
+ Tags
</span>
- </>
- )}
- </Match>
- <Match when={tags().length > 1}>
- <span class="flex items-center">
- <For each={dots()}>
- {(tag, index) => (
- <TagDot
- color={tag.color}
- class={cn(
- 'size-2.5 ring-2 ring-surface',
- index() > 0 && '-ml-1'
- )}
- />
- )}
- </For>
- </span>
- <span class="min-w-0 truncate @max-2xl/u-list:hidden">
- {label()}
- </span>
- </Match>
- </Switch>
+ </span>
+ </Match>
+ <Match when={tags().length === 1 && first()}>
+ {(tag) => (
+ <>
+ <TagDot color={tag().color} class="size-2.5" />
+ <span class="min-w-0 truncate @max-2xl/u-list:hidden">
+ {tag().label}
+ </span>
+ </>
+ )}
+ </Match>
+ <Match when={tags().length > 1}>
+ <span class="flex items-center">
+ <For each={dots()}>
+ {(tag, index) => (
+ <TagDot
+ color={tag.color}
+ class={cn(
+ 'size-2.5 ring-2 ring-surface',
+ index() > 0 && '-ml-1'
+ )}
+ />
+ )}
+ </For>
+ </span>
+ <span class="min-w-0 truncate @max-2xl/u-list:hidden">
+ {label()}
+ </span>
+ </Match>
+ </Switch>
+ </span>
<Show when={tags().length > 0 || !props.showAddButton}>
<CaretDownIcon class="size-3 shrink-0 @max-2xl/u-list:hidden" />
</Show>
@@ -454,6 +463,8 @@ export function InlineFetchedEntityTagsPill(props: {
entityId: string;
entityType: EntityType;
class?: string;
+ variant?: BadgeVariant;
+ size?: BadgeSize;
showAddButton?: boolean;
}) {
const docTags = useDocTags(props.entityId, props.entityType);
@@ -461,6 +472,8 @@ export function InlineFetchedEntityTagsPill(props: {
<InlineTagsPill
docTags={docTags}
class={props.class}
+ variant={props.variant}
+ size={props.size}
showPlaceholder={props.entityType === EntityType.TASK}
showAddButton={props.showAddButton}
/>
diff --git a/apps/web/src/features/property/tags/SidebarTagsSection.tsx b/apps/web/src/features/property/tags/SidebarTagsSection.tsx
index 86ceb24171..44cef57f66 100644
--- a/apps/web/src/features/property/tags/SidebarTagsSection.tsx
+++ b/apps/web/src/features/property/tags/SidebarTagsSection.tsx
@@ -88,7 +88,7 @@ export function SidebarTagsSection(props: SidebarTagsSectionProps) {
</CollapsibleSection.Trigger>
<CollapsibleSection.Action
type="button"
- label="New tag"
+ aria-label="New tag"
onClick={() => setCreating(true)}
>
<PlusIcon class="size-3.5" />
diff --git a/apps/web/src/features/property/tags/TagEditorDialog.tsx b/apps/web/src/features/property/tags/TagEditorDialog.tsx
index 8c21be4dcd..a145ad3050 100644
--- a/apps/web/src/features/property/tags/TagEditorDialog.tsx
+++ b/apps/web/src/features/property/tags/TagEditorDialog.tsx
@@ -194,13 +194,14 @@ export function TagEditorDialog(props: {
{title()}
</Dialog.Title>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-sm"
disabled={pending()}
- label="Close"
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</CommandMenuShell.Header>
<CommandMenuShell.Body>
@@ -268,8 +269,7 @@ export function TagEditorDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="primary"
class="gap-3 "
disabled={!canSubmit() || pending()}
onClick={submit}
diff --git a/apps/web/src/features/property/tags/TagPicker.tsx b/apps/web/src/features/property/tags/TagPicker.tsx
index dd8a9909cb..bb85653b2d 100644
--- a/apps/web/src/features/property/tags/TagPicker.tsx
+++ b/apps/web/src/features/property/tags/TagPicker.tsx
@@ -68,7 +68,7 @@ function nextDisplayOrder(options: PropertyOptionResponse[]): number {
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';
+ 'size-5 shrink-0 p-0.5 text-ink-extra-muted opacity-0 group-hover:opacity-100 focus-visible:opacity-100';
export type TagPickerSourceProps =
| { docTags: DocTags; createDocTags?: never }
@@ -930,7 +930,6 @@ function TagPickerRow(props: {
type="button"
variant="ghost"
size="icon-sm"
- noTouchResize
tooltip="View tagged items"
aria-label={`View all items with tag ${label()}`}
class={tagActionButtonClass}
@@ -950,7 +949,6 @@ function TagPickerRow(props: {
type="button"
variant="ghost"
size="icon-sm"
- noTouchResize
tooltip="Edit tag"
aria-label={`Edit ${label()}`}
class={tagActionButtonClass}
diff --git a/apps/web/src/features/property/tags/TagPill.tsx b/apps/web/src/features/property/tags/TagPill.tsx
index abc54eb905..e03e2534c9 100644
--- a/apps/web/src/features/property/tags/TagPill.tsx
+++ b/apps/web/src/features/property/tags/TagPill.tsx
@@ -17,7 +17,7 @@ export type TagPillProps = TagPickerSourceProps & {
export function tagPillClasses(className?: string): string {
return badgeTriggerClasses({
variant: 'outline',
- size: 'sm',
+ size: 'xs',
class: cn('min-w-0 text-ink-muted transition-colors', className),
});
}
diff --git a/apps/web/src/features/property/tags/TagsRow.tsx b/apps/web/src/features/property/tags/TagsRow.tsx
index a4dd8cef51..5322543c11 100644
--- a/apps/web/src/features/property/tags/TagsRow.tsx
+++ b/apps/web/src/features/property/tags/TagsRow.tsx
@@ -9,7 +9,7 @@ import PlusIcon from '@icon/system/regular/plus.svg';
import XIcon from '@icon/system/regular/x.svg';
import { ContextMenu } from '@kobalte/core/context-menu';
import type { EntityType } from '@service-properties/generated/schemas/entityType';
-import { Badge, badgeTriggerClasses, Layer } from '@ui';
+import { Badge, badgeTriggerClasses, buttonClasses, Layer } from '@ui';
import { createSignal, For, Match, Show, Switch } from 'solid-js';
import { TagDot } from './TagDot';
import {
@@ -162,7 +162,7 @@ export function TagsRow(props: {
docTags={docTags}
triggerClass={badgeTriggerClasses({
variant: 'outline',
- size: 'sm',
+ size: 'xs',
class: 'm-px gap-1.5',
})}
triggerLabel="Add tags"
@@ -174,10 +174,10 @@ export function TagsRow(props: {
<Match when={true}>
<TagPicker
docTags={docTags}
- triggerClass={badgeTriggerClasses({
- variant: 'outline',
- size: 'sm',
- class: 'm-px size-6 p-0',
+ triggerClass={buttonClasses({
+ variant: 'secondary',
+ size: 'icon-xs',
+ class: 'm-px',
})}
triggerLabel="Add tags"
>
diff --git a/apps/web/src/features/property/utils/formatting.test.ts b/apps/web/src/features/property/utils/formatting.test.ts
index 1fb8b9a776..21d0e8e3e3 100644
--- a/apps/web/src/features/property/utils/formatting.test.ts
+++ b/apps/web/src/features/property/utils/formatting.test.ts
@@ -26,14 +26,15 @@ describe('formatTimeRange', () => {
).toBe('Oct 9, 2026');
});
+ // ICU versions differ on the space before AM/PM; the range content is the contract.
it('shows a timed range on one day as the day and both times', () => {
expect(
formatTimeRange({
allDay: false,
start: new Date(2026, 9, 9, 9),
end: new Date(2026, 9, 9, 17),
- })
- ).toBe('Oct 9, 9:00\u202fAM\u2009–\u20095:00\u202fPM');
+ }).replaceAll('\u202f', ' ')
+ ).toBe('Oct 9, 9:00 AM\u2009–\u20095:00 PM');
});
it('shows a timed range over days as each day with its time', () => {
@@ -42,7 +43,7 @@ describe('formatTimeRange', () => {
allDay: false,
start: new Date(2026, 9, 9, 9),
end: new Date(2026, 9, 13, 17),
- })
- ).toBe('Oct 9, 9:00\u202fAM\u2009–\u2009Oct 13, 5:00\u202fPM');
+ }).replaceAll('\u202f', ' ')
+ ).toBe('Oct 9, 9:00 AM\u2009–\u2009Oct 13, 5:00 PM');
});
});
diff --git a/apps/web/src/features/reminders/components/reminder-schedule-indicator.tsx b/apps/web/src/features/reminders/components/reminder-schedule-indicator.tsx
index 8636730113..dc4f0597d0 100644
--- a/apps/web/src/features/reminders/components/reminder-schedule-indicator.tsx
+++ b/apps/web/src/features/reminders/components/reminder-schedule-indicator.tsx
@@ -35,6 +35,7 @@ export function ReminderScheduleIndicator(props: {
open={focused() ? true : isTouchDevice() ? false : undefined}
>
<Button
+ variant="ghost"
size="icon-sm"
data-reminder-action
aria-label={props.label}
diff --git a/apps/web/src/features/reminders/email-reminder-status.test.tsx b/apps/web/src/features/reminders/email-reminder-status.test.tsx
index b2a38cd34a..96e6e84a18 100644
--- a/apps/web/src/features/reminders/email-reminder-status.test.tsx
+++ b/apps/web/src/features/reminders/email-reminder-status.test.tsx
@@ -22,8 +22,8 @@ vi.mock('@core/hotkey/utils', () => ({
runCommand: vi.fn(),
}));
vi.mock('@ui', () => ({
- Button: (props: { label: string; onClick: () => void }) => (
- <button onClick={props.onClick}>{props.label}</button>
+ Button: (props: { 'aria-label': string; onClick: () => void }) => (
+ <button onClick={props.onClick}>{props['aria-label']}</button>
),
}));
afterEach(cleanup);
diff --git a/apps/web/src/features/reminders/email-reminder-status.tsx b/apps/web/src/features/reminders/email-reminder-status.tsx
index ced045de30..09d1c5447e 100644
--- a/apps/web/src/features/reminders/email-reminder-status.tsx
+++ b/apps/web/src/features/reminders/email-reminder-status.tsx
@@ -4,7 +4,7 @@ import { TOKENS } from '@core/hotkey/tokens';
import type { EntityData } from '@entity';
import BellIcon from '@icon/system/regular/bell-simple.svg';
import { useEmailFollowupQuery } from '@queries/reminders/email-followup';
-import { Button } from '@ui';
+import { Button, ButtonGroup } from '@ui';
import { Show } from 'solid-js';
import { makeCreateReminderAction } from '../next-soup/actions/make-create-reminder-action';
@@ -12,6 +12,7 @@ import { makeCreateReminderAction } from '../next-soup/actions/make-create-remin
export function EmailReminderStatus(props: {
entity: EntityData;
onSaved?: () => void | Promise<void>;
+ grouped?: boolean;
}) {
const enabled = useFeatureFlag(enableReminders);
return (
@@ -23,6 +24,7 @@ export function EmailReminderStatus(props: {
function EmailReminderStatusContent(props: {
entity: EntityData;
onSaved?: () => void | Promise<void>;
+ grouped?: boolean;
}) {
const query = useEmailFollowupQuery(() => props.entity.id);
const reminder = () => (query.isSuccess ? query.data : undefined);
@@ -33,11 +35,16 @@ function EmailReminderStatusContent(props: {
? `Reminder set for ${new Date(reminder()!.remindAt).toLocaleString()}`
: 'Remind me';
const action = makeCreateReminderAction({ onEmailSaved: props.onSaved });
+ const Control = props.grouped ? ButtonGroup.Button : Button;
return (
- <Button
+ <Control
+ variant="ghost"
+ aria-label={label()}
+ tooltip={{
+ content: label(),
+ hotkey: TOKENS.entity.action.createReminder,
+ }}
size="icon-md"
- label={label()}
- hotkey={TOKENS.entity.action.createReminder}
onMouseDown={(event) => event.preventDefault()}
onClick={() => {
action.execute([props.entity]);
@@ -49,6 +56,6 @@ function EmailReminderStatusContent(props: {
'text-accent': pending(),
}}
/>
- </Button>
+ </Control>
);
}
diff --git a/apps/web/src/features/reviews-view/components/ReviewsBoard.tsx b/apps/web/src/features/reviews-view/components/ReviewsBoard.tsx
index 599d280d9a..e000558602 100644
--- a/apps/web/src/features/reviews-view/components/ReviewsBoard.tsx
+++ b/apps/web/src/features/reviews-view/components/ReviewsBoard.tsx
@@ -272,6 +272,7 @@ export function ReviewsBoard(props: {
<Show when={props.hasMore}>
<div class="p-3">
<Button
+ variant="secondary"
size="sm"
disabled={props.isLoadingMore}
onClick={props.onLoadMore}
diff --git a/apps/web/src/features/reviews-view/components/ReviewsControls.tsx b/apps/web/src/features/reviews-view/components/ReviewsControls.tsx
index a6000f54da..88dd3b5d85 100644
--- a/apps/web/src/features/reviews-view/components/ReviewsControls.tsx
+++ b/apps/web/src/features/reviews-view/components/ReviewsControls.tsx
@@ -19,7 +19,7 @@ import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import BoardIcon from '@icon/system/regular/kanban.svg';
import ListIcon from '@icon/system/regular/list-bullets.svg';
import { Accordion } from '@kobalte/core/accordion';
-import { Button } from '@ui';
+import { ButtonGroup } from '@ui';
import { createSignal, For } from 'solid-js';
import { UNKNOWN_ORIGIN } from '../reviews-filter';
import type {
@@ -191,6 +191,7 @@ export function ReviewsControls(
<>
<HeaderActionGroup label="Review filters">
<ListFilterDropdown
+ grouped
label="Filter pull requests"
activeCount={activeCount()}
groups={filterGroups(props)}
@@ -204,27 +205,30 @@ export function ReviewsControls(
/>
</HeaderActionGroup>
<HeaderActionGroup label="Review layout">
- <Button
+ <ButtonGroup.Button
+ aria-label="List"
+ tooltip="List"
variant="ghost"
- size="icon-md"
- label="List"
+ size="icon-sm"
aria-pressed={props.layout === 'list'}
onClick={() => props.onLayoutChange('list')}
>
<ListIcon class="size-4" />
- </Button>
- <Button
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Board"
+ tooltip="Board"
variant="ghost"
- size="icon-md"
- label="Board"
+ size="icon-sm"
aria-pressed={props.layout === 'board'}
onClick={() => props.onLayoutChange('board')}
>
<BoardIcon class="size-4" />
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
<HeaderActionGroup label="Review view options">
<ListSortDropdown
+ grouped
label="Sort pull requests"
value={props.sort}
options={SORT_OPTIONS}
diff --git a/apps/web/src/features/reviews-view/components/ReviewsList.tsx b/apps/web/src/features/reviews-view/components/ReviewsList.tsx
index a7d4dc7057..45d2489f0c 100644
--- a/apps/web/src/features/reviews-view/components/ReviewsList.tsx
+++ b/apps/web/src/features/reviews-view/components/ReviewsList.tsx
@@ -309,7 +309,7 @@ export function ReviewsList(props: ReviewsListProps) {
>
<span>Reviews couldn’t be loaded.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() => fireAndForget(source.retry(), 'reviews-view')}
>
@@ -466,7 +466,7 @@ export function ReviewsList(props: ReviewsListProps) {
>
<div class="flex justify-center p-3">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={source.isLoadingMore()}
onClick={() =>
diff --git a/apps/web/src/features/reviews-view/reviews-view.tsx b/apps/web/src/features/reviews-view/reviews-view.tsx
index 96344dfab2..b2891f42fe 100644
--- a/apps/web/src/features/reviews-view/reviews-view.tsx
+++ b/apps/web/src/features/reviews-view/reviews-view.tsx
@@ -463,7 +463,7 @@ function ReviewsRoot() {
>
<span>Reviews couldn’t be loaded.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(listSource.retry(), 'reviews-view')
diff --git a/apps/web/src/features/routines/components/routine-run-button.tsx b/apps/web/src/features/routines/components/routine-run-button.tsx
index 8f2dc1be64..d25a0501c3 100644
--- a/apps/web/src/features/routines/components/routine-run-button.tsx
+++ b/apps/web/src/features/routines/components/routine-run-button.tsx
@@ -2,7 +2,7 @@ import CaretDownIcon from '@icon/system/regular/caret-down.svg';
import CopyIcon from '@icon/system/regular/copy.svg';
import PauseIcon from '@icon/system/regular/pause.svg';
import PlayIcon from '@icon/system/regular/play.svg';
-import { Button, ButtonGroup, Dropdown } from '@ui';
+import { ButtonGroup, Dropdown } from '@ui';
import { Show } from 'solid-js';
/** Routine actions share the task's compact agent-action control. */
@@ -17,17 +17,23 @@ export function RoutineRunButton(props: {
}) {
return (
<Dropdown placement="bottom-end">
- <ButtonGroup variant="outline" size="sm" depth={2} label="Run routine">
- <Button
+ <ButtonGroup
+ finish="raised"
+ variant="secondary"
+ size="sm"
+ aria-label="Run routine"
+ >
+ <ButtonGroup.Button
variant="ghost"
disabled={props.runDisabled}
onClick={props.onRun}
>
<PlayIcon class="size-3" />
Run now
- </Button>
+ </ButtonGroup.Button>
<ButtonGroup.Divider />
<Dropdown.Trigger
+ as={ButtonGroup.Button}
variant="ghost"
size="icon-sm"
aria-label="Run options"
@@ -36,22 +42,24 @@ export function RoutineRunButton(props: {
</Dropdown.Trigger>
</ButtonGroup>
<Dropdown.Content portalScope="local">
- <Dropdown.Item
- disabled={props.activationDisabled}
- onSelect={() => props.onEnabled(!props.enabled)}
- >
- <Show when={props.enabled} fallback={<PlayIcon class="size-4" />}>
- <PauseIcon class="size-4" />
- </Show>
- {props.enabled ? 'Disable routine' : 'Enable routine'}
- </Dropdown.Item>
- <Dropdown.Item
- disabled={props.copyDisabled}
- onSelect={props.onCopyPrompt}
- >
- <CopyIcon class="size-4" />
- Copy prompt
- </Dropdown.Item>
+ <Dropdown.Group>
+ <Dropdown.Item
+ disabled={props.activationDisabled}
+ onSelect={() => props.onEnabled(!props.enabled)}
+ >
+ <Show when={props.enabled} fallback={<PlayIcon class="size-4" />}>
+ <PauseIcon class="size-4" />
+ </Show>
+ {props.enabled ? 'Disable routine' : 'Enable routine'}
+ </Dropdown.Item>
+ <Dropdown.Item
+ disabled={props.copyDisabled}
+ onSelect={props.onCopyPrompt}
+ >
+ <CopyIcon class="size-4" />
+ Copy prompt
+ </Dropdown.Item>
+ </Dropdown.Group>
</Dropdown.Content>
</Dropdown>
);
diff --git a/apps/web/src/features/routines/components/routine-schedule-settings.tsx b/apps/web/src/features/routines/components/routine-schedule-settings.tsx
index 647132500f..f2ee8e6ae3 100644
--- a/apps/web/src/features/routines/components/routine-schedule-settings.tsx
+++ b/apps/web/src/features/routines/components/routine-schedule-settings.tsx
@@ -185,7 +185,7 @@ function RecurringSettings(props: {
<For each={WEEKDAY_OPTIONS}>
{(day) => (
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="flex-1"
aria-pressed={props.trigger.daysOfWeek.includes(day.value)}
diff --git a/apps/web/src/features/routines/components/routine-triggers.tsx b/apps/web/src/features/routines/components/routine-triggers.tsx
index 761482f295..2852316984 100644
--- a/apps/web/src/features/routines/components/routine-triggers.tsx
+++ b/apps/web/src/features/routines/components/routine-triggers.tsx
@@ -433,7 +433,7 @@ function TriggerChip(
<Button variant="ghost" size="sm" onClick={() => setOpen(false)}>
Cancel
</Button>
- <Button variant="strong" size="sm" onClick={save}>
+ <Button variant="secondary" size="sm" onClick={save}>
{props.trigger ? 'Done' : 'Add trigger'}
</Button>
</div>
diff --git a/apps/web/src/features/routines/components/routines-list.tsx b/apps/web/src/features/routines/components/routines-list.tsx
index 4aaff9692b..7c63682375 100644
--- a/apps/web/src/features/routines/components/routines-list.tsx
+++ b/apps/web/src/features/routines/components/routines-list.tsx
@@ -59,7 +59,7 @@ export function RoutinesList(props: {
class="max-w-md flex-1"
hotkey="cmd+f"
/>
- <Button variant="outline" onClick={props.onCreate}>
+ <Button variant="secondary" onClick={props.onCreate}>
Create Routine
</Button>
</div>
diff --git a/apps/web/src/features/routines/components/template-card.tsx b/apps/web/src/features/routines/components/template-card.tsx
index 79ed684e33..9315f6802b 100644
--- a/apps/web/src/features/routines/components/template-card.tsx
+++ b/apps/web/src/features/routines/components/template-card.tsx
@@ -53,11 +53,15 @@ export function TemplateCard(props: {
: `Active for ${props.activeCount} people`}
</span>
<div class="flex gap-2">
- <Button variant="outline" size="sm" onClick={() => props.onView()}>
+ <Button variant="secondary" size="sm" onClick={() => props.onView()}>
View template
</Button>
<Show when={props.canActivate}>
- <Button variant="cta" size="sm" onClick={() => props.onActivate()}>
+ <Button
+ variant="primary"
+ size="sm"
+ onClick={() => props.onActivate()}
+ >
Activate for me
</Button>
</Show>
diff --git a/apps/web/src/features/routines/views/activate-template-dialog.tsx b/apps/web/src/features/routines/views/activate-template-dialog.tsx
index 7e8972f1c6..19732e207b 100644
--- a/apps/web/src/features/routines/views/activate-template-dialog.tsx
+++ b/apps/web/src/features/routines/views/activate-template-dialog.tsx
@@ -200,13 +200,13 @@ export function ActivateTemplateDialog(props: {
</p>
<div class="flex gap-2">
<Button
- variant="outline"
+ variant="secondary"
onClick={() => props.onOpenChange(false)}
>
Cancel
</Button>
<Button
- variant="cta"
+ variant="primary"
disabled={props.undecided > 0 || props.pending}
onClick={() => props.onActivate()}
>
diff --git a/apps/web/src/features/routines/views/routine-creator.tsx b/apps/web/src/features/routines/views/routine-creator.tsx
index 669e4a88f9..ce04d94a6e 100644
--- a/apps/web/src/features/routines/views/routine-creator.tsx
+++ b/apps/web/src/features/routines/views/routine-creator.tsx
@@ -42,12 +42,12 @@ export function RoutineCreatorView(props: {
<ClockIcon class="ml-2 size-4 text-ink-muted" />
<span class="flex-1 px-1 text-sm text-ink-muted">New routine</span>
<Button
- size="icon-composer"
+ size="icon-md"
variant="ghost"
aria-label="Close routine composer"
onClick={() => props.onClose()}
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</EntityComposer.Header>
<div class="min-h-0 overflow-y-auto px-2">
diff --git a/apps/web/src/features/routines/views/routine-detail.tsx b/apps/web/src/features/routines/views/routine-detail.tsx
index e06f91ef7d..9ea4c32b34 100644
--- a/apps/web/src/features/routines/views/routine-detail.tsx
+++ b/apps/web/src/features/routines/views/routine-detail.tsx
@@ -4,7 +4,7 @@ import CopyIcon from '@icon/system/regular/copy.svg';
import DotsIcon from '@icon/system/regular/dots-three.svg';
import ShareIcon from '@icon/system/regular/share-network.svg';
import TrashIcon from '@icon/system/regular/trash-simple.svg';
-import { Button, Dropdown } from '@ui';
+import { Button, ButtonGroup, Dropdown } from '@ui';
import { type Accessor, createSignal, Match, Show, Switch } from 'solid-js';
import { RoutineEditor } from '../components/routine-editor';
import { RoutineRunButton } from '../components/routine-run-button';
@@ -104,6 +104,7 @@ export function RoutineDetailView(props: {
isOwned() && (
<Dropdown placement="bottom-start">
<Dropdown.Trigger
+ as={ButtonGroup.Button}
variant="ghost"
size="icon-sm"
aria-label="Routine actions"
@@ -111,23 +112,25 @@ export function RoutineDetailView(props: {
<DotsIcon class="size-5" />
</Dropdown.Trigger>
<Dropdown.Content portalScope="local">
- <Dropdown.Item
- disabled={!state() || props.source.duplicationPending()}
- onSelect={() => props.source.duplicate()}
- >
- <CopyIcon class="size-4" />
- Duplicate
- </Dropdown.Item>
- <Dropdown.Item onSelect={props.onShareTemplate}>
- <ShareIcon class="size-4" />
- Share as template
- </Dropdown.Item>
- <Show when={isOwned()}>
- <Dropdown.Item onSelect={props.onDelete}>
- <TrashIcon class="size-4" />
- Delete
+ <Dropdown.Group>
+ <Dropdown.Item
+ disabled={!state() || props.source.duplicationPending()}
+ onSelect={() => props.source.duplicate()}
+ >
+ <CopyIcon class="size-4" />
+ Duplicate
+ </Dropdown.Item>
+ <Dropdown.Item onSelect={props.onShareTemplate}>
+ <ShareIcon class="size-4" />
+ Share as template
</Dropdown.Item>
- </Show>
+ <Show when={isOwned()}>
+ <Dropdown.Item onSelect={props.onDelete}>
+ <TrashIcon class="size-4" />
+ Delete
+ </Dropdown.Item>
+ </Show>
+ </Dropdown.Group>
</Dropdown.Content>
</Dropdown>
)
@@ -136,7 +139,7 @@ export function RoutineDetailView(props: {
<Show when={routine().templateId}>
{(templateId) => (
<Button
- variant="accent"
+ variant="primary"
size="sm"
onClick={() => props.onOpenTemplate(templateId())}
>
diff --git a/apps/web/src/features/routines/views/routine-history.tsx b/apps/web/src/features/routines/views/routine-history.tsx
index 48e22e352d..3c8c7423eb 100644
--- a/apps/web/src/features/routines/views/routine-history.tsx
+++ b/apps/web/src/features/routines/views/routine-history.tsx
@@ -356,7 +356,10 @@ export function RoutineHistory(props: RoutineHistoryProps): JSX.Element {
</ListLayoutProvider>
<Show when={props.records.length > visibleCount()}>
<div class="flex justify-center p-3">
- <Button onClick={() => setVisibleCount((count) => count + 50)}>
+ <Button
+ variant="secondary"
+ onClick={() => setVisibleCount((count) => count + 50)}
+ >
Load more runs
</Button>
</div>
diff --git a/apps/web/src/features/routines/views/routine-template-view.tsx b/apps/web/src/features/routines/views/routine-template-view.tsx
index 6b13ce48e6..1eab6f4ea1 100644
--- a/apps/web/src/features/routines/views/routine-template-view.tsx
+++ b/apps/web/src/features/routines/views/routine-template-view.tsx
@@ -71,7 +71,7 @@ export function RoutineTemplateView(props: {
/>
<Show when={props.canActivate}>
<Button
- variant="cta"
+ variant="primary"
size="md"
class="ml-auto shrink-0"
onClick={() => props.onActivate()}
diff --git a/apps/web/src/features/routines/views/share-template-dialog.tsx b/apps/web/src/features/routines/views/share-template-dialog.tsx
index a33b87402d..67e4038f7e 100644
--- a/apps/web/src/features/routines/views/share-template-dialog.tsx
+++ b/apps/web/src/features/routines/views/share-template-dialog.tsx
@@ -184,7 +184,7 @@ export function ShareTemplateDialog(props: {
<ActionDialogShell.Footer class="justify-between">
<Show when={props.template} fallback={<span />}>
<div class="flex flex-wrap gap-2">
- <Button variant="outline" onClick={() => props.onCopyLink()}>
+ <Button variant="secondary" onClick={() => props.onCopyLink()}>
<LinkIcon />
Copy template link
</Button>
@@ -198,7 +198,7 @@ export function ShareTemplateDialog(props: {
</div>
</Show>
<Button
- variant="cta"
+ variant="primary"
disabled={props.pending || props.template === undefined}
onClick={() => props.onShare()}
>
diff --git a/apps/web/src/features/saved-views/components/saved-view-dialog.tsx b/apps/web/src/features/saved-views/components/saved-view-dialog.tsx
index f08b31107e..dd50b877ce 100644
--- a/apps/web/src/features/saved-views/components/saved-view-dialog.tsx
+++ b/apps/web/src/features/saved-views/components/saved-view-dialog.tsx
@@ -35,9 +35,8 @@ function SharingInfo() {
as={Button}
variant="ghost"
size="icon-xs"
- label="About team sharing"
- tooltip={SHARING_DESCRIPTION}
- tooltipDisabled={open()}
+ aria-label="About team sharing"
+ tooltip={{ content: SHARING_DESCRIPTION, disabled: open() }}
onKeyDown={closeOnEscape}
>
<InfoIcon class="size-3.5" />
@@ -133,7 +132,7 @@ export function SavedViewForm(
</Button>
<Button
type="submit"
- variant="strong"
+ variant="primary"
disabled={props.pending || !name().trim()}
>
{props.pending ? 'Saving…' : (props.submitLabel ?? 'Save view')}
diff --git a/apps/web/src/features/saved-views/components/saved-view-list.tsx b/apps/web/src/features/saved-views/components/saved-view-list.tsx
index 401c0f51b8..266ff0c8cd 100644
--- a/apps/web/src/features/saved-views/components/saved-view-list.tsx
+++ b/apps/web/src/features/saved-views/components/saved-view-list.tsx
@@ -42,7 +42,8 @@ function Header(props: {
{(onCreate) => (
<CollapsibleSection.Action
ref={props.createButtonRef}
- label={t('viewMenus.newSavedView')}
+ aria-label={t('viewMenus.newSavedView')}
+ tooltip={t('viewMenus.newSavedView')}
onClick={onCreate()}
>
<PlusIcon class="size-3.5" />
@@ -149,7 +150,8 @@ export function SavedViewListRow(props: {
<Dropdown placement="bottom-end">
<Dropdown.Trigger
as={ViewSidebar.Control}
- label={t('viewMenus.viewActions', { name: props.view.name })}
+ aria-label={t('viewMenus.viewActions', { name: props.view.name })}
+ tooltip={t('viewMenus.viewActions', { name: props.view.name })}
>
<DotsIcon class="size-4" />
</Dropdown.Trigger>
diff --git a/apps/web/src/features/scheduling/browser-test/fixture.tsx b/apps/web/src/features/scheduling/browser-test/fixture.tsx
index f58ce644ce..22213ee03c 100644
--- a/apps/web/src/features/scheduling/browser-test/fixture.tsx
+++ b/apps/web/src/features/scheduling/browser-test/fixture.tsx
@@ -1,6 +1,6 @@
import { macroDarkTheme } from '../../theme/themes/macro-dark';
import { macroLightTheme } from '../../theme/themes/macro-light';
-import { themeCssVars } from '../../theme/utils/themeColorTokens';
+import { themeCssVars } from '../../theme/utils/themeCssVars';
import { BookingReceiptView } from '../views/booking-receipt-view';
import { FixtureCalendars } from './calendars';
import '@fontsource-variable/inter';
@@ -78,6 +78,7 @@ function Fixture() {
isDark ? '#171717' : '#ffffff'
);
document.documentElement.style.colorScheme = isDark ? 'dark' : 'light';
+ document.documentElement.dataset.themeLight = String(!isDark);
};
onMount(() => applyTheme(false));
const [screen, setScreen] = createSignal<
diff --git a/apps/web/src/features/scheduling/calendar-actions.tsx b/apps/web/src/features/scheduling/calendar-actions.tsx
index 8ca3e81ac8..31c89b8dd4 100644
--- a/apps/web/src/features/scheduling/calendar-actions.tsx
+++ b/apps/web/src/features/scheduling/calendar-actions.tsx
@@ -55,7 +55,9 @@ function Actions(props: { sidebar?: boolean; compact?: boolean }) {
return (
<Dropdown placement={props.sidebar ? 'bottom-start' : 'bottom-end'}>
<Dropdown.Trigger
- variant={props.compact ? 'outline' : 'ghost'}
+ aria-label="Booking links"
+ tooltip="Booking links"
+ variant={props.compact ? 'secondary' : 'ghost'}
size={props.sidebar || props.compact ? 'md' : 'lg'}
class={
props.sidebar
@@ -64,14 +66,13 @@ function Actions(props: { sidebar?: boolean; compact?: boolean }) {
? 'shrink-0 px-2 text-sm'
: 'shrink-0 px-2 text-sm lg:px-3'
}
- label="Booking links"
>
<Show
when={props.sidebar}
fallback={<LinkIcon class="size-5 mobile:size-6 lg:size-4" />}
>
<ViewSidebar.Icon>
- <LinkIcon />
+ <LinkIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</ViewSidebar.Icon>
</Show>
<span
diff --git a/apps/web/src/features/scheduling/components/availability-exception-dialog.tsx b/apps/web/src/features/scheduling/components/availability-exception-dialog.tsx
index 1a87038fcd..76a85e126f 100644
--- a/apps/web/src/features/scheduling/components/availability-exception-dialog.tsx
+++ b/apps/web/src/features/scheduling/components/availability-exception-dialog.tsx
@@ -124,7 +124,7 @@ export function AvailabilityExceptionDialog(props: {
Cancel
</Button>
<Button
- variant="cta"
+ variant="primary"
size="lg"
aria-label={
props.dates.length > 1
diff --git a/apps/web/src/features/scheduling/components/availability-hours-editor.tsx b/apps/web/src/features/scheduling/components/availability-hours-editor.tsx
index b1a047cc18..9667b3141a 100644
--- a/apps/web/src/features/scheduling/components/availability-hours-editor.tsx
+++ b/apps/web/src/features/scheduling/components/availability-hours-editor.tsx
@@ -93,9 +93,10 @@ export function AvailabilityHoursEditor(props: {
onChange={(mode) => update(index, { mode })}
/>
<Button
+ aria-label={`Remove range ${index + 1}`}
+ tooltip={`Remove range ${index + 1}`}
variant="ghost"
size="icon-sm"
- label={`Remove range ${index + 1}`}
onClick={() => remove(index)}
>
<Trash class="size-4" />
@@ -171,7 +172,7 @@ export function AvailabilityHoursEditor(props: {
</div>
<Button
ref={addButton}
- variant="outline"
+ variant="secondary"
size="sm"
class="shrink-0 self-start"
disabled={!nextRange()}
diff --git a/apps/web/src/features/scheduling/components/availability-panel.tsx b/apps/web/src/features/scheduling/components/availability-panel.tsx
index 5f7afc2d13..d9f66fd114 100644
--- a/apps/web/src/features/scheduling/components/availability-panel.tsx
+++ b/apps/web/src/features/scheduling/components/availability-panel.tsx
@@ -328,10 +328,11 @@ export function AvailabilityPanel(props: {
<Show when={props.canEdit}>
<Dropdown>
<Dropdown.Trigger
+ aria-label={`Actions for ${schedule.name}`}
+ tooltip={`Actions for ${schedule.name}`}
ref={actionsButton}
variant="ghost"
size="icon-sm"
- label={`Actions for ${schedule.name}`}
disabled={props.saving}
class="shrink-0 touch:hidden"
>
@@ -439,7 +440,7 @@ export function AvailabilityPanel(props: {
/>
<Show when={props.canEdit}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={props.saving}
onClick={(event) =>
@@ -546,11 +547,12 @@ function SchedulePreview(props: {
modal={false}
>
<Popover.Trigger
+ aria-label={`Preview ${props.schedule.name}`}
+ tooltip={`Preview ${props.schedule.name}`}
as={Button}
ref={setTrigger}
variant="ghost"
size="sm"
- label={`Preview ${props.schedule.name}`}
>
<Eye class="size-3.5" />
Preview
diff --git a/apps/web/src/features/scheduling/components/availability-topbar.tsx b/apps/web/src/features/scheduling/components/availability-topbar.tsx
index 23b1b2cb07..4da0c69b76 100644
--- a/apps/web/src/features/scheduling/components/availability-topbar.tsx
+++ b/apps/web/src/features/scheduling/components/availability-topbar.tsx
@@ -14,9 +14,10 @@ export function AvailabilityTopBar(props: {
<div class="flex min-w-0 items-center gap-2">
<Show when={props.editing}>
<Button
+ aria-label="Back to availability"
+ tooltip="Back to availability"
variant="ghost"
size="icon-sm"
- label="Back to availability"
disabled={props.disabled}
onClick={props.onBack}
>
@@ -33,9 +34,9 @@ export function AvailabilityTopBar(props: {
</ViewSidebar.Title>
<Show when={!props.editing}>
<Button
+ aria-label="About availability"
variant="ghost"
size="icon-sm"
- label="About availability"
tooltip="Set your available hours and make exceptions for specific dates."
>
<Info class="size-4 text-ink-muted" />
diff --git a/apps/web/src/features/scheduling/components/booking-card.tsx b/apps/web/src/features/scheduling/components/booking-card.tsx
index 95411c9f16..33793323a2 100644
--- a/apps/web/src/features/scheduling/components/booking-card.tsx
+++ b/apps/web/src/features/scheduling/components/booking-card.tsx
@@ -371,11 +371,14 @@ export function BookingCard(props: {
<div class="col-start-1 col-end-3 row-start-3 flex min-w-0 items-center justify-end gap-2 self-start @min-[42rem]/bookings:col-start-3 @min-[42rem]/bookings:col-end-4 @min-[42rem]/bookings:row-start-2">
<Dropdown>
<Dropdown.Trigger
+ aria-label={`Options for ${props.booking.name}`}
+ tooltip={{
+ content: `Options for ${props.booking.name}`,
+ disabled: true,
+ }}
variant="ghost"
size="icon-md"
- label={`Options for ${props.booking.name}`}
class="touch:hidden"
- tooltipDisabled
>
<Dots class="size-4" />
</Dropdown.Trigger>
@@ -392,10 +395,7 @@ export function BookingCard(props: {
href={url()}
target="_blank"
rel="noopener noreferrer"
- class={buttonClasses({
- variant: 'outline',
- size: 'md',
- })}
+ class={buttonClasses({ variant: 'secondary', size: 'md' })}
>
<External aria-hidden="true" class="size-3.5" />
Join meeting
@@ -408,7 +408,7 @@ export function BookingCard(props: {
}
>
<Button
- variant="strong"
+ variant="secondary"
size="md"
disabled={!!props.busyId}
onClick={() => props.onApprove(props.booking.id)}
diff --git a/apps/web/src/features/scheduling/components/booking-details-dialog.tsx b/apps/web/src/features/scheduling/components/booking-details-dialog.tsx
index da16c8b792..dd85139e16 100644
--- a/apps/web/src/features/scheduling/components/booking-details-dialog.tsx
+++ b/apps/web/src/features/scheduling/components/booking-details-dialog.tsx
@@ -145,11 +145,11 @@ export function BookingDetailsDialog(props: {
Booking details
</Dialog.Title>
<Button
+ aria-label="Close booking details"
+ tooltip={{ content: 'Close booking details', disabled: true }}
type="button"
variant="ghost"
size="icon-sm"
- label="Close booking details"
- tooltipDisabled
onClick={close}
>
<X aria-hidden="true" class="size-4" />
@@ -344,7 +344,7 @@ export function BookingDetailsDialog(props: {
</Button>
<Show when={!past()}>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="@max-[22rem]/booking-details:px-1.5 @max-[22rem]/booking-details:text-xs"
disabled={!!props.busyId}
@@ -361,7 +361,7 @@ export function BookingDetailsDialog(props: {
target="_blank"
rel="noopener noreferrer"
class={buttonClasses({
- variant: 'outline',
+ variant: 'secondary',
size: 'md',
class:
'@max-[22rem]/booking-details:gap-1 @max-[22rem]/booking-details:px-1.5 @max-[22rem]/booking-details:text-xs',
@@ -378,7 +378,7 @@ export function BookingDetailsDialog(props: {
}
>
<Button
- variant="strong"
+ variant="secondary"
size="md"
class="@max-[22rem]/booking-details:px-1.5 @max-[22rem]/booking-details:text-xs"
disabled={!!props.busyId}
diff --git a/apps/web/src/features/scheduling/components/booking-duration-input.tsx b/apps/web/src/features/scheduling/components/booking-duration-input.tsx
index d7829c3492..749e2bc54d 100644
--- a/apps/web/src/features/scheduling/components/booking-duration-input.tsx
+++ b/apps/web/src/features/scheduling/components/booking-duration-input.tsx
@@ -45,8 +45,10 @@ export function BookingDurationInput(props: {
};
return (
<ButtonGroup
+ finish="raised"
+ variant="secondary"
size="lg"
- class="h-9 w-auto rounded-lg border-edge-frame data-[orientation=horizontal]:rounded-lg has-[[data-slot=input-group-control]]:rounded-lg has-[[data-slot=input-group-control][aria-invalid=true]]:border-failure"
+ class="h-9 w-auto rounded-lg data-[orientation=horizontal]:rounded-lg has-[[data-slot=input-group-control]]:rounded-lg has-[[data-slot=input-group-control][aria-invalid=true]]:border-failure"
>
<For each={['hours', 'minutes'] as const}>
{(part) => (
diff --git a/apps/web/src/features/scheduling/components/booking-host-selector.tsx b/apps/web/src/features/scheduling/components/booking-host-selector.tsx
index 3889efa780..455072346c 100644
--- a/apps/web/src/features/scheduling/components/booking-host-selector.tsx
+++ b/apps/web/src/features/scheduling/components/booking-host-selector.tsx
@@ -214,7 +214,7 @@ export function BookingHostSelector(props: {
<Combobox.Trigger
as={Button}
ref={trigger}
- variant="outline"
+ variant="secondary"
aria-label="Team hosts"
aria-invalid={props.invalid ? true : undefined}
aria-describedby={props.descriptionId}
diff --git a/apps/web/src/features/scheduling/components/booking-page-editor.tsx b/apps/web/src/features/scheduling/components/booking-page-editor.tsx
index 5d85cb0c62..21846d4a9a 100644
--- a/apps/web/src/features/scheduling/components/booking-page-editor.tsx
+++ b/apps/web/src/features/scheduling/components/booking-page-editor.tsx
@@ -1,7 +1,7 @@
import { ListHeader } from '@app/components/view-shell/ListHeader';
import { HeaderActionGroup } from '@components/app/HeaderActionGroup';
import { createResizeObserver } from '@solid-primitives/resize-observer';
-import { Button, Tabs } from '@ui';
+import { ButtonGroup, Tabs } from '@ui';
import { createSignal, type JSX, Show } from 'solid-js';
import type { PublicProfile } from '../core/types';
import { Field, TextArea, TextInput } from './fields';
@@ -43,7 +43,7 @@ export function BookingPageEditor(props: {
<div class="pointer-events-auto flex items-center gap-2 touch:rounded-lg touch:bg-panel">
<HeaderActionGroup label="Booking page changes">
<Show when={props.canEdit && props.hasChanges}>
- <Button
+ <ButtonGroup.Button
type="button"
variant="ghost"
aria-label="Revert booking page changes"
@@ -51,18 +51,18 @@ export function BookingPageEditor(props: {
onClick={props.onRevert}
>
Revert
- </Button>
+ </ButtonGroup.Button>
</Show>
- <Button
+ <ButtonGroup.Button
type="submit"
- variant="strong"
+ variant="primary"
aria-label={
props.saving ? 'Saving booking page' : 'Save booking page'
}
disabled={!props.canEdit || !props.hasChanges || props.saving}
>
{props.saving ? 'Saving…' : 'Save'}
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
</div>
</Show>
diff --git a/apps/web/src/features/scheduling/components/booking-page-leave-dialog.tsx b/apps/web/src/features/scheduling/components/booking-page-leave-dialog.tsx
index 7a771cce7f..3f9c30fa42 100644
--- a/apps/web/src/features/scheduling/components/booking-page-leave-dialog.tsx
+++ b/apps/web/src/features/scheduling/components/booking-page-leave-dialog.tsx
@@ -55,7 +55,7 @@ export function BookingPageLeaveDialog(props: {
</Button>
<Button
type="button"
- variant="cta"
+ variant="primary"
disabled={props.pending || !props.canSave}
onClick={props.onSave}
>
diff --git a/apps/web/src/features/scheduling/components/booking-picker.tsx b/apps/web/src/features/scheduling/components/booking-picker.tsx
index 9b1676ea33..9fd2359cf6 100644
--- a/apps/web/src/features/scheduling/components/booking-picker.tsx
+++ b/apps/web/src/features/scheduling/components/booking-picker.tsx
@@ -257,7 +257,7 @@ export function BookingPicker(props: {
</For>
<Button
type="submit"
- variant="strong"
+ variant="primary"
disabled={flow.submitting() || props.preview}
>
{props.preview
@@ -292,18 +292,20 @@ export function BookingPicker(props: {
</span>
<div class="flex gap-1">
<Button
+ aria-label="Previous month"
+ tooltip="Previous month"
type="button"
variant="ghost"
- label="Previous month"
disabled={month() <= currentMonth()}
onClick={() => shiftMonth(-1)}
>
‹
</Button>
<Button
+ aria-label="Next month"
+ tooltip="Next month"
type="button"
variant="ghost"
- label="Next month"
onClick={() => shiftMonth(1)}
>
›
@@ -325,7 +327,9 @@ export function BookingPicker(props: {
{(d) => (
<Button
type="button"
- variant={date() === dateKey(d) ? 'strong' : 'ghost'}
+ variant={
+ date() === dateKey(d) ? 'secondary' : 'ghost'
+ }
class="h-auto w-full aspect-square"
aria-pressed={date() === dateKey(d)}
disabled={dateKey(d) < today()}
@@ -383,7 +387,7 @@ export function BookingPicker(props: {
{(slot) => (
<Button
type="button"
- variant="outline"
+ variant="secondary"
onClick={() => flow.select(slot.startsAt)}
>
{new Date(slot.startsAt).toLocaleTimeString([], {
diff --git a/apps/web/src/features/scheduling/components/booking-value-input.tsx b/apps/web/src/features/scheduling/components/booking-value-input.tsx
index eaa706a8e0..aac0664633 100644
--- a/apps/web/src/features/scheduling/components/booking-value-input.tsx
+++ b/apps/web/src/features/scheduling/components/booking-value-input.tsx
@@ -144,7 +144,8 @@ export function BookingValueInput(props: {
<NumberUnitInput.DecrementTrigger
size="icon-lg"
class="rounded-lg"
- label={`Decrease ${props.label.toLowerCase()}`}
+ aria-label={`Decrease ${props.label.toLowerCase()}`}
+ tooltip={`Decrease ${props.label.toLowerCase()}`}
/>
</NumberUnitInput.Controls>
</Show>
@@ -248,7 +249,8 @@ export function BookingValueInput(props: {
<NumberUnitInput.IncrementTrigger
size="icon-lg"
class="rounded-lg"
- label={`Increase ${props.label.toLowerCase()}`}
+ aria-label={`Increase ${props.label.toLowerCase()}`}
+ tooltip={`Increase ${props.label.toLowerCase()}`}
/>
</NumberUnitInput.Controls>
</Show>
diff --git a/apps/web/src/features/scheduling/components/bookings-date-range.tsx b/apps/web/src/features/scheduling/components/bookings-date-range.tsx
index 179b9db89c..494b03c19e 100644
--- a/apps/web/src/features/scheduling/components/bookings-date-range.tsx
+++ b/apps/web/src/features/scheduling/components/bookings-date-range.tsx
@@ -106,7 +106,7 @@ export function BookingsDateRange(props: {
Cancel
</MobileDrawer.Close>
</Show>
- <Button type="submit" variant="strong" size="md">
+ <Button type="submit" variant="secondary" size="md">
Apply dates
</Button>
</div>
diff --git a/apps/web/src/features/scheduling/components/event-editor-progress.tsx b/apps/web/src/features/scheduling/components/event-editor-progress.tsx
index 9c5ac0471b..7856b92809 100644
--- a/apps/web/src/features/scheduling/components/event-editor-progress.tsx
+++ b/apps/web/src/features/scheduling/components/event-editor-progress.tsx
@@ -50,11 +50,10 @@ export function EventEditorStepMenu(props: {
overflowPadding={16}
>
<Dropdown.Trigger
+ tooltip="Jump to step"
type="button"
variant="ghost"
size="icon-md"
- glass={false}
- label="Jump to step"
aria-label={`Jump to step, current step ${props.step + 1} of ${EVENT_EDITOR_STEPS.length}`}
disabled={props.disabled}
class="text-xl font-medium leading-snug tracking-wide text-ink"
diff --git a/apps/web/src/features/scheduling/components/event-editor.tsx b/apps/web/src/features/scheduling/components/event-editor.tsx
index c198a51fdc..c5fa0e6618 100644
--- a/apps/web/src/features/scheduling/components/event-editor.tsx
+++ b/apps/web/src/features/scheduling/components/event-editor.tsx
@@ -114,10 +114,11 @@ function QuestionField(props: {
onChange={(required) => props.onUpdate({ required })}
/>
<Button
+ aria-label={`Remove question ${props.index + 1}`}
+ tooltip={`Remove question ${props.index + 1}`}
type="button"
size="icon-sm"
variant="ghost"
- label={`Remove question ${props.index + 1}`}
disabled={props.disabled}
onClick={props.onRemove}
>
@@ -313,12 +314,13 @@ export function EventEditor(props: EventEditorProps) {
onOpenChange={setLinkOpen}
>
<Popover.Trigger
+ aria-label="Edit link"
+ tooltip="Edit link"
as={Button}
ref={setLinkTrigger}
type="button"
size="icon-xs"
variant="ghost"
- label="Edit link"
class="shrink-0 -mt-0.5 text-ink-muted aria-invalid:ring-2 aria-invalid:ring-failure/40"
aria-invalid={error('slug') ? true : undefined}
aria-describedby={
@@ -573,10 +575,11 @@ export function EventEditor(props: EventEditorProps) {
Team scheduling
</h4>
<Button
+ aria-label="Reset team settings"
+ tooltip="Reset team settings"
type="button"
variant="ghost"
size="icon-sm"
- label="Reset team settings"
disabled={
props.saving ||
props.step !== 'location' ||
@@ -830,7 +833,7 @@ export function EventEditor(props: EventEditorProps) {
<div class="flex min-w-0 max-w-full flex-col items-end gap-2">
<Button
type="submit"
- variant="cta"
+ variant="primary"
size="lg"
disabled={props.saving}
aria-invalid={primaryError() ? true : undefined}
diff --git a/apps/web/src/features/scheduling/components/event-outcomes-chart.tsx b/apps/web/src/features/scheduling/components/event-outcomes-chart.tsx
index f49ac69335..e973a5fa77 100644
--- a/apps/web/src/features/scheduling/components/event-outcomes-chart.tsx
+++ b/apps/web/src/features/scheduling/components/event-outcomes-chart.tsx
@@ -1,6 +1,6 @@
import HashIcon from '@icon/system/regular/hash.svg';
import PercentIcon from '@icon/system/regular/percent.svg';
-import { Button, ButtonGroup } from '@ui';
+import { ButtonGroup } from '@ui';
import { arc, type PieArcDatum, pie } from 'd3-shape';
import { createMemo, createSignal, For, Show } from 'solid-js';
import type {
@@ -92,25 +92,27 @@ export function EventOutcomesChart(props: { rows: InsightOutcomeRow[] }) {
</div>
<div class="min-w-0 w-full flex-1">
<div class="mb-4 flex justify-end">
- <ButtonGroup>
- <Button
+ <ButtonGroup finish="raised" variant="secondary">
+ <ButtonGroup.Button
+ aria-label="Show counts"
+ tooltip="Show counts"
type="button"
size="icon-md"
- label="Show counts"
aria-pressed={display() === 'count'}
onClick={() => setDisplay('count')}
>
<HashIcon class="size-4" />
- </Button>
- <Button
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Show percentages"
+ tooltip="Show percentages"
type="button"
size="icon-md"
- label="Show percentages"
aria-pressed={display() === 'percent'}
onClick={() => setDisplay('percent')}
>
<PercentIcon class="size-4" />
- </Button>
+ </ButtonGroup.Button>
</ButtonGroup>
</div>
<ul
diff --git a/apps/web/src/features/scheduling/components/event-review.tsx b/apps/web/src/features/scheduling/components/event-review.tsx
index 72bc3f0b47..b28b1ddf9e 100644
--- a/apps/web/src/features/scheduling/components/event-review.tsx
+++ b/apps/web/src/features/scheduling/components/event-review.tsx
@@ -137,10 +137,11 @@ export function EventReview(props: {
</span>
<Show when={props.onCopyLink}>
<Button
+ aria-label="Copy booking link"
+ tooltip="Copy booking link"
type="button"
variant="ghost"
size="icon-sm"
- label="Copy booking link"
disabled={props.saving || copying() || !props.onCopyLink}
aria-invalid={copyError() ? true : undefined}
aria-describedby={copyError() ? copyErrorId : undefined}
diff --git a/apps/web/src/features/scheduling/components/event-types-panel.tsx b/apps/web/src/features/scheduling/components/event-types-panel.tsx
index f79659ecae..76ac0b3485 100644
--- a/apps/web/src/features/scheduling/components/event-types-panel.tsx
+++ b/apps/web/src/features/scheduling/components/event-types-panel.tsx
@@ -391,12 +391,15 @@ export function EventTypesPanel(props: {
</Badge>
<Dropdown>
<Dropdown.Trigger
+ aria-label={`Options for ${event.title}`}
+ tooltip={{
+ content: `Options for ${event.title}`,
+ disabled: true,
+ }}
variant="ghost"
size="icon-sm"
- label={`Options for ${event.title}`}
class="shrink-0 touch:hidden"
disabled={props.saving}
- tooltipDisabled
>
<Dots class="size-4" />
</Dropdown.Trigger>
@@ -427,7 +430,7 @@ export function EventTypesPanel(props: {
Keep
</Button>
<Button
- variant="outline"
+ variant="secondary"
disabled={props.saving}
onClick={() => props.onDelete(event)}
>
diff --git a/apps/web/src/features/scheduling/components/insights-host-filter.tsx b/apps/web/src/features/scheduling/components/insights-host-filter.tsx
index 9e6c0af1b9..d5e67ec5bb 100644
--- a/apps/web/src/features/scheduling/components/insights-host-filter.tsx
+++ b/apps/web/src/features/scheduling/components/insights-host-filter.tsx
@@ -178,7 +178,7 @@ export function InsightsHostFilter(props: {
<Combobox.Control>
<Combobox.Trigger
as={Button}
- variant="outline"
+ variant="secondary"
ref={trigger}
aria-label="Filter hosts"
tabIndex={0}
diff --git a/apps/web/src/features/scheduling/components/insights-panel.tsx b/apps/web/src/features/scheduling/components/insights-panel.tsx
index 87513df6e3..8fdea09c72 100644
--- a/apps/web/src/features/scheduling/components/insights-panel.tsx
+++ b/apps/web/src/features/scheduling/components/insights-panel.tsx
@@ -2,7 +2,7 @@ import { ListHeader } from '@app/components/view-shell/ListHeader';
import { HeaderActionGroup } from '@components/app/HeaderActionGroup';
import DownloadIcon from '@icon/system/regular/download-simple.svg';
import InfoIcon from '@icon/system/regular/info.svg';
-import { Button, cn, Tooltip } from '@ui';
+import { Button, ButtonGroup, cn, Tooltip } from '@ui';
import { createMemo, createSignal, For, type JSX, Show } from 'solid-js';
import {
type InsightHostOption,
@@ -418,6 +418,7 @@ export function InsightsPanel(props: {
!props.loading && !props.error && current().bookings.length > 0;
const filters = () => (
<SchedulingFilters
+ grouped
title="Insights filters"
activeCount={Number(eventId() !== 'all') + Number(hostId() !== 'all')}
onClear={() => {
@@ -490,14 +491,16 @@ export function InsightsPanel(props: {
<Show when={props.headerTitle}>
<ListHeader title={props.headerTitle}>
<HeaderActionGroup label="Insights actions">
- <Button
- size="icon-md"
- label="Download CSV"
+ <ButtonGroup.Button
+ aria-label="Download CSV"
+ tooltip="Download CSV"
+ variant="ghost"
+ size="icon-sm"
onClick={download}
disabled={!canDownload()}
>
- <DownloadIcon />
- </Button>
+ <DownloadIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ </ButtonGroup.Button>
{filters()}
</HeaderActionGroup>
</ListHeader>
@@ -514,7 +517,7 @@ export function InsightsPanel(props: {
{props.scopeSelector}
<div class="ml-auto flex min-w-0 items-center gap-2">
<Button
- variant="outline"
+ variant="secondary"
onClick={download}
disabled={!canDownload()}
>
@@ -549,7 +552,7 @@ export function InsightsPanel(props: {
class="flex flex-wrap items-center justify-between gap-4 rounded-xl border border-edge-muted p-5"
>
<p class="text-sm">{props.error}</p>
- <Button variant="outline" onClick={props.onRetry}>
+ <Button variant="secondary" onClick={props.onRetry}>
Try again
</Button>
</div>
diff --git a/apps/web/src/features/scheduling/components/insights-range-selector.tsx b/apps/web/src/features/scheduling/components/insights-range-selector.tsx
index 762f779e1f..a62d3541db 100644
--- a/apps/web/src/features/scheduling/components/insights-range-selector.tsx
+++ b/apps/web/src/features/scheduling/components/insights-range-selector.tsx
@@ -108,7 +108,7 @@ export function InsightsRangeSelector(props: {
<div class="flex items-center gap-2">
<Button
type="button"
- variant="outline"
+ variant="secondary"
class="flex-1"
onClick={() => {
setFrom('');
@@ -118,7 +118,7 @@ export function InsightsRangeSelector(props: {
>
Clear
</Button>
- <Button type="submit" variant="cta" class="flex-1">
+ <Button type="submit" variant="primary" class="flex-1">
Apply dates
</Button>
</div>
diff --git a/apps/web/src/features/scheduling/components/reschedule-form.tsx b/apps/web/src/features/scheduling/components/reschedule-form.tsx
index 225a7942eb..e9236e94f6 100644
--- a/apps/web/src/features/scheduling/components/reschedule-form.tsx
+++ b/apps/web/src/features/scheduling/components/reschedule-form.tsx
@@ -134,7 +134,7 @@ export function RescheduleForm(props: {
</Show>
<div class="flex gap-2">
<Button
- variant="strong"
+ variant="primary"
type="submit"
disabled={!selected() || saving() || loading()}
>
diff --git a/apps/web/src/features/scheduling/components/schedule-editor.tsx b/apps/web/src/features/scheduling/components/schedule-editor.tsx
index da3084fda6..0e834dbb01 100644
--- a/apps/web/src/features/scheduling/components/schedule-editor.tsx
+++ b/apps/web/src/features/scheduling/components/schedule-editor.tsx
@@ -17,9 +17,10 @@ export function ScheduleEditorForm(props: {
<Show when={!props.topBarOwned}>
<header class="flex shrink-0 items-center gap-3">
<Button
+ aria-label="Back to availability"
+ tooltip="Back to availability"
variant="ghost"
size="icon-md"
- label="Back to availability"
disabled={props.saving}
onClick={props.onCancel}
>
@@ -47,7 +48,7 @@ export function ScheduleEditorForm(props: {
<Button
data-save-schedule
type="submit"
- variant="cta"
+ variant="primary"
disabled={props.saving || props.editingRange}
>
{props.saving ? 'Saving…' : 'Save schedule'}
diff --git a/apps/web/src/features/scheduling/components/scheduling-drawer-header.tsx b/apps/web/src/features/scheduling/components/scheduling-drawer-header.tsx
index 1713ec8fef..57c0ceacec 100644
--- a/apps/web/src/features/scheduling/components/scheduling-drawer-header.tsx
+++ b/apps/web/src/features/scheduling/components/scheduling-drawer-header.tsx
@@ -17,10 +17,10 @@ export function SchedulingDrawerHeader(props: {
{props.title}
</MobileDrawer.Title>
<Button
+ aria-label={props.closeLabel}
+ tooltip={{ content: props.closeLabel, disabled: true }}
variant="ghost"
size="icon-sm"
- label={props.closeLabel}
- tooltipDisabled
class="shrink-0 rounded-full bg-ink/6"
onClick={props.onClose}
>
diff --git a/apps/web/src/features/scheduling/components/scheduling-filters.tsx b/apps/web/src/features/scheduling/components/scheduling-filters.tsx
index bc1a35c263..2d16be9f70 100644
--- a/apps/web/src/features/scheduling/components/scheduling-filters.tsx
+++ b/apps/web/src/features/scheduling/components/scheduling-filters.tsx
@@ -3,10 +3,11 @@ import { isTouchDevice } from '@core/mobile/isTouchDevice';
import Funnel from '@icon/system/regular/funnel-simple.svg';
import { Accordion } from '@kobalte/core/accordion';
import { Popover } from '@kobalte/core/popover';
-import { Button } from '@ui';
+import { Button, ButtonGroup } from '@ui';
import { createSignal, type JSX, Show } from 'solid-js';
export function SchedulingFilters(props: {
+ grouped?: boolean;
title: string;
activeCount: number;
onClear: () => void;
@@ -15,20 +16,28 @@ export function SchedulingFilters(props: {
}) {
const [trigger, setTrigger] = createSignal<HTMLButtonElement>();
const [mobileOpen, setMobileOpen] = createSignal(false);
+ const triggerSize = () => {
+ if (props.activeCount > 0) return props.grouped ? 'sm' : 'md';
+ return props.grouped ? 'icon-sm' : 'icon-md';
+ };
return (
<Show
when={isTouchDevice()}
fallback={
<Popover placement="bottom-end" gutter={8} modal={false} fitViewport>
<Popover.Trigger
- as={Button}
+ aria-label={props.title}
+ tooltip={props.title}
+ as={props.grouped ? ButtonGroup.Button : Button}
ref={setTrigger}
type="button"
variant="ghost"
- size={props.activeCount > 0 ? 'md' : 'icon-md'}
- label={props.title}
+ size={triggerSize()}
>
- <Funnel aria-hidden="true" />
+ <Funnel
+ class="size-4 touch:size-6 shrink-0 pointer-events-none"
+ aria-hidden="true"
+ />
<Show when={props.activeCount > 0}>
<span class="flex h-4 min-w-4 items-center justify-center rounded-full bg-accent px-1 text-xxs font-medium leading-none text-surface">
{props.activeCount}
diff --git a/apps/web/src/features/scheduling/views/booking-receipt-view.tsx b/apps/web/src/features/scheduling/views/booking-receipt-view.tsx
index 52b362087f..a183ae49bd 100644
--- a/apps/web/src/features/scheduling/views/booking-receipt-view.tsx
+++ b/apps/web/src/features/scheduling/views/booking-receipt-view.tsx
@@ -125,7 +125,7 @@ export function BookingReceiptView(props: {
>
<div class="mt-6 flex flex-wrap gap-2 border-t border-edge-muted pt-6">
<Button
- variant="outline"
+ variant="secondary"
disabled={busy()}
onClick={() => {
setConfirm(false);
@@ -135,7 +135,7 @@ export function BookingReceiptView(props: {
Reschedule
</Button>
<Button
- variant="outline"
+ variant="secondary"
disabled={busy()}
onClick={() => {
setRescheduling(false);
@@ -146,7 +146,7 @@ export function BookingReceiptView(props: {
</Button>
<Show when={confirm()}>
<Button
- variant="strong"
+ variant="secondary"
disabled={busy()}
onClick={() => fireAndForget(cancel(), 'scheduling')}
>
diff --git a/apps/web/src/features/scheduling/views/booking-workspace-view.tsx b/apps/web/src/features/scheduling/views/booking-workspace-view.tsx
index 536445f362..06a9905911 100644
--- a/apps/web/src/features/scheduling/views/booking-workspace-view.tsx
+++ b/apps/web/src/features/scheduling/views/booking-workspace-view.tsx
@@ -12,14 +12,14 @@ import CalendarIcon from '@icon/system/regular/calendar-blank.svg';
import ChartIcon from '@icon/system/regular/chart-bar.svg';
import CheckIcon from '@icon/system/regular/check.svg';
import ClockIcon from '@icon/system/regular/clock.svg';
+import PageIcon from '@icon/system/regular/globe.svg';
import InfoIcon from '@icon/system/regular/info.svg';
import LinkIcon from '@icon/system/regular/link.svg';
import PlusIcon from '@icon/system/regular/plus.svg';
import SparkleIcon from '@icon/system/regular/sparkle.svg';
import UserIcon from '@icon/system/regular/user.svg';
import UsersIcon from '@icon/system/regular/users.svg';
-import PageIcon from '@phosphor/browser.svg';
-import { Button, cn, pressHandlers } from '@ui';
+import { Button, ButtonGroup, cn, pressHandlers } from '@ui';
import {
batch,
createEffect,
@@ -385,10 +385,11 @@ export function BookingWorkspaceView(props: {
createAgentAction={
<Show when={search.tab === 'links' && owner()?.scope().canEdit}>
<Button
+ aria-label="Create with agent"
+ tooltip="Create with agent"
variant="ghost"
size="icon-md"
class="size-10 rounded-full"
- label="Create with agent"
disabled={
isSaving() || startingAgent() || !owner()?.source.profile()
}
@@ -419,8 +420,9 @@ export function BookingWorkspaceView(props: {
<Show when={owner()?.scope().canEdit}>
<Show when={search.tab === 'links'}>
<HeaderActionGroup label="Booking link tools">
- <Button
- label="Create with agent"
+ <ButtonGroup.Button
+ aria-label="Create with agent"
+ tooltip="Create with agent"
variant="ghost"
size="icon-md"
disabled={
@@ -433,7 +435,7 @@ export function BookingWorkspaceView(props: {
}
>
<SparkleIcon class="size-4" />
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
</Show>
<ViewCreateButton
@@ -483,9 +485,9 @@ export function BookingWorkspaceView(props: {
{tab().label}
</ViewSidebar.Title>
<Button
+ aria-label={`About ${tab().label.toLowerCase()}`}
variant="ghost"
size="icon-sm"
- label={`About ${tab().label.toLowerCase()}`}
tooltip={tab().description}
>
<InfoIcon class="size-4 text-ink-muted" />
@@ -545,9 +547,9 @@ export function BookingWorkspaceView(props: {
<Show when={owner()?.scope().canEdit}>
<div class="ml-auto flex shrink-0 items-center gap-2 touch:hidden">
<Button
- label="Create with agent"
- tooltipDisabled
- variant="outline"
+ aria-label="Create with agent"
+ tooltip={{ content: 'Create with agent', disabled: true }}
+ variant="secondary"
size="md"
disabled={
!owner()?.source.profile() ||
@@ -562,9 +564,9 @@ export function BookingWorkspaceView(props: {
<span>Create with agent</span>
</Button>
<Button
- label="New booking link"
- tooltipDisabled
- variant="strong"
+ aria-label="New booking link"
+ tooltip={{ content: 'New booking link', disabled: true }}
+ variant="secondary"
size="md"
disabled={
!owner()?.source.profile() ||
@@ -592,9 +594,9 @@ export function BookingWorkspaceView(props: {
<Show when={owner()?.scope().canEdit}>
<div class="ml-auto shrink-0 touch:hidden">
<Button
- label="New schedule"
+ aria-label="New schedule"
tooltip="New schedule"
- variant="strong"
+ variant="secondary"
size="md"
disabled={isSaving() || !owner()?.source.profile()}
onClick={(event) =>
diff --git a/apps/web/src/features/scheduling/views/bookings-view.tsx b/apps/web/src/features/scheduling/views/bookings-view.tsx
index 313c5c9975..818c1a7c49 100644
--- a/apps/web/src/features/scheduling/views/bookings-view.tsx
+++ b/apps/web/src/features/scheduling/views/bookings-view.tsx
@@ -48,6 +48,7 @@ export function BookingsView(props: {
let panel: HTMLDivElement | undefined;
const filters = () => (
<SchedulingFilters
+ grouped
title="Booking filters"
activeCount={state.eventId() === 'all' ? 0 : 1}
onClear={state.clearFilters}
diff --git a/apps/web/src/features/scheduling/views/event-details-view.tsx b/apps/web/src/features/scheduling/views/event-details-view.tsx
index 6b26a39e13..273a0437c4 100644
--- a/apps/web/src/features/scheduling/views/event-details-view.tsx
+++ b/apps/web/src/features/scheduling/views/event-details-view.tsx
@@ -68,9 +68,8 @@ export function EventDetailsDialog(props: EventDetailsDialogProps) {
const editButton = () => (
<Button
type="button"
- variant="strong"
+ variant="secondary"
size="lg"
- depth={2}
class="touch:w-full"
disabled={props.saving}
onClick={edit}
@@ -100,11 +99,14 @@ export function EventDetailsDialog(props: EventDetailsDialogProps) {
Booking link details
</Dialog.Title>
<Button
+ aria-label="Close booking link details"
+ tooltip={{
+ content: 'Close booking link details',
+ disabled: true,
+ }}
type="button"
variant="ghost"
size="icon-sm"
- label="Close booking link details"
- tooltipDisabled
onClick={close}
>
<X class="size-4" aria-hidden="true" />
diff --git a/apps/web/src/features/scheduling/views/owner-settings-section.tsx b/apps/web/src/features/scheduling/views/owner-settings-section.tsx
index 1a154991d0..67377e13d8 100644
--- a/apps/web/src/features/scheduling/views/owner-settings-section.tsx
+++ b/apps/web/src/features/scheduling/views/owner-settings-section.tsx
@@ -69,9 +69,9 @@ export function OwnerSettingsSection(props: {
}
const pageShare = () => (
<CopyButton
- variant="outline"
+ aria-label="Copy link"
+ variant="secondary"
size="md"
- label="Copy link"
tooltip={
source.profile()?.revision
? undefined
diff --git a/apps/web/src/features/scheduling/views/schedule-fields-view.tsx b/apps/web/src/features/scheduling/views/schedule-fields-view.tsx
index 89ba0a5f33..0d4a58b009 100644
--- a/apps/web/src/features/scheduling/views/schedule-fields-view.tsx
+++ b/apps/web/src/features/scheduling/views/schedule-fields-view.tsx
@@ -244,9 +244,10 @@ export function ScheduleFields(props: {
/>
</div>
<Button
+ aria-label={`${hours().windows.length || hours().unavailableWindows.length ? 'Edit' : 'Add'} ${day} hours`}
+ tooltip={`${hours().windows.length || hours().unavailableWindows.length ? 'Edit' : 'Add'} ${day} hours`}
variant="ghost"
size="icon-sm"
- label={`${hours().windows.length || hours().unavailableWindows.length ? 'Edit' : 'Add'} ${day} hours`}
aria-expanded={active()}
disabled={locked()}
onClick={(event) =>
@@ -286,7 +287,7 @@ export function ScheduleFields(props: {
Cancel
</Button>
<Button
- variant="cta"
+ variant="primary"
size="sm"
disabled={!draft().ranges}
onClick={apply}
@@ -318,9 +319,10 @@ export function ScheduleFields(props: {
</div>
<div class="flex items-center gap-1">
<Button
+ aria-label="Previous month"
+ tooltip="Previous month"
variant="ghost"
size="icon-sm"
- label="Previous month"
disabled={locked()}
onClick={() =>
changeMonth(shiftAvailabilityMonth(monthDate(), -1))
@@ -334,9 +336,10 @@ export function ScheduleFields(props: {
onChange={changeMonth}
/>
<Button
+ aria-label="Next month"
+ tooltip="Next month"
variant="ghost"
size="icon-sm"
- label="Next month"
disabled={locked()}
onClick={() =>
changeMonth(shiftAvailabilityMonth(monthDate(), 1))
@@ -391,12 +394,12 @@ export function ScheduleFields(props: {
</div>
<Button
ref={addExceptionButton}
- variant="outline"
+ variant="secondary"
size="sm"
disabled={locked()}
- onClick={(event) =>
- openDates([monthDate()], event.currentTarget)
- }
+ onClick={(
+ event: MouseEvent & { currentTarget: HTMLButtonElement }
+ ) => openDates([monthDate()], event.currentTarget)}
>
<Plus class="size-4" />
Add exception
@@ -438,9 +441,10 @@ export function ScheduleFields(props: {
</Show>
</div>
<Button
+ aria-label={`Edit exception ${formatAvailabilityDate(override.date)}`}
+ tooltip={`Edit exception ${formatAvailabilityDate(override.date)}`}
variant="ghost"
size="icon-sm"
- label={`Edit exception ${formatAvailabilityDate(override.date)}`}
disabled={locked()}
onClick={(event) =>
openDates([override.date], event.currentTarget)
@@ -449,9 +453,9 @@ export function ScheduleFields(props: {
<Pencil class="size-4" />
</Button>
<Button
+ aria-label={`Remove exception ${formatAvailabilityDate(override.date)}`}
variant="ghost"
size="icon-sm"
- label={`Remove exception ${formatAvailabilityDate(override.date)}`}
tooltip="Remove this exception and use weekly hours again"
disabled={locked()}
onClick={() => {
diff --git a/apps/web/src/features/scheduling/views/scheduling-mobile-header.tsx b/apps/web/src/features/scheduling/views/scheduling-mobile-header.tsx
index 32abca99e5..d8b3df2395 100644
--- a/apps/web/src/features/scheduling/views/scheduling-mobile-header.tsx
+++ b/apps/web/src/features/scheduling/views/scheduling-mobile-header.tsx
@@ -45,14 +45,15 @@ export function SchedulingMobileHeader(props: {
<div class="flex h-10 min-w-0 items-center gap-2">
<HeaderIsland class="gap-0 px-1">
<Button
- square
- size="sm"
+ variant="ghost"
+ aria-label="Back to availability"
+ tooltip="Back to availability"
+ size="icon-sm"
class="p-1 touch:active:bg-transparent"
- label="Back to availability"
disabled={props.disabled}
onClick={props.onBack}
>
- <CaretLeft />
+ <CaretLeft class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</HeaderIsland>
<HeaderIsland>
@@ -88,12 +89,13 @@ export function SchedulingMobileHeader(props: {
finalFocusEl={ownerTrigger()}
>
<MobileDrawer.Trigger
+ aria-label={`Calendar owner: ${ownerName()}`}
+ tooltip={`Calendar owner: ${ownerName()}`}
ref={setOwnerTrigger}
as={Button}
variant="ghost"
size="sm"
class="h-10 min-w-0 rounded-full px-2"
- label={`Calendar owner: ${ownerName()}`}
disabled={props.disabled}
>
<Show
@@ -147,10 +149,11 @@ export function SchedulingMobileHeader(props: {
</MobileDrawer>
<Show when={props.createLabel}>
<Button
+ aria-label={props.createLabel}
+ tooltip={props.createLabel}
variant="ghost"
size="icon-md"
class="size-10 rounded-full"
- label={props.createLabel}
disabled={props.createDisabled}
onClick={(event) => props.onCreate(event.currentTarget)}
>
diff --git a/apps/web/src/features/settings/Account.tsx b/apps/web/src/features/settings/Account.tsx
index ef0f6bd1b7..363a3fc39f 100644
--- a/apps/web/src/features/settings/Account.tsx
+++ b/apps/web/src/features/settings/Account.tsx
@@ -296,15 +296,13 @@ function ProfilePictureRow(props: { userId: string }) {
<div class="pt-3 justify-end items-center gap-3 inline-flex">
<Button
variant="ghost"
- depth={3}
disabled={isRemoving()}
onClick={() => setShowRemoveConfirmModal(false)}
>
Cancel
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="secondary"
disabled={isRemoving()}
onClick={handleRemove}
>
@@ -504,12 +502,7 @@ export function Account() {
label="Log out"
description="Sign out of Macro on this device."
>
- <Button
- variant="outline"
- size="sm"
- depth={3}
- onClick={() => logout()}
- >
+ <Button variant="secondary" size="sm" onClick={() => logout()}>
<SignOutIcon class="size-4" />
Log out
</Button>
@@ -526,7 +519,6 @@ export function Account() {
<Button
variant="danger"
size="sm"
- depth={3}
onClick={() => {
resetDeleteFlow();
setShowDeleteModal(true);
@@ -617,7 +609,6 @@ export function Account() {
<div class="pt-3 justify-end items-center gap-3 inline-flex">
<Button
variant="ghost"
- depth={3}
onClick={() => {
setShowDeleteModal(false);
resetDeleteFlow();
@@ -626,8 +617,7 @@ export function Account() {
Cancel
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="secondary"
onClick={() => {
setShowDeleteConfirmModal(true);
setShowDeleteModal(false);
@@ -664,7 +654,6 @@ export function Account() {
<div class="pt-3 justify-end items-center gap-3 inline-flex">
<Button
variant="ghost"
- depth={3}
disabled={isDeleting()}
onClick={() => {
setShowDeleteConfirmModal(false);
@@ -675,7 +664,6 @@ export function Account() {
</Button>
<HoldButton
variant="danger"
- depth={3}
duration={DELETE_HOLD_MS}
disabled={isDeleting()}
onConfirm={deleteAccountHandler}
@@ -883,7 +871,7 @@ function BundleUpdateRow() {
</span>
<Show when={action()}>
{(a) => (
- <Button variant="accent" size="sm" depth={3} onClick={a().action}>
+ <Button variant="primary" size="sm" onClick={a().action}>
{a().label}
</Button>
)}
@@ -904,9 +892,8 @@ function NativeUpdateRow() {
</span>
<Show when={tauri?.nativeUpdateStatus().status === 'Ready'}>
<Button
- variant="accent"
+ variant="primary"
size="sm"
- depth={3}
onClick={() =>
fireAndForget(tauri?.restartNativeUpdate(), 'native-updates')
}
diff --git a/apps/web/src/features/settings/Admin.tsx b/apps/web/src/features/settings/Admin.tsx
index e88b8900d0..30648d2085 100644
--- a/apps/web/src/features/settings/Admin.tsx
+++ b/apps/web/src/features/settings/Admin.tsx
@@ -42,9 +42,8 @@ export function Admin() {
description="Local toggles for debugging — only visible to Macro staff."
actions={
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
disabled={!hasActiveSettings()}
onClick={clearAllDebugSettings}
>
diff --git a/apps/web/src/features/settings/Agents.tsx b/apps/web/src/features/settings/Agents.tsx
index a0c45785e7..ba8a3abb9f 100644
--- a/apps/web/src/features/settings/Agents.tsx
+++ b/apps/web/src/features/settings/Agents.tsx
@@ -346,11 +346,11 @@ export function Agents(props: {
</p>
</div>
<Button
- variant="cta"
+ variant="neutral"
size="sm"
onClick={() => setCreating(true)}
>
- <PlusIcon />
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Add agent
</Button>
</div>
@@ -523,7 +523,7 @@ function AgentRow(props: {
aria-label={`Message ${props.agent.name}`}
onClick={onMessage()}
>
- <ChatIcon />
+ <ChatIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Message
</Button>
)}
@@ -537,7 +537,7 @@ function AgentRow(props: {
aria-label={`Edit ${props.agent.name}`}
onClick={onEdit()}
>
- <PencilIcon />
+ <PencilIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Show>
@@ -551,7 +551,7 @@ function AgentRow(props: {
aria-label={`Delete ${props.agent.name}`}
onClick={onDelete()}
>
- <TrashIcon />
+ <TrashIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Show>
@@ -622,12 +622,12 @@ function AgentDeleteDialog(props: {
</Button>
<Button
type="button"
- variant="strong"
+ variant="secondary"
size="sm"
disabled={props.pending}
onClick={props.onConfirm}
>
- <TrashIcon />
+ <TrashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
{props.pending ? 'Deleting…' : 'Delete agent'}
</Button>
</Panel.Footer>
@@ -864,7 +864,7 @@ function AgentEditorPage(props: {
</p>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
aria-label={`Retry models for ${selectedHarness()?.name ?? 'this runtime'}`}
onClick={() =>
@@ -1086,7 +1086,8 @@ function AgentEditorPage(props: {
description="Name it, tell it what to do, and pick where it runs."
actions={
<Button variant="ghost" size="sm" onClick={close} disabled={busy()}>
- <ArrowLeftIcon /> Back
+ <ArrowLeftIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />{' '}
+ Back
</Button>
}
>
@@ -1150,12 +1151,12 @@ function AgentEditorPage(props: {
/>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
disabled={busy()}
onClick={() => avatarInputRef?.click()}
>
- <UploadIcon />
+ <UploadIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
{uploadingAvatar() ? 'Uploading…' : 'Upload'}
</Button>
</div>
@@ -1529,7 +1530,8 @@ function AgentEditorPage(props: {
disabled={busy()}
onClick={onDelete()}
>
- <TrashIcon /> Delete agent
+ <TrashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />{' '}
+ Delete agent
</Button>
)}
</Show>
@@ -1546,7 +1548,7 @@ function AgentEditorPage(props: {
<Button
type="submit"
form="agent-form"
- variant="strong"
+ variant="secondary"
size="sm"
disabled={!canCreate()}
>
diff --git a/apps/web/src/features/settings/ApiKeys.tsx b/apps/web/src/features/settings/ApiKeys.tsx
index 44cd7835f4..2f4953d4d8 100644
--- a/apps/web/src/features/settings/ApiKeys.tsx
+++ b/apps/web/src/features/settings/ApiKeys.tsx
@@ -59,12 +59,12 @@ export function ApiKeys() {
disabled={!atLimit()}
>
<Button
- variant="cta"
+ variant="neutral"
size="sm"
disabled={createDisabled()}
onClick={openCreate}
>
- <PlusIcon />
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Create key
</Button>
</Tooltip>
@@ -107,11 +107,11 @@ export function ApiKeys() {
</div>
<Button
class="mt-4"
- variant="cta"
+ variant="neutral"
size="sm"
onClick={openCreate}
>
- <PlusIcon />
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Create key
</Button>
</div>
@@ -203,9 +203,9 @@ function ApiKeyRow(props: {
</div>
</div>
<Button
+ aria-label={`Delete ${props.keyInfo.name}`}
variant="ghost"
size="icon-sm"
- label={`Delete ${props.keyInfo.name}`}
tooltip="Delete key"
disabled={props.deleting}
onClick={props.onDelete}
@@ -214,7 +214,7 @@ function ApiKeyRow(props: {
when={props.deleting}
fallback={<TrashIcon class="size-3.5 touch:size-4" />}
>
- <SpinnerIcon class="animate-spin" />
+ <SpinnerIcon class="animate-spin size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
</div>
@@ -275,14 +275,14 @@ function CreateApiKeyDialog(props: {
</Dialog.Title>
<div class="ml-auto">
<Button
+ tooltip="Close"
variant="ghost"
size="icon-sm"
- label="Close"
aria-label="Close"
disabled={props.pending}
onClick={close}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Panel.Header>
@@ -326,7 +326,7 @@ function CreateApiKeyDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="primary"
size="sm"
disabled={props.pending}
onClick={() => fireAndForget(submit(), 'api-key-settings')}
@@ -349,7 +349,7 @@ function CreateApiKeyDialog(props: {
<code class="font-mono">{USER_API_KEY_HEADER}</code>.
</div>
<div class="flex justify-end border-t border-edge-muted pt-4">
- <Button variant="strong" size="sm" onClick={close}>
+ <Button variant="secondary" size="sm" onClick={close}>
Done
</Button>
</div>
@@ -385,7 +385,7 @@ function ConfirmDialog(props: {
size="icon-sm"
disabled={props.pending}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="m-0 p-0 text-sm font-medium">
{props.title}
@@ -402,7 +402,7 @@ function ConfirmDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant={props.danger ? 'danger' : 'primary'}
disabled={props.pending}
onClick={props.onConfirm}
>
diff --git a/apps/web/src/features/settings/Appearance.tsx b/apps/web/src/features/settings/Appearance.tsx
index b6f8386b2a..32988a0a73 100644
--- a/apps/web/src/features/settings/Appearance.tsx
+++ b/apps/web/src/features/settings/Appearance.tsx
@@ -60,9 +60,9 @@ function CopyThemeButton(props: {
}) {
return (
<Button
+ aria-label={`Copy ${props.name}`}
variant="ghost"
size={props.size}
- label={`Copy ${props.name}`}
tooltip="Copy theme"
onPointerDown={(e) => e.stopPropagation()}
onPointerUp={(e) => e.stopPropagation()}
@@ -86,9 +86,9 @@ function CopyThemeButton(props: {
function EditThemeButton(props: { name: string; onEdit: () => void }) {
return (
<Button
+ aria-label={`Edit ${props.name}`}
variant="ghost"
size="icon-md"
- label={`Edit ${props.name}`}
tooltip="Edit theme"
onClick={(e) => {
e.preventDefault();
@@ -324,9 +324,10 @@ function InterfaceThemeSelect(props: {
<CopyThemeButton themeId={theme.id} name={theme.name} size="icon-xs" />
<Show when={editable}>
<Button
+ aria-label={`Edit ${theme.name}`}
+ tooltip={`Edit ${theme.name}`}
variant="ghost"
size="icon-xs"
- label={`Edit ${theme.name}`}
onPointerDown={(e) => e.stopPropagation()}
onPointerUp={(e) => e.stopPropagation()}
onClick={(e) => {
@@ -339,9 +340,10 @@ function InterfaceThemeSelect(props: {
<PencilIcon class="size-3 touch:size-3.5" />
</Button>
<Button
+ aria-label={`Delete ${theme.name}`}
+ tooltip={`Delete ${theme.name}`}
variant="ghost"
size="icon-xs"
- label={`Delete ${theme.name}`}
onPointerDown={(e) => e.stopPropagation()}
onPointerUp={(e) => e.stopPropagation()}
onClick={(e) => {
diff --git a/apps/web/src/features/settings/BotSettingsList.tsx b/apps/web/src/features/settings/BotSettingsList.tsx
index 63a921c647..af0d5ad0d2 100644
--- a/apps/web/src/features/settings/BotSettingsList.tsx
+++ b/apps/web/src/features/settings/BotSettingsList.tsx
@@ -68,8 +68,8 @@ export function BotSettingsList(props: {
title="Bots"
description="A bot is an account your program uses to read and send channel messages. Create a bot, add it to channels, then use its token with the Macro SDK to control it."
actions={
- <Button variant="cta" size="sm" onClick={props.onCreate}>
- <PlusIcon />
+ <Button variant="neutral" size="sm" onClick={props.onCreate}>
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Create bot
</Button>
}
@@ -103,11 +103,11 @@ export function BotSettingsList(props: {
</div>
<Button
class="mt-4"
- variant="cta"
+ variant="neutral"
size="sm"
onClick={props.onCreate}
>
- <PlusIcon />
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Create bot
</Button>
</div>
diff --git a/apps/web/src/features/settings/CursorConnectPage.tsx b/apps/web/src/features/settings/CursorConnectPage.tsx
index 79edd1f683..4c769667e8 100644
--- a/apps/web/src/features/settings/CursorConnectPage.tsx
+++ b/apps/web/src/features/settings/CursorConnectPage.tsx
@@ -90,7 +90,7 @@ export function CursorConnectPage(props: { onClose: () => void }) {
description="Run agents on your own Cursor subscription. Sessions run in Cursor Cloud and stream into Macro."
actions={
<Button variant="ghost" size="sm" onClick={props.onClose}>
- <ArrowLeftIcon />
+ <ArrowLeftIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Back
</Button>
}
@@ -236,7 +236,7 @@ export function CursorConnectPage(props: { onClose: () => void }) {
</Button>
<Button
type="submit"
- variant="cta"
+ variant="neutral"
size="sm"
disabled={!apiKey().trim() || saveKey.isPending}
>
@@ -247,7 +247,7 @@ export function CursorConnectPage(props: { onClose: () => void }) {
>
<Button
type="button"
- variant="cta"
+ variant="neutral"
size="sm"
onClick={props.onClose}
>
diff --git a/apps/web/src/features/settings/Email.tsx b/apps/web/src/features/settings/Email.tsx
index 1599eae702..44b743d999 100644
--- a/apps/web/src/features/settings/Email.tsx
+++ b/apps/web/src/features/settings/Email.tsx
@@ -179,9 +179,10 @@ export function EmailCard(
</Show>
<Show when={props.onOpenSettings}>
<UiButton
+ aria-label="Email settings"
+ tooltip="Email settings"
variant="ghost"
size="icon-md"
- label="Email settings"
onClick={props.onOpenSettings}
class="touch:min-h-11 touch:min-w-11"
>
@@ -298,9 +299,8 @@ export function EmailCard(
>
<Tooltip label="Add inbox">
<Button
- variant="outline"
+ variant="secondary"
size="md"
- depth={3}
aria-label="Add inbox"
onClick={onConnectEmail}
>
@@ -350,14 +350,10 @@ export function EmailCard(
</Show>
</Dialog.Description>
<div class="pt-3 justify-end items-center gap-3 inline-flex">
- <Button
- variant="ghost"
- depth={3}
- onClick={() => setRemoveTarget(null)}
- >
+ <Button variant="ghost" onClick={() => setRemoveTarget(null)}>
Cancel
</Button>
- <Button variant="strong" depth={3} onClick={handleRemoveInbox}>
+ <Button variant="secondary" onClick={handleRemoveInbox}>
Remove
</Button>
</div>
@@ -451,7 +447,7 @@ function DisabledPrimaryRow(props: { email: string; onEnable: () => void }) {
</div>
<span class="text-xs text-ink-muted">Sync disabled</span>
</div>
- <Button variant="outline" size="md" depth={3} onClick={props.onEnable}>
+ <Button variant="secondary" size="md" onClick={props.onEnable}>
Enable
</Button>
</div>
@@ -530,9 +526,8 @@ function InboxRow(props: {
<div class="flex max-w-full flex-wrap items-center gap-2 shrink-0">
<Show when={props.link.needs_reauth}>
<Button
- variant="accent"
+ variant="primary"
size="md"
- depth={3}
onClick={props.onReconnect}
aria-label={`Reconnect ${props.link.email_address}`}
>
@@ -545,9 +540,8 @@ function InboxRow(props: {
when={calendarUiEnabled() && props.link.needs_calendar_permission}
>
<Button
- variant="outline"
+ variant="secondary"
size="md"
- depth={3}
onClick={props.onEnableCalendar}
aria-label={`Enable calendar for ${props.link.email_address}`}
>
@@ -569,9 +563,8 @@ function InboxRow(props: {
>
<Tooltip label="Turn off calendar">
<Button
- variant="outline"
+ variant="secondary"
size="icon-sm"
- depth={3}
onClick={props.onTurnOffCalendar}
aria-label={`Turn off calendar for ${props.link.email_address}`}
>
@@ -582,9 +575,8 @@ function InboxRow(props: {
<Show when={ENABLE_INBOX_RESYNC}>
<Tooltip label="Force sync">
<Button
- variant="outline"
+ variant="secondary"
size="icon-sm"
- depth={3}
disabled={
props.resyncing ||
(ENABLE_INBOX_SYNC_STATUS &&
@@ -601,7 +593,6 @@ function InboxRow(props: {
<Button
variant="ghost"
size="md"
- depth={3}
onClick={props.onRemove}
aria-label={`Remove ${props.link.email_address}`}
>
diff --git a/apps/web/src/features/settings/Harness.tsx b/apps/web/src/features/settings/Harness.tsx
index 6646ec39fe..95e8ed74fa 100644
--- a/apps/web/src/features/settings/Harness.tsx
+++ b/apps/web/src/features/settings/Harness.tsx
@@ -134,11 +134,11 @@ export function Harness(
backLabel={props.backLabel ?? 'Agents'}
actions={
<Button
- variant="cta"
+ variant="neutral"
size="sm"
onClick={() => setPairingDialog({})}
>
- <PlusIcon />
+ <PlusIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
New runtime
</Button>
}
@@ -228,9 +228,8 @@ export function Harness(
/>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
disabled={
cursorApiKey().trim().length === 0 ||
saveCursorApiKey.isPending
@@ -270,7 +269,6 @@ export function Harness(
type="button"
variant="danger"
size="sm"
- depth={3}
class="shrink-0"
disabled={disconnectCursor.isPending}
onClick={handleDisconnectCursor}
@@ -413,7 +411,7 @@ function HarnessRemoveDialog(props: {
</Button>
<Button
type="button"
- variant="strong"
+ variant="secondary"
size="sm"
disabled={props.pending}
onClick={props.onConfirm}
diff --git a/apps/web/src/features/settings/Integrations.tsx b/apps/web/src/features/settings/Integrations.tsx
index 8a34df7619..d4b8a1e149 100644
--- a/apps/web/src/features/settings/Integrations.tsx
+++ b/apps/web/src/features/settings/Integrations.tsx
@@ -136,7 +136,6 @@ function AddServerForm(props: {
<Button
variant="ghost"
size="sm"
- depth={3}
onClick={() => {
reset();
props.onOpenChange(false);
@@ -145,9 +144,8 @@ function AddServerForm(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
size="sm"
- depth={3}
disabled={
!name().trim() || !url().trim() || addMutation.isPending
}
@@ -281,9 +279,8 @@ function ServerRow(props: { server: ServerResponse }) {
</span>
</Show>
<Button
- variant="accent"
+ variant="primary"
size="sm"
- depth={3}
disabled={authMutation.isPending}
onClick={handleAuth}
>
@@ -311,9 +308,8 @@ function ServerRow(props: { server: ServerResponse }) {
fallback={
<div class="flex items-center gap-1">
<Button
- variant="strong"
+ variant="secondary"
size="sm"
- depth={3}
disabled={deleteMutation.isPending}
onClick={handleDelete}
>
@@ -322,7 +318,6 @@ function ServerRow(props: { server: ServerResponse }) {
<Button
variant="ghost"
size="sm"
- depth={3}
onClick={() => setConfirmDelete(false)}
>
Cancel
@@ -331,9 +326,8 @@ function ServerRow(props: { server: ServerResponse }) {
}
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
tooltip="Remove"
onClick={() => setConfirmDelete(true)}
>
@@ -413,9 +407,8 @@ export function IntegrationsSection() {
description="Connect MCP servers to give Macro's agent access to the tools your team already uses."
actions={
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
onClick={() => setShowAddDialog(true)}
>
<PlusIcon class="size-4" />
@@ -428,9 +421,8 @@ export function IntegrationsSection() {
<div class="px-6 py-8 text-center text-sm text-ink-muted">
Failed to load integrations.
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
onClick={() => serversQuery.refetch()}
class="ml-2"
>
diff --git a/apps/web/src/features/settings/MobileApp.tsx b/apps/web/src/features/settings/MobileApp.tsx
index 398fc2e393..e6fa7fa410 100644
--- a/apps/web/src/features/settings/MobileApp.tsx
+++ b/apps/web/src/features/settings/MobileApp.tsx
@@ -45,9 +45,9 @@ export function MobileApp() {
<ArrowUpRightIcon class="size-3.5 opacity-70" />
</a>
<CopyButton
+ aria-label="Copy App Store link"
variant="ghost"
size="sm"
- label="Copy App Store link"
tooltip="Copy App Store link"
onClick={() => copy(APP_STORE_URL)}
>
diff --git a/apps/web/src/features/settings/MobileSettingsSheet.tsx b/apps/web/src/features/settings/MobileSettingsSheet.tsx
index ba896beec7..653bb25ebc 100644
--- a/apps/web/src/features/settings/MobileSettingsSheet.tsx
+++ b/apps/web/src/features/settings/MobileSettingsSheet.tsx
@@ -236,7 +236,7 @@ export function MobileSettingsSheet(props: MobileSettingsSheetProps) {
<p class="text-sm text-ink-muted">
{t('settingsNav.pageLoadFailed')}
</p>
- <Button onClick={reset}>
+ <Button variant="ghost" onClick={reset}>
{t('settingsNav.tryAgain')}
</Button>
</div>
@@ -263,7 +263,7 @@ export function MobileSettingsSheet(props: MobileSettingsSheetProps) {
<p role="status" class="text-sm text-ink-muted">
{t('settingsNav.sectionUnavailable')}
</p>
- <Button onClick={() => navigate()}>
+ <Button variant="ghost" onClick={() => navigate()}>
{t('settingsNav.backToSettings')}
</Button>
</div>
diff --git a/apps/web/src/features/settings/PipedreamAppPicker.tsx b/apps/web/src/features/settings/PipedreamAppPicker.tsx
index 1b4c98dcf4..a310fc1bc1 100644
--- a/apps/web/src/features/settings/PipedreamAppPicker.tsx
+++ b/apps/web/src/features/settings/PipedreamAppPicker.tsx
@@ -73,9 +73,8 @@ export function PipedreamAppPicker(props: {
<div class="px-4 py-4 text-center text-sm text-ink-muted">
Couldn't load the connector catalog.
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
onClick={() => catalog.query.refetch()}
class="ml-2"
>
@@ -114,9 +113,8 @@ export function PipedreamAppPicker(props: {
<Show when={catalog.query.hasNextPage}>
<div class="px-3 py-2 text-center">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
disabled={catalog.query.isFetchingNextPage}
onClick={() =>
fireAndForget(
@@ -255,7 +253,7 @@ function SelectedAppRow(props: {
aria-label={`Remove ${props.server.server_name}`}
onClick={() => props.onRemove()}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</IntegrationRow>
);
diff --git a/apps/web/src/features/settings/RuntimePairingPage.tsx b/apps/web/src/features/settings/RuntimePairingPage.tsx
index d024c9c1f6..6885c2e987 100644
--- a/apps/web/src/features/settings/RuntimePairingPage.tsx
+++ b/apps/web/src/features/settings/RuntimePairingPage.tsx
@@ -142,7 +142,7 @@ export function RuntimePairingPage(props: {
disabled={approveMutation.isPending}
onClick={props.onClose}
>
- <ArrowLeftIcon />
+ <ArrowLeftIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Back
</Button>
}
@@ -163,7 +163,7 @@ export function RuntimePairingPage(props: {
<div>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
onClick={tryAnotherCode}
>
@@ -326,7 +326,7 @@ export function RuntimePairingPage(props: {
<Match when={approved()}>
<Button
type="button"
- variant="cta"
+ variant="neutral"
size="sm"
onClick={props.onClose}
>
@@ -355,7 +355,7 @@ export function RuntimePairingPage(props: {
</Button>
<Button
type="button"
- variant="cta"
+ variant="neutral"
size="sm"
disabled={!canApprove()}
onClick={() => fireAndForget(approve(), 'runtime-pairing')}
@@ -384,7 +384,7 @@ export function RuntimePairingPage(props: {
</Button>
<Button
type="button"
- variant="cta"
+ variant="neutral"
size="sm"
disabled={codeInput().trim().length === 0}
onClick={lookUp}
diff --git a/apps/web/src/features/settings/Tags.tsx b/apps/web/src/features/settings/Tags.tsx
index ff4780e27e..626735023c 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="outline"
+ variant="secondary"
size="sm"
onClick={() => props.onCreate(props.scope)}
>
@@ -115,9 +115,9 @@ function TagListSection(props: {
<Show when={props.onShare}>
{(onShare) => (
<Button
+ aria-label={`Share ${optionLabel(option)} with team`}
variant="ghost"
size="icon-sm"
- label={`Share ${optionLabel(option)} with team`}
tooltip="Share with team"
disabled={
props.deleting ||
@@ -135,9 +135,9 @@ function TagListSection(props: {
)}
</Show>
<Button
+ aria-label={`Edit ${optionLabel(option)}`}
variant="ghost"
size="icon-sm"
- label={`Edit ${optionLabel(option)}`}
tooltip="Edit tag"
disabled={props.deleting}
onClick={() => props.onEdit(tag())}
@@ -145,9 +145,9 @@ function TagListSection(props: {
<PencilIcon class="size-3.5 touch:size-4" />
</Button>
<Button
+ aria-label={`Delete ${optionLabel(option)}`}
variant="ghost"
size="icon-sm"
- label={`Delete ${optionLabel(option)}`}
tooltip="Delete tag"
disabled={props.deleting}
onClick={() => props.onDelete(tag())}
@@ -190,7 +190,7 @@ function ConfirmDialog(props: {
size="icon-sm"
disabled={props.pending}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="m-0 p-0 text-sm font-medium">
{props.title}
@@ -207,7 +207,7 @@ function ConfirmDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={props.pending}
onClick={props.onConfirm}
>
@@ -313,12 +313,7 @@ export function Tags() {
title="Tags"
description="Manage personal labels and shared team labels."
actions={
- <Button
- variant="cta"
- size="sm"
- depth={3}
- onClick={() => openCreate('user')}
- >
+ <Button variant="neutral" size="sm" onClick={() => openCreate('user')}>
<PlusIcon class="size-4" />
New tag
</Button>
diff --git a/apps/web/src/features/settings/Team.tsx b/apps/web/src/features/settings/Team.tsx
index 2e12d67a3c..3f1176e5be 100644
--- a/apps/web/src/features/settings/Team.tsx
+++ b/apps/web/src/features/settings/Team.tsx
@@ -66,7 +66,7 @@ function InviteEntryRow(props: {
<Show when={props.showRemove}>
<Tooltip label="Remove">
<Button
- variant="outline"
+ variant="secondary"
size="icon-sm"
class="shrink-0 focus:border-accent"
tabIndex={0}
@@ -184,7 +184,7 @@ function InviteEmailsInput(props: {
</div>
</Show>
<Button
- variant="outline"
+ variant="secondary"
class="w-full justify-center focus:border-accent"
tabIndex={0}
disabled={!canAddRow()}
@@ -225,7 +225,7 @@ function UserInviteRow(props: {
</div>
<div class="flex items-center gap-2 shrink-0">
<Button
- variant="outline"
+ variant="secondary"
class="px-2 py-1"
disabled={props.isAccepting || props.isDeclining}
onClick={props.onDecline}
@@ -235,7 +235,7 @@ function UserInviteRow(props: {
</Show>
</Button>
<Button
- variant="accent"
+ variant="primary"
class="px-2 py-1"
disabled={props.isAccepting || props.isDeclining}
onClick={props.onAccept}
@@ -384,7 +384,7 @@ export function CreateTeamDialog(props: {
<Panel depth={2} class="max-h-[75vh] text-ink rounded-xl">
<Panel.Header class="px-2 gap-1">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
Create Team
@@ -432,7 +432,7 @@ export function CreateTeamDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={
createTeamMutation.isPending ||
!!teamNameError() ||
@@ -503,7 +503,7 @@ export function InviteToTeamDialog(props: {
<Panel depth={2} class="max-h-[75vh] text-ink rounded-xl">
<Panel.Header class="px-2 gap-1">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
Invite to Team
@@ -532,7 +532,7 @@ export function InviteToTeamDialog(props: {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={!hasValidInvites() || inviteToTeamMutation.isPending}
onClick={handleInvite}
>
@@ -570,7 +570,7 @@ function EmptyTeamState() {
Create a team to collaborate with others and manage access
together.
</p>
- <Button variant="accent" onClick={() => setShowCreateModal(true)}>
+ <Button variant="primary" onClick={() => setShowCreateModal(true)}>
<PlusIcon class="size-4" />
Create Team
</Button>
diff --git a/apps/web/src/features/settings/TeamGeneral.tsx b/apps/web/src/features/settings/TeamGeneral.tsx
index edb0e55e15..6499195399 100644
--- a/apps/web/src/features/settings/TeamGeneral.tsx
+++ b/apps/web/src/features/settings/TeamGeneral.tsx
@@ -57,7 +57,7 @@ function SaveCancelButtons(props: {
<div class="flex items-center gap-1 shrink-0">
<Tooltip label="Save">
<Button
- variant="accent"
+ variant="primary"
size="icon-sm"
disabled={props.saveDisabled}
onClick={props.onSave}
@@ -381,7 +381,7 @@ export function TeamGeneral(props: { team: TeamSummary }) {
hideDescriptionOnMobile
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={handleCopyGithubAutolinkUrl}
>
@@ -421,7 +421,7 @@ export function TeamGeneral(props: { team: TeamSummary }) {
<Panel depth={2} class="max-h-[75vh] text-ink rounded-xl">
<Panel.Header class="px-2 gap-1">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
Delete Team
@@ -456,7 +456,7 @@ export function TeamGeneral(props: { team: TeamSummary }) {
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
disabled={!canDeleteTeam() || deleteTeamMutation.isPending}
onClick={handleDeleteTeam}
>
diff --git a/apps/web/src/features/settings/TeamInviteLinkSection.tsx b/apps/web/src/features/settings/TeamInviteLinkSection.tsx
index d2172138cc..2325ca13f3 100644
--- a/apps/web/src/features/settings/TeamInviteLinkSection.tsx
+++ b/apps/web/src/features/settings/TeamInviteLinkSection.tsx
@@ -86,7 +86,7 @@ export function TeamInviteLinkSection(props: {
when={!unknown()}
fallback={
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="shrink-0"
onClick={() =>
@@ -98,7 +98,7 @@ export function TeamInviteLinkSection(props: {
}
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="shrink-0"
disabled={busy()}
diff --git a/apps/web/src/features/settings/TeamMembers.tsx b/apps/web/src/features/settings/TeamMembers.tsx
index 0b1f5ce31a..f990c7777d 100644
--- a/apps/web/src/features/settings/TeamMembers.tsx
+++ b/apps/web/src/features/settings/TeamMembers.tsx
@@ -94,6 +94,7 @@ function RoleSelect(props: {
)}
>
<Select.Trigger
+ variant="ghost"
as={Button}
class="rounded-xs px-1 py-0.5 text-xs -ml-1 data-expanded:bg-ink/10"
disabled={props.disabled}
@@ -382,9 +383,8 @@ export function TeamMembers(props: { team: TeamSummary }) {
{/* Inverted (black on light, white on dark) so inviting is the
page's primary action. */}
<Button
- variant="cta"
- glass={false}
- class="bg-ink text-[15px] text-surface"
+ variant="neutral"
+ class="text-[15px]"
onClick={() => setShowInviteModal(true)}
>
<PlusIcon class="size-4" />
diff --git a/apps/web/src/features/settings/browser-test/fixture.tsx b/apps/web/src/features/settings/browser-test/fixture.tsx
index c7852f22f1..3ceba9afac 100644
--- a/apps/web/src/features/settings/browser-test/fixture.tsx
+++ b/apps/web/src/features/settings/browser-test/fixture.tsx
@@ -12,7 +12,7 @@ import { createMemo, createSignal, For, onMount, Show } from 'solid-js';
import { render } from 'solid-js/web';
import { macroDarkTheme } from '../../theme/themes/macro-dark';
import { macroLightTheme } from '../../theme/themes/macro-light';
-import { themeCssVars } from '../../theme/utils/themeColorTokens';
+import { themeCssVars } from '../../theme/utils/themeCssVars';
import { Appearance } from '../Appearance';
import { AppInfo } from '../components/app-info';
import { SettingsSearchTarget } from '../components/settings-search-target';
@@ -111,7 +111,7 @@ function Fixture() {
{(email) => (
<SettingsRow label={email} description="Up to date">
<Show when={email === '[email protected]'}>
- <Button variant="outline" size="md">
+ <Button variant="secondary" size="md">
Enable calendar
</Button>
</Show>
@@ -125,7 +125,7 @@ function Fixture() {
label="Add another inbox"
description="Connect more Gmail accounts."
>
- <Button variant="outline" size="md">
+ <Button variant="secondary" size="md">
Add account
</Button>
</SettingsRow>
diff --git a/apps/web/src/features/settings/browser-test/signatures/fixture.tsx b/apps/web/src/features/settings/browser-test/signatures/fixture.tsx
index cb33020436..18692321a1 100644
--- a/apps/web/src/features/settings/browser-test/signatures/fixture.tsx
+++ b/apps/web/src/features/settings/browser-test/signatures/fixture.tsx
@@ -7,7 +7,7 @@ import { createSignal, For, onMount, Show } from 'solid-js';
import { render } from 'solid-js/web';
import { macroDarkTheme } from '../../../theme/themes/macro-dark';
import { macroLightTheme } from '../../../theme/themes/macro-light';
-import { themeCssVars } from '../../../theme/utils/themeColorTokens';
+import { themeCssVars } from '../../../theme/utils/themeCssVars';
import {
SettingsButton as Button,
SettingsPage,
diff --git a/apps/web/src/features/settings/codex/components/CodexConnection.tsx b/apps/web/src/features/settings/codex/components/CodexConnection.tsx
index d2e009a231..3545e5eaba 100644
--- a/apps/web/src/features/settings/codex/components/CodexConnection.tsx
+++ b/apps/web/src/features/settings/codex/components/CodexConnection.tsx
@@ -98,9 +98,8 @@ export function CodexConnection(props: {
</Show>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
class="gap-2"
disabled={props.pending}
onClick={props.onConnect}
@@ -138,9 +137,8 @@ export function CodexConnection(props: {
</p>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
disabled={props.pending}
onClick={props.onCancel}
>
@@ -200,7 +198,7 @@ export function CodexConnection(props: {
</a>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
onClick={props.onRetryEnvironments}
>
Retry environments
@@ -227,7 +225,7 @@ export function CodexConnection(props: {
</p>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
onClick={props.onRetryEnvironments}
>
Retry environments
@@ -241,9 +239,8 @@ export function CodexConnection(props: {
<div class="flex gap-2">
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
disabled={
props.pending || !hasChanges() || !selectedEnvironment()
}
@@ -265,7 +262,6 @@ export function CodexConnection(props: {
type="button"
variant="danger"
size="sm"
- depth={3}
class="shrink-0"
aria-label="Disconnect ChatGPT"
disabled={props.pending}
diff --git a/apps/web/src/features/settings/components/appearance-mode-picker.tsx b/apps/web/src/features/settings/components/appearance-mode-picker.tsx
index cf1693c1f1..e1fbdebe91 100644
--- a/apps/web/src/features/settings/components/appearance-mode-picker.tsx
+++ b/apps/web/src/features/settings/components/appearance-mode-picker.tsx
@@ -1,5 +1,5 @@
import type { ThemeV3 } from '@theme/types/themeTypes';
-import { themeCssVars } from '@theme/utils/themeColorTokens';
+import { themeCssVars } from '@theme/utils/themeCssVars';
import { createUniqueId, For, Show } from 'solid-js';
type AppearanceMode = 'system' | 'light' | 'dark';
@@ -8,6 +8,7 @@ type AppearanceMode = 'system' | 'light' | 'dark';
function ThemePreview(props: { theme: ThemeV3 }) {
return (
<div
+ data-theme-light={String(props.theme.mode === 'light')}
class="absolute inset-0 overflow-hidden rounded-lg bg-page p-2.5"
style={{
...themeCssVars(props.theme),
diff --git a/apps/web/src/features/settings/components/billing-plan-card.tsx b/apps/web/src/features/settings/components/billing-plan-card.tsx
index e3676ecbf2..38d9db7111 100644
--- a/apps/web/src/features/settings/components/billing-plan-card.tsx
+++ b/apps/web/src/features/settings/components/billing-plan-card.tsx
@@ -92,8 +92,7 @@ export function BillingPlanCard(props: {
<Show when={props.onSelectPlan}>
<Button
class="w-full py-1.5 px-3 @sm/plan-card:w-auto @sm/plan-card:justify-self-end"
- depth={2}
- variant="cta"
+ variant="neutral"
disabled={
props.state.pending ||
(!props.state.hasPaid &&
diff --git a/apps/web/src/features/settings/components/billing-settings-view.tsx b/apps/web/src/features/settings/components/billing-settings-view.tsx
index 0e5b1aacb4..53a0f36a0b 100644
--- a/apps/web/src/features/settings/components/billing-settings-view.tsx
+++ b/apps/web/src/features/settings/components/billing-settings-view.tsx
@@ -140,8 +140,7 @@ export function BillingSettingsView(props: {
<Button
class="ml-auto bg-active"
size="sm"
- depth={2}
- variant="outline"
+ variant="secondary"
onClick={props.onManage}
>
Manage
@@ -196,9 +195,8 @@ export function BillingSettingsView(props: {
}
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={2}
disabled={props.state.pending}
onClick={() => {
const tier = props.state.tier;
diff --git a/apps/web/src/features/settings/components/cursor-default-model.tsx b/apps/web/src/features/settings/components/cursor-default-model.tsx
index a483122bbd..382f349531 100644
--- a/apps/web/src/features/settings/components/cursor-default-model.tsx
+++ b/apps/web/src/features/settings/components/cursor-default-model.tsx
@@ -92,7 +92,7 @@ export function CursorDefaultModel(props: { triggerClass?: string }) {
<p class="text-xs text-negative">Could not load Cursor models.</p>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(cursorModels.refetch(), 'cursor-connect')
diff --git a/apps/web/src/features/settings/components/desktop-app.tsx b/apps/web/src/features/settings/components/desktop-app.tsx
index 6942834a97..05a48d23b8 100644
--- a/apps/web/src/features/settings/components/desktop-app.tsx
+++ b/apps/web/src/features/settings/components/desktop-app.tsx
@@ -17,7 +17,7 @@ export function DesktopAppDownload() {
href="https://github.com/macro-inc/macro/releases/latest"
target="_blank"
rel="noopener noreferrer"
- class={buttonClasses({ variant: 'outline', size: 'md' })}
+ class={buttonClasses({ variant: 'secondary', size: 'md' })}
>
Download desktop app
</a>
diff --git a/apps/web/src/features/settings/components/local-runtime-card.tsx b/apps/web/src/features/settings/components/local-runtime-card.tsx
index 3a62a0e12d..059d0e632e 100644
--- a/apps/web/src/features/settings/components/local-runtime-card.tsx
+++ b/apps/web/src/features/settings/components/local-runtime-card.tsx
@@ -164,7 +164,7 @@ export function LocalRuntimeCard() {
<Show when={phase() === 'running' && !setup()}>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
disabled={busy()}
onClick={() => fireAndForget(stop(), 'local-runtime-card')}
@@ -222,7 +222,7 @@ export function LocalRuntimeCard() {
</p>
<Button
type="button"
- variant="cta"
+ variant="neutral"
size="sm"
onClick={() => setSetup({ running: snapshot() })}
>
@@ -258,7 +258,7 @@ export function LocalRuntimeCard() {
</p>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
disabled={busy()}
onClick={() =>
@@ -279,7 +279,7 @@ export function LocalRuntimeCard() {
</p>
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
disabled={busy()}
onClick={() =>
@@ -295,7 +295,7 @@ export function LocalRuntimeCard() {
<div class="mt-4">
<Button
type="button"
- variant="cta"
+ variant="neutral"
size="sm"
onClick={() => setSetup({})}
>
diff --git a/apps/web/src/features/settings/components/signature-form.tsx b/apps/web/src/features/settings/components/signature-form.tsx
index b0f453be6e..43f96eb40b 100644
--- a/apps/web/src/features/settings/components/signature-form.tsx
+++ b/apps/web/src/features/settings/components/signature-form.tsx
@@ -40,7 +40,6 @@ export function SignatureForm(props: {
class="shrink-0"
variant="ghost"
size="md"
- depth={3}
disabled={props.pending || props.importing}
onClick={() => onImport()()}
>
@@ -73,9 +72,8 @@ export function SignatureForm(props: {
/>
<div class="flex items-center justify-end gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="md"
- depth={3}
disabled={!props.hasContent || props.pending || props.importing}
onClick={props.onClear}
>
@@ -83,9 +81,8 @@ export function SignatureForm(props: {
</Button>
<Show when={!props.mobile}>
<Button
- variant="cta"
+ variant="neutral"
size="md"
- depth={3}
disabled={!props.dirty || props.pending || props.importing}
onClick={props.onSave}
>
diff --git a/apps/web/src/features/settings/components/team-seat-plan-select.tsx b/apps/web/src/features/settings/components/team-seat-plan-select.tsx
index 3dc8d8cc10..fddabd07de 100644
--- a/apps/web/src/features/settings/components/team-seat-plan-select.tsx
+++ b/apps/web/src/features/settings/components/team-seat-plan-select.tsx
@@ -64,6 +64,7 @@ export function TeamSeatPlanSelect(props: {
)}
>
<Select.Trigger
+ variant="ghost"
as={Button}
class="rounded-xs px-1 py-0.5 text-xs -ml-1 data-expanded:bg-ink/10"
disabled={props.disabled}
@@ -83,7 +84,7 @@ export function TeamSeatPlanSelect(props: {
<Show when={props.value === 'max' && props.pendingDowngrade}>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={props.disabled}
onClick={() => props.onChange('max')}
>
diff --git a/apps/web/src/features/settings/connections/DiscoverView.tsx b/apps/web/src/features/settings/connections/DiscoverView.tsx
index f8f899b098..35663ca14c 100644
--- a/apps/web/src/features/settings/connections/DiscoverView.tsx
+++ b/apps/web/src/features/settings/connections/DiscoverView.tsx
@@ -121,7 +121,7 @@ export function DiscoverView(props: { model: ConnectionsModel }) {
<div class="mb-3 flex items-center justify-between gap-3">
<h3 class="text-base font-medium text-ink">All apps</h3>
<Button
- variant="outline"
+ variant="secondary"
size="md"
onClick={() => setAddingCustom(true)}
>
@@ -166,9 +166,8 @@ export function DiscoverView(props: { model: ConnectionsModel }) {
<div class="col-span-full px-6 py-6 text-center text-sm text-ink-muted">
Couldn't load the connector catalog.
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
onClick={() => catalog.query.refetch()}
class="ml-2"
>
@@ -227,7 +226,7 @@ export function DiscoverView(props: { model: ConnectionsModel }) {
<Show when={catalog.query.isFetchNextPageError}>
<div class="col-span-full flex items-center justify-center gap-3 py-4 text-sm text-ink-muted">
Couldn't load more apps.
- <Button variant="outline" size="sm" onClick={loadMore}>
+ <Button variant="secondary" size="sm" onClick={loadMore}>
Retry
</Button>
</div>
diff --git a/apps/web/src/features/settings/connections/add-custom-mcp-dialog.tsx b/apps/web/src/features/settings/connections/add-custom-mcp-dialog.tsx
index 5d96612ae3..85052d3454 100644
--- a/apps/web/src/features/settings/connections/add-custom-mcp-dialog.tsx
+++ b/apps/web/src/features/settings/connections/add-custom-mcp-dialog.tsx
@@ -89,13 +89,12 @@ export function AddCustomMcpDialog(props: {
</div>
<div class="flex justify-end gap-2 pt-1">
- <Button variant="ghost" size="sm" depth={3} onClick={close}>
+ <Button variant="ghost" size="sm" onClick={close}>
Cancel
</Button>
<Button
- variant="strong"
+ variant="primary"
size="sm"
- depth={3}
disabled={
!name().trim() || !url().trim() || addMutation.isPending
}
diff --git a/apps/web/src/features/settings/connections/integrations-view.tsx b/apps/web/src/features/settings/connections/integrations-view.tsx
index 77617d5150..156190d97f 100644
--- a/apps/web/src/features/settings/connections/integrations-view.tsx
+++ b/apps/web/src/features/settings/connections/integrations-view.tsx
@@ -134,7 +134,7 @@ function ConnectionsContent(props: IntegrationsViewProps) {
{props.children}
<div class="flex items-center gap-3 text-sm text-ink-muted">
Couldn't load Connections.
- <Button variant="outline" size="sm" depth={3} onClick={retry}>
+ <Button variant="secondary" size="sm" onClick={retry}>
Retry
</Button>
</div>
@@ -157,12 +157,7 @@ function ConnectionsContent(props: IntegrationsViewProps) {
class="flex items-center gap-3 text-sm text-ink-muted"
>
Some connections couldn't be loaded.
- <Button
- variant="outline"
- size="sm"
- depth={3}
- onClick={retry}
- >
+ <Button variant="secondary" size="sm" onClick={retry}>
Retry
</Button>
</div>
diff --git a/apps/web/src/features/settings/connections/leftover-row.tsx b/apps/web/src/features/settings/connections/leftover-row.tsx
index d9c012a07f..770a25cd05 100644
--- a/apps/web/src/features/settings/connections/leftover-row.tsx
+++ b/apps/web/src/features/settings/connections/leftover-row.tsx
@@ -354,15 +354,13 @@ export function LeftoverRow(props: { leftover: Leftover }) {
<Button
variant="ghost"
size="sm"
- depth={3}
onClick={() => setRenaming(false)}
>
Cancel
</Button>
<Button
- variant="strong"
+ variant="secondary"
size="sm"
- depth={3}
disabled={!nameDraft().trim() || native.update.isPending}
onClick={saveRename}
>
diff --git a/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportCard.tsx b/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportCard.tsx
index bccb53a61e..cd931da698 100644
--- a/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportCard.tsx
+++ b/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportCard.tsx
@@ -197,7 +197,7 @@ export function SlackChannelImportCard(
{runLabel(run())}
</p>
<Button
- variant="accent"
+ variant="primary"
size="sm"
disabled={
discovering() || !query.isSuccess || importChannels.isPending
@@ -299,7 +299,7 @@ export function SlackChannelImportCard(
</Show>
<div class="flex flex-col items-start gap-3">
<Button
- variant="accent"
+ variant="primary"
size="sm"
disabled={!importIds().length || importChannels.isPending}
onClick={startImport}
diff --git a/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportFlow.tsx b/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportFlow.tsx
index 75786755f5..5f1c725037 100644
--- a/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportFlow.tsx
+++ b/apps/web/src/features/settings/connections/slack-channel-import/SlackChannelImportFlow.tsx
@@ -65,7 +65,7 @@ export function SlackChannelImportFlow(props: {
)}
</Show>
<Button
- variant="accent"
+ variant="primary"
disabled={busy()}
onClick={() => fireAndForget(connect(), 'slack-import')}
>
diff --git a/apps/web/src/features/settings/email-settings.tsx b/apps/web/src/features/settings/email-settings.tsx
index e967ad0c7a..55a2b9ee4d 100644
--- a/apps/web/src/features/settings/email-settings.tsx
+++ b/apps/web/src/features/settings/email-settings.tsx
@@ -109,7 +109,7 @@ function EmailSignatures() {
<SettingsCard>
<SettingsRow label="Couldn't load signatures">
<Button
- variant="outline"
+ variant="secondary"
onClick={() => fireAndForget(query.refetch(), 'email-settings')}
>
Try again
diff --git a/apps/web/src/features/settings/primitives.tsx b/apps/web/src/features/settings/primitives.tsx
index 65e1697aeb..404bd0a39d 100644
--- a/apps/web/src/features/settings/primitives.tsx
+++ b/apps/web/src/features/settings/primitives.tsx
@@ -51,7 +51,7 @@ export function SettingsPage(props: {
<div
data-settings-page
data-drawer-scroll-body={inSheet ? true : undefined}
- class="@container/settings-page h-full min-h-0 overflow-y-auto [overflow-anchor:none] select-children bg-panel [&_[data-variant=cta]]:bg-ink [&_[data-variant=cta]]:text-panel [&_[data-variant=cta]]:focus-visible:ring-panel/70 [&_:has(>input[type=checkbox])]:[--color-accent:var(--color-ink)] [&_input[type=checkbox]]:accent-ink"
+ class="@container/settings-page h-full min-h-0 overflow-y-auto [overflow-anchor:none] select-children bg-panel [&_:has(>input[type=checkbox])]:[--color-accent:var(--color-ink)] [&_input[type=checkbox]]:accent-ink"
>
{/* On mobile/tablet the page is full-frame: the chrome insets live inside the
scroll content (plus the usual breathing room) so pages scroll under
@@ -406,6 +406,7 @@ export function IntegrationRow(props: {
export function SettingsButton(props: ButtonProps) {
return (
<Button
+ variant="ghost"
{...props}
class={cn('rounded-full font-normal gap-1.5', props.class)}
/>
diff --git a/apps/web/src/features/settings/views/billing-preview.tsx b/apps/web/src/features/settings/views/billing-preview.tsx
index 6cb23cefc6..0e874b2c2f 100644
--- a/apps/web/src/features/settings/views/billing-preview.tsx
+++ b/apps/web/src/features/settings/views/billing-preview.tsx
@@ -109,17 +109,17 @@ export function BillingPreview(props: {
<div class="flex flex-wrap gap-2">
<Button
size="sm"
- variant="outline"
+ variant="secondary"
onClick={() => setPaywallOpen(true)}
>
Preview paywall
</Button>
- <Button size="sm" variant="outline" onClick={reset}>
+ <Button size="sm" variant="secondary" onClick={reset}>
Reset preview
</Button>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
onClick={() => {
reset();
setPaywallOpen(false);
@@ -227,7 +227,7 @@ export function BillingPreview(props: {
when={active()}
fallback={props.renderLive(
<div class="flex flex-wrap items-center gap-3">
- <Button size="sm" variant="outline" onClick={() => setActive(true)}>
+ <Button size="sm" variant="secondary" onClick={() => setActive(true)}>
Preview billing & paywall
</Button>
<span class="text-xs text-ink-muted">Local development</span>
diff --git a/apps/web/src/features/sidebar-promotion/components/promo-card.tsx b/apps/web/src/features/sidebar-promotion/components/promo-card.tsx
index 7965baa802..6c9d8b04ba 100644
--- a/apps/web/src/features/sidebar-promotion/components/promo-card.tsx
+++ b/apps/web/src/features/sidebar-promotion/components/promo-card.tsx
@@ -58,7 +58,7 @@ export function PromoCard(props: {
<p class="mt-1 text-[11px] leading-4 text-ink-muted">{props.pitch}</p>
<div class="mt-3 flex gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="min-w-0 flex-1"
onClick={(event) => props.action.onClick(event.currentTarget)}
@@ -68,7 +68,7 @@ export function PromoCard(props: {
<Show when={props.secondaryAction}>
{(secondary) => (
<Button
- variant="outline"
+ variant="secondary"
size="sm"
class="min-w-0 flex-1"
onClick={(event) => secondary().onClick(event.currentTarget)}
diff --git a/apps/web/src/features/slack-import/components/slack-import-card.tsx b/apps/web/src/features/slack-import/components/slack-import-card.tsx
index 24d0af82ea..e142da16dc 100644
--- a/apps/web/src/features/slack-import/components/slack-import-card.tsx
+++ b/apps/web/src/features/slack-import/components/slack-import-card.tsx
@@ -14,9 +14,8 @@ export function SlackImportCard(props: Props): JSX.Element {
description="Import channels and message history from a Slack export."
>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- depth={3}
onClick={(event) => props.onOpen(event.currentTarget)}
>
Import from Slack
diff --git a/apps/web/src/features/slack-import/views/import-dialog.tsx b/apps/web/src/features/slack-import/views/import-dialog.tsx
index 3fc33cf27b..63defe812e 100644
--- a/apps/web/src/features/slack-import/views/import-dialog.tsx
+++ b/apps/web/src/features/slack-import/views/import-dialog.tsx
@@ -346,8 +346,7 @@ export function ImportDialog(props: Props): JSX.Element {
if (current === 'selecting') {
return (
<Button
- variant="strong"
- depth={2}
+ variant="secondary"
disabled={!selected().size || !confirmed() || busy()}
onClick={() =>
fireAndForget(
@@ -372,8 +371,7 @@ export function ImportDialog(props: Props): JSX.Element {
when={controller()?.job()}
fallback={
<Button
- variant="strong"
- depth={2}
+ variant="secondary"
disabled={busy()}
onClick={() =>
fireAndForget(
@@ -387,8 +385,7 @@ export function ImportDialog(props: Props): JSX.Element {
}
>
<Button
- variant="strong"
- depth={2}
+ variant="secondary"
disabled={busy()}
onClick={() =>
fireAndForget(
@@ -405,8 +402,7 @@ export function ImportDialog(props: Props): JSX.Element {
if (recoveredUpload()) {
return (
<Button
- variant="strong"
- depth={2}
+ variant="secondary"
disabled={busy() || cancelling()}
onClick={() =>
fireAndForget(runAction(finalizeHistory), 'slack-import')
@@ -677,10 +673,10 @@ export function ImportDialog(props: Props): JSX.Element {
<div class="flex items-center gap-2">
<Show when={historyOpen() || showProgress() || source.error()}>
<Button
+ aria-label="Refresh progress"
+ tooltip="Refresh progress"
variant="ghost"
size="icon-md"
- depth={2}
- label="Refresh progress"
disabled={busy()}
onClick={() =>
fireAndForget(
@@ -689,13 +685,12 @@ export function ImportDialog(props: Props): JSX.Element {
)
}
>
- <ArrowsClockwiseIcon />
+ <ArrowsClockwiseIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Show when={canCancel()}>
<Button
variant="ghost"
- depth={2}
disabled={cancelPending()}
onClick={() => fireAndForget(cancel(), 'slack-import')}
>
@@ -711,7 +706,6 @@ export function ImportDialog(props: Props): JSX.Element {
>
<Button
variant="ghost"
- depth={2}
onClick={() => {
setImportSelected(false);
queueMicrotask(() => methodButton?.focus());
@@ -723,18 +717,13 @@ export function ImportDialog(props: Props): JSX.Element {
<Show when={canChooseAnother()}>
<Button
variant="ghost"
- depth={2}
disabled={busy() || cancelling()}
onClick={resetSession}
>
Choose another archive
</Button>
</Show>
- <Button
- variant="ghost"
- depth={2}
- onClick={() => changeOpen(false)}
- >
+ <Button variant="ghost" onClick={() => changeOpen(false)}>
Close
</Button>
{primaryAction()}
@@ -930,22 +919,12 @@ function JobHistory(props: {
<Show when={props.paged || props.page?.nextCursor}>
<div class="flex items-center gap-2">
<Show when={props.paged}>
- <Button
- variant="outline"
- size="sm"
- depth={2}
- onClick={props.onNewest}
- >
+ <Button variant="secondary" size="sm" onClick={props.onNewest}>
Newest imports
</Button>
</Show>
<Show when={props.page?.nextCursor}>
- <Button
- variant="outline"
- size="sm"
- depth={2}
- onClick={props.onOlder}
- >
+ <Button variant="secondary" size="sm" onClick={props.onOlder}>
Older imports
</Button>
</Show>
diff --git a/apps/web/src/features/tasks-view/AGENTS.md b/apps/web/src/features/tasks-view/AGENTS.md
index e2bc64d16e..8b9c757a79 100644
--- a/apps/web/src/features/tasks-view/AGENTS.md
+++ b/apps/web/src/features/tasks-view/AGENTS.md
@@ -25,8 +25,9 @@ Main Tasks and reusable task-list hosts. Projects and CRM embed `TasksViewProvid
- Keep sidebar actions targeted to their own record; Edit combines naming and sharing without saving temporary settings, and Duplicate starts with a prefilled private copy and warns before omitting unsupported settings.
- Keep saved-view names and menus in the mobile picker; overlay creation above the filter drawer footer on a drawer-colored backing without blocking the last scrollable controls, and put Save changes at the footer's right edge, opposite Clear all.
- Place the saved-view picker after Filters and before built-in mobile tabs; omit duplicate headers and general create controls, but offer Create view in the empty state.
-- Group the shared sidebar and picker empty state in a subtly bordered, rounded container with 12px padding, the inherited background, and no shadow: “Your go-to views”, “Save your setup for next time.” and a neutral Create view button with a leading plus icon, without a separate illustration; keep the sidebar header's icon-only plus available in every section state, and isolate both creation buttons' keyboard scopes from task-list selection shortcuts.
+- Group the shared sidebar and picker empty state in a subtly bordered, rounded container with 12px padding, the inherited background, and no shadow: “Your go-to views”, “Save your setup for next time.” and a `secondary`, `sm` Create view button with a leading plus icon, without a separate illustration; keep the sidebar header's icon-only plus available in every section state, and isolate both creation buttons' keyboard scopes from task-list selection shortcuts.
- Keep mobile pills in a flex wrapper inside the header so their shadow margins cannot collapse the header and overlap task content.
+- Keep desktop list-header filters, layout, sort, and grouping at `md` / `icon-md` (32px), matching New and Search; preserve the mobile filter drawer.
- Show one local New view draft row after creation starts; prefill its save dialog with New view, replace the row on confirmed save, and remove it on cancellation or navigation without adding fake cached records.
- Close the selected-view menu before opening a dialog, discard deferred actions after account or selection changes, and close dialogs after account, saved-view, or built-in-tab navigation.
- Own mobile action dialogs outside closing drawers; finish drawer closure before opening a dialog, and reopen filters after cancellation only within the same navigation scope.
diff --git a/apps/web/src/features/tasks-view/components/TasksControls.tsx b/apps/web/src/features/tasks-view/components/TasksControls.tsx
index 473d27af50..7ba78f55af 100644
--- a/apps/web/src/features/tasks-view/components/TasksControls.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksControls.tsx
@@ -10,7 +10,7 @@ import { isTouchDevice } from '@core/mobile/isTouchDevice';
import GanttIcon from '@icon/system/regular/chart-gantt.svg';
import BoardIcon from '@icon/system/regular/kanban.svg';
import ListIcon from '@icon/system/regular/list-bullets.svg';
-import { Button } from '@ui';
+import { ButtonGroup } from '@ui';
import { tourTarget } from '@ui/components/Tour';
import { createSignal, Show } from 'solid-js';
import { TASK_GROUP_OPTIONS, TASK_SORT_OPTIONS } from '../constants';
@@ -83,9 +83,11 @@ function DesktopTasksControls() {
return (
<>
- <HeaderActionGroup label="Task filters">
+ <HeaderActionGroup label="Task filters" size="md">
<div class="shrink-0" ref={tourTarget(TASKS_TOUR.filter)}>
<ListFilterDropdown
+ grouped
+ size={filters.activeCount() ? 'md' : 'icon-md'}
label="Filter tasks"
activeCount={filters.activeCount()}
groups={filters.groups()}
@@ -103,38 +105,41 @@ function DesktopTasksControls() {
/>
</div>
</HeaderActionGroup>
- <HeaderActionGroup label="Task layout">
- <Button
+ <HeaderActionGroup label="Task layout" size="md">
+ <ButtonGroup.Button
+ aria-label="List"
+ tooltip="List"
variant="ghost"
size="icon-md"
- label="List"
aria-pressed={state.layout === 'list'}
onClick={() => setState('layout', 'list')}
>
<ListIcon class="size-4" />
- </Button>
- <Button
+ </ButtonGroup.Button>
+ <ButtonGroup.Button
+ aria-label="Board"
+ tooltip="Board"
variant="ghost"
size="icon-md"
- label="Board"
aria-pressed={state.layout === 'board'}
onClick={() => setState('layout', 'board')}
>
<BoardIcon class="size-4" />
- </Button>
+ </ButtonGroup.Button>
<Show when={ganttEnabled()}>
- <Button
+ <ButtonGroup.Button
+ aria-label="Gantt"
+ tooltip="Gantt"
variant="ghost"
size="icon-md"
- label="Gantt"
aria-pressed={state.layout === 'gantt'}
onClick={() => setState('layout', 'gantt')}
>
<GanttIcon class="size-4" />
- </Button>
+ </ButtonGroup.Button>
</Show>
</HeaderActionGroup>
- <HeaderActionGroup label="Task view options">
+ <HeaderActionGroup label="Task view options" size="md">
<Show
when={!isBoardSearch()}
fallback={
@@ -147,6 +152,8 @@ function DesktopTasksControls() {
}
>
<ListSortDropdown
+ grouped
+ size="icon-md"
label="Sort tasks"
value={primarySort()}
options={TASK_SORT_OPTIONS}
@@ -157,6 +164,8 @@ function DesktopTasksControls() {
/>
</Show>
<ListGroupDropdown
+ grouped
+ size="icon-md"
label="Group by"
value={state.groupBy}
options={groupOptions()}
diff --git a/apps/web/src/features/tasks-view/components/task-board.tsx b/apps/web/src/features/tasks-view/components/task-board.tsx
index f69faca4b0..4b44432d2f 100644
--- a/apps/web/src/features/tasks-view/components/task-board.tsx
+++ b/apps/web/src/features/tasks-view/components/task-board.tsx
@@ -144,7 +144,7 @@ function HiddenColumns(props: {
{props.count}
{props.partial ? '+' : ''} hidden
</h2>
- <Button size="sm" variant="outline" onClick={props.onReveal}>
+ <Button size="sm" variant="secondary" onClick={props.onReveal}>
Reveal hidden columns
</Button>
</KanbanBoard.ColumnPlaceholder>
diff --git a/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx b/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx
index 56b37c7d96..fc9b6f6016 100644
--- a/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx
+++ b/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx
@@ -444,7 +444,7 @@ export function TaskList(props: TaskListProps) {
<div class="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 text-sm text-ink-muted">
<span>Tasks couldn’t be loaded.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(source.refresh(), 'tasks-view')
@@ -460,7 +460,7 @@ export function TaskList(props: TaskListProps) {
<span>{emptyMessage()}</span>
<Show when={!forceEmptyState() && source.hasMore()}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
disabled={source.isLoadingMore()}
onClick={() =>
@@ -640,9 +640,8 @@ export function TaskList(props: TaskListProps) {
when={!loadMore().isLoading}
fallback={
<Button
- variant="outline"
- size="sm"
- depth={2}
+ variant="secondary"
+ size="xs"
class={buttonClass()}
disabled
>
@@ -652,9 +651,8 @@ export function TaskList(props: TaskListProps) {
}
>
<Button
- variant="outline"
- size="sm"
- depth={2}
+ variant="secondary"
+ size="xs"
class={buttonClass()}
>
<CaretDownIcon class="size-2.5" />
diff --git a/apps/web/src/features/tasks-view/views/task-board-view.tsx b/apps/web/src/features/tasks-view/views/task-board-view.tsx
index 014401d80b..9cfdcdc756 100644
--- a/apps/web/src/features/tasks-view/views/task-board-view.tsx
+++ b/apps/web/src/features/tasks-view/views/task-board-view.tsx
@@ -207,6 +207,7 @@ export function TaskBoardView(props: {
>
Could not load all tasks.
<Button
+ variant="ghost"
size="sm"
onClick={() => fireAndForget(read(source.refresh), 'tasks-view')}
>
@@ -218,6 +219,7 @@ export function TaskBoardView(props: {
<div role="alert" class="px-4 py-2 text-sm text-failure">
Could not load task properties. Moving tasks is unavailable.
<Button
+ variant="ghost"
size="sm"
onClick={() =>
fireAndForget(read(props.data.retryDefinitions), 'tasks-view')
@@ -267,12 +269,13 @@ export function TaskBoardView(props: {
<Show when={props.onCreate}>
<div class="ml-auto flex shrink-0">
<Button
+ aria-label={`Add task to ${column().label}`}
+ tooltip={`Add task to ${column().label}`}
size="icon-sm"
variant="ghost"
- label={`Add task to ${column().label}`}
onClick={() => props.onCreate?.(column().id)}
>
- <PlusIcon />
+ <PlusIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
@@ -291,6 +294,7 @@ export function TaskBoardView(props: {
<div class="py-3">
<Button
size="sm"
+ variant="secondary"
disabled={column().loadingMore}
onClick={() =>
fireAndForget(
@@ -333,6 +337,7 @@ export function TaskBoardView(props: {
<div class="p-3">
<Button
size="sm"
+ variant="secondary"
disabled={source.isLoadingMore()}
onClick={() =>
fireAndForget(
diff --git a/apps/web/src/features/tasks-view/views/task-gantt-view.tsx b/apps/web/src/features/tasks-view/views/task-gantt-view.tsx
index 722ffeb032..6819d4ba72 100644
--- a/apps/web/src/features/tasks-view/views/task-gantt-view.tsx
+++ b/apps/web/src/features/tasks-view/views/task-gantt-view.tsx
@@ -96,6 +96,7 @@ export function TaskGanttView(props: {
>
Tasks couldn’t be loaded.
<Button
+ variant="ghost"
onClick={() =>
fireAndForget(props.source.refresh?.(), 'tasks-view')
}
diff --git a/apps/web/src/features/tasks-view/views/task-saved-views.tsx b/apps/web/src/features/tasks-view/views/task-saved-views.tsx
index c9885a2c3c..3edb01c180 100644
--- a/apps/web/src/features/tasks-view/views/task-saved-views.tsx
+++ b/apps/web/src/features/tasks-view/views/task-saved-views.tsx
@@ -11,7 +11,13 @@ import BookmarkIcon from '@phosphor/bookmark-simple.svg';
import DotsIcon from '@phosphor/dots-three.svg';
import InfoIcon from '@phosphor/info.svg';
import WarningIcon from '@phosphor/warning-circle.svg';
-import { Button, type DialogHandle, Dropdown, openDialog } from '@ui';
+import {
+ Button,
+ ButtonGroup,
+ type DialogHandle,
+ Dropdown,
+ openDialog,
+} from '@ui';
import { ok } from 'neverthrow';
import { batch, For, getOwner, type Owner, onCleanup, Show } from 'solid-js';
import { v4 as uuid } from 'uuid';
@@ -409,7 +415,7 @@ function TaskSavedViewRows(props: {
<Button
ref={attachCreateHotkeys}
size="sm"
- variant="outline"
+ variant="secondary"
onClick={() => run(startSavedView)}
>
<PlusIcon class="size-3.5" />
@@ -493,9 +499,9 @@ export function TaskSaveViewButton() {
return (
<Show when={visible()}>
<HeaderActionGroup label="Save task view">
- <Button size="md" variant="cta" onClick={() => create()}>
+ <ButtonGroup.Button variant="primary" onClick={() => create()}>
Save view
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
</Show>
);
@@ -522,7 +528,7 @@ export function TaskSavedViewCreateBanner(props: TaskSavedViewDialogProps) {
>
<InfoIcon class="size-4 shrink-0 text-accent" aria-hidden="true" />
<span class="min-w-0 flex-1">Save these filters as a view</span>
- <Button size="sm" variant="cta" onClick={showCreate}>
+ <Button size="sm" variant="primary" onClick={showCreate}>
<BookmarkIcon class="size-4" aria-hidden="true" />
Save view
</Button>
@@ -589,7 +595,8 @@ export function TaskSavedViewMenu() {
ref={trigger}
size="icon-md"
variant="ghost"
- label="Saved view actions"
+ aria-label="Saved view actions"
+ tooltip="Saved view actions"
>
<DotsIcon class="size-4" />
</Dropdown.Trigger>
@@ -674,9 +681,8 @@ export function TaskSavedViewActions(props: TaskSavedViewDialogProps = {}) {
fallback={
<>
<Show when={selected()?.record.ownerId === viewerId()}>
- <Button
- size="md"
- variant="cta"
+ <ButtonGroup.Button
+ variant="primary"
class="touch:order-last"
disabled={update.isPending || !!selected()?.issues.length}
title={
@@ -687,24 +693,23 @@ export function TaskSavedViewActions(props: TaskSavedViewDialogProps = {}) {
onClick={() => fireAndForget(save(), 'saved-views')}
>
Save changes
- </Button>
+ </ButtonGroup.Button>
</Show>
- <Button
- size="md"
+ <ButtonGroup.Button
variant="ghost"
onClick={() => savedViews?.reset()}
>
Reset
- </Button>
+ </ButtonGroup.Button>
</>
}
>
- <Button size="md" variant="cta" onClick={() => showCreate()}>
+ <ButtonGroup.Button variant="primary" onClick={() => showCreate()}>
Save view
- </Button>
- <Button size="md" variant="ghost" onClick={leaveSavedView}>
+ </ButtonGroup.Button>
+ <ButtonGroup.Button variant="ghost" onClick={leaveSavedView}>
Cancel
- </Button>
+ </ButtonGroup.Button>
</Show>
</HeaderActionGroup>
</Show>
@@ -721,21 +726,19 @@ export function TaskSavedViewActions(props: TaskSavedViewDialogProps = {}) {
<Show
when={error().graphQLErrors[0]?.extensions.code === 'CONFLICT'}
>
- <Button
- size="sm"
+ <ButtonGroup.Button
variant="ghost"
onClick={() => fireAndForget(reload(), 'saved-views')}
>
Reload saved view
- </Button>
+ </ButtonGroup.Button>
</Show>
- <Button
- size="sm"
+ <ButtonGroup.Button
variant="ghost"
onClick={() => showCreate(selected()?.record)}
>
Duplicate
- </Button>
+ </ButtonGroup.Button>
</HeaderActionGroup>
)}
</Show>
@@ -753,7 +756,9 @@ export function TaskSavedViewFailure() {
return (
<div class="flex h-full flex-col items-center justify-center gap-4 p-6 text-sm">
<p role="alert">{message()}</p>
- <Button onClick={() => setTab('my-tasks')}>Return to Tasks</Button>
+ <Button variant="ghost" onClick={() => setTab('my-tasks')}>
+ Return to Tasks
+ </Button>
</div>
);
}
diff --git a/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx b/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx
index afc77a8046..5112393964 100644
--- a/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx
+++ b/apps/web/src/features/team-invitations/TeamInviteAcceptance.tsx
@@ -163,7 +163,7 @@ function NoInviteId() {
This invite link appears to be invalid or incomplete.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={() => navigate('/')}
@@ -185,7 +185,7 @@ function UnauthenticatedView(props: { onLogin: () => void }) {
Sign in or create an account to view and accept this team invitation.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={props.onLogin}
@@ -210,7 +210,7 @@ function AlreadyOnTeam(props: { teamName: string }) {
to do here.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={() => navigate('/')}
@@ -231,7 +231,7 @@ function InviteNotFound() {
a different email address.
</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={() => navigate('/')}
@@ -275,7 +275,7 @@ function InviteDetails(props: {
<div class="flex flex-col gap-2 w-full">
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={props.onAccept}
diff --git a/apps/web/src/features/team-invitations/TeamInviteLinkAcceptance.tsx b/apps/web/src/features/team-invitations/TeamInviteLinkAcceptance.tsx
index ed3bf1a773..0888ac233d 100644
--- a/apps/web/src/features/team-invitations/TeamInviteLinkAcceptance.tsx
+++ b/apps/web/src/features/team-invitations/TeamInviteLinkAcceptance.tsx
@@ -79,7 +79,7 @@ export function TeamInviteLinkAcceptance(props: { token: string }) {
</p>
</div>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
disabled={joinMutation.isPending}
@@ -107,7 +107,7 @@ function Outcome(props: { title: string; body: string }) {
<h2 class="text-lg font-medium text-ink">{props.title}</h2>
<p class="text-sm text-ink-muted">{props.body}</p>
<Button
- variant="outline"
+ variant="secondary"
size="md"
class="w-full"
onClick={() => navigate('/')}
diff --git a/apps/web/src/features/team-invitations/invite-modal.tsx b/apps/web/src/features/team-invitations/invite-modal.tsx
index ac4bdb656e..b22745d9c2 100644
--- a/apps/web/src/features/team-invitations/invite-modal.tsx
+++ b/apps/web/src/features/team-invitations/invite-modal.tsx
@@ -87,7 +87,7 @@ export const InviteModal = () => {
<Panel depth={2} class="max-h-[75vh] text-ink rounded-xl">
<Panel.Header class="px-2 gap-1">
<Dialog.CloseButton as={Button} variant="ghost" size="icon-sm">
- <CloseIcon />
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
<Dialog.Title as="span" class="text-sm font-medium p-0 m-0">
Invite
@@ -106,7 +106,7 @@ export const InviteModal = () => {
requestAnimationFrame(() => el.focus())
);
}}
value={value()}
onInput={(e) => setValue(e.currentTarget.value)}
rows={4}
@@ -120,7 +120,7 @@ export const InviteModal = () => {
</Button>
<Button
onClick={handleSend}
- variant="strong"
+ variant="primary"
disabled={sending() || !parseEmails(value()).length}
class="font-semibold"
>
@@ -147,7 +147,7 @@ export const InviteModal = () => {
type="button"
onClick={handleCopy}
size="md"
- variant="outline"
+ variant="secondary"
class="font-medium 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.tsx
index 96640a158c..0887cfbc33 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="outline" size="md" onClick={copyTheme}>
+ <Button variant="secondary" 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.tsx
index 83c26f3d12..778a00db75 100644
--- a/apps/web/src/features/theme/components/ThemeEditor.tsx
+++ b/apps/web/src/features/theme/components/ThemeEditor.tsx
@@ -24,7 +24,8 @@ export function ThemeEditor(props: {
<div class="mx-3 my-2 flex max-h-[70vh] flex-col gap-3 rounded-xl border border-edge-muted bg-surface px-4 py-4">
<div class="flex items-center gap-2">
<Button
- label="Close editor"
+ aria-label="Close editor"
+ tooltip="Close editor"
onClick={props.onClose}
variant="ghost"
size="icon-sm"
@@ -46,7 +47,7 @@ export function ThemeEditor(props: {
<ThemeTokenEditor />
</div>
<div class="flex justify-end">
- <Button variant="outline" size="sm" onClick={props.onSave}>
+ <Button variant="secondary" size="sm" onClick={props.onSave}>
Save theme
</Button>
</div>
diff --git a/apps/web/src/features/theme/utils/buttonTheme.ts b/apps/web/src/features/theme/utils/buttonTheme.ts
new file mode 100644
index 0000000000..b6df10473f
--- /dev/null
+++ b/apps/web/src/features/theme/utils/buttonTheme.ts
@@ -0,0 +1,39 @@
+import Color from 'colorjs.io';
+import type { ResolvedThemeColors } from './resolvedThemeColors';
+
+const SRGB_LINEAR_THRESHOLD = 0.04045;
+const SRGB_LINEAR_DIVISOR = 12.92;
+const SRGB_OFFSET = 0.055;
+const SRGB_SCALE = 1.055;
+const SRGB_EXPONENT = 2.4;
+const DARK_INK_LUMINANCE_THRESHOLD = 0.179;
+const LUMINANCE_WEIGHTS = [0.2126, 0.7152, 0.0722] as const;
+const BLACK = 'oklch(0 0 0)';
+const WHITE = 'oklch(1 0 0)';
+
+function linearize(channel: number): number {
+ const clamped = Math.max(0, Math.min(1, channel));
+ if (clamped <= SRGB_LINEAR_THRESHOLD) return clamped / SRGB_LINEAR_DIVISOR;
+ return ((clamped + SRGB_OFFSET) / SRGB_SCALE) ** SRGB_EXPONENT;
+}
+
+/** Choose accent contrast only. CSS owns all other Button materials and states. */
+export function buttonAccentVars(
+ colors: ResolvedThemeColors
+): Record<string, string> {
+ const accent = colors.accent;
+ const rgb = new Color('oklch', [accent.l, accent.c, accent.h], accent.alpha)
+ .toGamut({ space: 'srgb' })
+ .to('srgb');
+ const luminance = rgb.coords.reduce(
+ (sum, channel, index) =>
+ sum + linearize(channel) * LUMINANCE_WEIGHTS[index],
+ 0
+ );
+ const useDarkInk = luminance > DARK_INK_LUMINANCE_THRESHOLD;
+
+ return {
+ '--button-primary-ink': useDarkInk ? BLACK : WHITE,
+ '--button-primary-state-mix': useDarkInk ? WHITE : BLACK,
+ };
+}
diff --git a/apps/web/src/features/theme/utils/themeColorTokens.ts b/apps/web/src/features/theme/utils/themeColorTokens.ts
index 43f7d55236..e3668af3a6 100644
--- a/apps/web/src/features/theme/utils/themeColorTokens.ts
+++ b/apps/web/src/features/theme/utils/themeColorTokens.ts
@@ -5,7 +5,6 @@ import type {
ThemeColorTokens,
ThemeV2,
ThemeV2Tokens,
- ThemeV3,
} from '../types/themeTypes';
/** Tailwind 500 hue angles used to project a legacy theme's accent color. */
@@ -235,20 +234,3 @@ export function themeTokenCssVar(
return { name: `--color-${token}`, value };
}
-
-/**
- * All of a theme's tokens as inline CSS custom properties, for rendering a
- * theme inside a subtree instead of on the document. Every authored value is
- * either a literal color or a `var()`/`color-mix()` expression over other
- * `--color-*` tokens, so the whole set resolves against whichever element it is
- * set on.
- */
-export function themeCssVars(theme: ThemeV3): Record<string, string> {
- const tokens = normalizeThemeColorTokens(theme.colorTokens, theme.mode);
- const vars: Record<string, string> = {};
- for (const [token, value] of Object.entries(tokens)) {
- const mapped = themeTokenCssVar(token, value);
- if (mapped) vars[mapped.name] = mapped.value;
- }
- return vars;
-}
diff --git a/apps/web/src/features/theme/utils/themeCssVars.ts b/apps/web/src/features/theme/utils/themeCssVars.ts
new file mode 100644
index 0000000000..4b9be24e7c
--- /dev/null
+++ b/apps/web/src/features/theme/utils/themeCssVars.ts
@@ -0,0 +1,18 @@
+import type { ThemeV3 } from '../types/themeTypes';
+import { buttonAccentVars } from './buttonTheme';
+import { resolveThemeColors } from './resolvedThemeColors';
+import {
+ normalizeThemeColorTokens,
+ themeTokenCssVar,
+} from './themeColorTokens';
+
+/** Render a subtree theme with the same authored and derived values as the root. */
+export function themeCssVars(theme: ThemeV3): Record<string, string> {
+ const tokens = normalizeThemeColorTokens(theme.colorTokens, theme.mode);
+ const vars = buttonAccentVars(resolveThemeColors(tokens, theme.mode));
+ for (const [token, value] of Object.entries(tokens)) {
+ const mapped = themeTokenCssVar(token, value);
+ if (mapped) vars[mapped.name] = mapped.value;
+ }
+ return vars;
+}
diff --git a/apps/web/src/features/theme/utils/themeUtils.ts b/apps/web/src/features/theme/utils/themeUtils.ts
index fd5bb338a4..9853f7ed5a 100644
--- a/apps/web/src/features/theme/utils/themeUtils.ts
+++ b/apps/web/src/features/theme/utils/themeUtils.ts
@@ -25,6 +25,7 @@ import {
userThemes,
} from '../signals/themeSignals';
import type { ThemeColorTokens, ThemeV3 } from '../types/themeTypes';
+import { buttonAccentVars } from './buttonTheme';
import { formatOklch } from './colorUtil';
import { resolveThemeColors } from './resolvedThemeColors';
import {
@@ -99,7 +100,20 @@ function renderThemeColorToken(token: string, value: string): void {
/** Applies a color token for an editor drag without updating persisted state. */
export function previewLiveThemeColorToken(token: string, value: string): void {
+ const tokens = { ...themeColorTokens(), [token]: value };
+ const colors = resolveThemeColors(tokens, liveThemeMode());
+ const accentVars = buttonAccentVars(colors);
renderThemeColorToken(token, value);
+ document.documentElement.dataset.themeLight = String(
+ colors['surface-0'].l > colors['content-0'].l
+ );
+ renderButtonAccentVars(accentVars);
+}
+
+function renderButtonAccentVars(vars: Record<string, string>): void {
+ for (const [name, value] of Object.entries(vars)) {
+ document.documentElement.style.setProperty(name, value);
+ }
}
/** Writes all VNext authored tokens to the root and updates editor state. */
@@ -134,6 +148,7 @@ export function setLiveThemeColorTokens(tokens: ThemeColorTokens): void {
'--theme-comment-ink-lightness',
String(colors['content-1'].l)
);
+ renderButtonAccentVars(buttonAccentVars(colors));
setThemeColorTokens(normalizedTokens);
}
diff --git a/apps/web/src/features/tours/ViewTour.tsx b/apps/web/src/features/tours/ViewTour.tsx
index 80d51a6711..a1d40c6c15 100644
--- a/apps/web/src/features/tours/ViewTour.tsx
+++ b/apps/web/src/features/tours/ViewTour.tsx
@@ -180,7 +180,7 @@ function ViewTourCard(props: ViewTourProps) {
<Tour.Close variant="ghost" size="md">
Dismiss
</Tour.Close>
- <Tour.Next variant="cta" size="md" doneLabel="Got it">
+ <Tour.Next variant="primary" size="md" doneLabel="Got it">
Next
</Tour.Next>
</div>
@@ -251,7 +251,7 @@ function McpConnectAction(props: {
function ConnectButton(props: { label: string; onClick: () => void }) {
return (
- <Button variant="outline" size="sm" onClick={props.onClick}>
+ <Button variant="secondary" size="sm" onClick={props.onClick}>
Connect {props.label}
</Button>
);
@@ -263,7 +263,7 @@ export function ViewTourAction(props: {
children: JSX.Element;
}) {
return (
- <Button variant="outline" size="sm" onClick={props.onClick}>
+ <Button variant="secondary" size="sm" onClick={props.onClick}>
{props.children}
</Button>
);
diff --git a/apps/web/src/features/tours/components/ViewTourVideo.tsx b/apps/web/src/features/tours/components/ViewTourVideo.tsx
index ad2cee8ac6..0bd50b5923 100644
--- a/apps/web/src/features/tours/components/ViewTourVideo.tsx
+++ b/apps/web/src/features/tours/components/ViewTourVideo.tsx
@@ -33,12 +33,13 @@ export function ViewTourVideo(props: { video: Video }) {
{props.video.title}
</span>
<Button
+ aria-label="Close video"
+ tooltip="Close video"
variant="ghost"
size="icon-sm"
- label="Close video"
onClick={() => setPlaying(false)}
>
- <XIcon />
+ <XIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<iframe
diff --git a/apps/web/src/features/tutorial/InteractiveOnboardingModal.tsx b/apps/web/src/features/tutorial/InteractiveOnboardingModal.tsx
index ca111099dd..2738ca411f 100644
--- a/apps/web/src/features/tutorial/InteractiveOnboardingModal.tsx
+++ b/apps/web/src/features/tutorial/InteractiveOnboardingModal.tsx
@@ -86,9 +86,9 @@ function StartScreen(props: { onStart: () => void; onSkip: () => void }) {
</p>
</div>
<div class="w-full max-w-xs flex flex-col gap-2 pt-2">
- <Button variant="strong" size="xl" onClick={props.onSkip}>
+ <Button variant="secondary" size="xl" onClick={props.onSkip}>
Continue
- <ArrowRightIcon />
+ <ArrowRightIcon class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</>
@@ -101,9 +101,9 @@ function StartScreen(props: { onStart: () => void; onSkip: () => void }) {
</p>
</div>
<div class="w-full max-w-xs flex flex-col gap-2 pt-2">
- <Button variant="strong" size="xl" onClick={props.onStart}>
+ <Button variant="secondary" size="xl" onClick={props.onStart}>
Play tutorial
- <ArrowRightIcon />
+ <ArrowRightIcon class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button variant="ghost" size="xl" onClick={props.onSkip}>
Skip tutorial
@@ -127,9 +127,9 @@ function EndScreen(props: { onFinish: () => void; onReplay: () => void }) {
</p>
</div>
<div class="w-full max-w-xs flex flex-col gap-2 pt-2">
- <Button variant="strong" size="xl" onClick={props.onFinish}>
+ <Button variant="secondary" size="xl" onClick={props.onFinish}>
Let’s go
- <ArrowRightIcon />
+ <ArrowRightIcon class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button variant="ghost" size="xl" onClick={props.onReplay}>
Replay tutorial
@@ -167,7 +167,7 @@ function ModalFooter(props: { lesson: LessonState }) {
</Button>
<Button
ref={onboarding.setContinueButtonRef}
- variant="strong"
+ variant="secondary"
size="xl"
onClick={onboarding.handleContinue}
disabled={!onboarding.readyToContinue()}
diff --git a/apps/web/src/features/ui-gallery/components/CodeBlock.tsx b/apps/web/src/features/ui-gallery/components/CodeBlock.tsx
index 358233c3e8..37c94c232e 100644
--- a/apps/web/src/features/ui-gallery/components/CodeBlock.tsx
+++ b/apps/web/src/features/ui-gallery/components/CodeBlock.tsx
@@ -48,13 +48,19 @@ function CopyButton(props: { code: string }) {
return (
<Button
+ aria-label={copied() ? 'Copied' : 'Copy code'}
+ tooltip={copied() ? 'Copied' : 'Copy code'}
variant="ghost"
size="icon-sm"
- label={copied() ? 'Copied' : 'Copy code'}
onClick={copy}
>
- <Show when={copied()} fallback={<CopyIcon />}>
- <CheckIcon class="text-success" />
+ <Show
+ when={copied()}
+ fallback={
+ <CopyIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ >
+ <CheckIcon class="text-success size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
);
diff --git a/apps/web/src/features/universal-input/views/universal-composer.tsx b/apps/web/src/features/universal-input/views/universal-composer.tsx
index d9a7ab029d..6876e35eec 100644
--- a/apps/web/src/features/universal-input/views/universal-composer.tsx
+++ b/apps/web/src/features/universal-input/views/universal-composer.tsx
@@ -53,7 +53,7 @@ function ComposerFooter(props: {
<div class="flex flex-wrap items-center gap-2">
<Show when={s.draft().intent === 'email'}>
<Button
- variant="outline"
+ variant="secondary"
size="lg"
disabled={s.sending() || s.pending() || !!s.emailDraftValidation()}
onClick={() => fireAndForget(s.saveEmailDraft(), 'universal-input')}
@@ -62,7 +62,7 @@ function ComposerFooter(props: {
</Button>
</Show>
<Button
- variant="cta"
+ variant="primary"
aria-label={action()}
aria-keyshortcuts="Meta+Enter Control+Enter"
size="lg"
@@ -217,7 +217,7 @@ export function UniversalComposer(props: {
</p>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={s.sending() || a.connectingGoogle()}
onClick={() =>
fireAndForget(a.connectGoogle(), 'universal-input')
diff --git a/apps/web/src/features/usage/components/auto-reload-dialog.tsx b/apps/web/src/features/usage/components/auto-reload-dialog.tsx
index 40ec5a058e..b9b242445f 100644
--- a/apps/web/src/features/usage/components/auto-reload-dialog.tsx
+++ b/apps/web/src/features/usage/components/auto-reload-dialog.tsx
@@ -105,8 +105,7 @@ export function AutoReloadDialog(props: {
</p>
<Button
class="self-start"
- variant="outline"
- depth={3}
+ variant="secondary"
size="sm"
disabled={
!props.canManagePaymentMethods || props.paymentMethodsPending
@@ -142,14 +141,13 @@ export function AutoReloadDialog(props: {
<Show
when={props.enabled}
fallback={
- <Button variant="ghost" depth={3} onClick={props.onClose}>
+ <Button variant="ghost" onClick={props.onClose}>
Cancel
</Button>
}
>
<Button
variant="ghost"
- depth={3}
disabled={props.disabled || props.pending}
onClick={props.onTurnOff}
>
@@ -157,8 +155,7 @@ export function AutoReloadDialog(props: {
</Button>
</Show>
<Button
- variant="accent"
- depth={3}
+ variant="primary"
disabled={props.disabled || props.pending || props.invalid}
onClick={props.onSave}
>
@@ -171,11 +168,11 @@ export function AutoReloadDialog(props: {
</div>
</div>
<Button
+ aria-label="Close Auto-Reload"
+ tooltip="Close Auto-Reload"
class="absolute right-4 top-4"
size="icon-sm"
variant="ghost"
- depth={3}
- label="Close Auto-Reload"
onClick={props.onClose}
>
<XIcon class="size-4" />
diff --git a/apps/web/src/features/usage/components/auto-reload-limit-notice.tsx b/apps/web/src/features/usage/components/auto-reload-limit-notice.tsx
index 7bab7ed03d..68d51f8737 100644
--- a/apps/web/src/features/usage/components/auto-reload-limit-notice.tsx
+++ b/apps/web/src/features/usage/components/auto-reload-limit-notice.tsx
@@ -45,8 +45,7 @@ export function AutoReloadLimitNotice(props: {
<div class="flex flex-wrap gap-2">
<Button
size="sm"
- variant="outline"
- depth={3}
+ variant="secondary"
disabled={props.pending}
onClick={(event) => props.onAdjust(event.currentTarget)}
>
@@ -55,7 +54,6 @@ export function AutoReloadLimitNotice(props: {
<Button
size="sm"
variant="ghost"
- depth={3}
disabled={props.pending}
onClick={(event) => props.onAddCredits(event.currentTarget)}
>
diff --git a/apps/web/src/features/usage/components/credit-purchase-dialog.tsx b/apps/web/src/features/usage/components/credit-purchase-dialog.tsx
index df7c88e74b..51fa6842b8 100644
--- a/apps/web/src/features/usage/components/credit-purchase-dialog.tsx
+++ b/apps/web/src/features/usage/components/credit-purchase-dialog.tsx
@@ -111,15 +111,14 @@ export function CreditPurchaseDialog(props: {
</p>
</Show>
<div class="flex justify-end gap-2">
- <Button variant="ghost" depth={3} onClick={props.onClose}>
+ <Button variant="ghost" onClick={props.onClose}>
Cancel
</Button>
<Show
when={props.onViewPlans}
fallback={
<Button
- variant="accent"
- depth={3}
+ variant="primary"
disabled={props.disabled || props.pending}
onClick={props.onCheckout}
>
@@ -128,7 +127,7 @@ export function CreditPurchaseDialog(props: {
}
>
{(viewPlans) => (
- <Button variant="accent" depth={3} onClick={viewPlans()}>
+ <Button variant="primary" onClick={viewPlans()}>
View plans
</Button>
)}
@@ -136,11 +135,11 @@ export function CreditPurchaseDialog(props: {
</div>
</div>
<Button
+ aria-label="Close credit purchase"
+ tooltip="Close credit purchase"
class="absolute right-4 top-4"
size="icon-sm"
variant="ghost"
- depth={3}
- label="Close credit purchase"
onClick={props.onClose}
>
<XIcon class="size-4" />
diff --git a/apps/web/src/features/usage/components/monthly-limit.tsx b/apps/web/src/features/usage/components/monthly-limit.tsx
index 41549d7ac4..42d5bfd0ef 100644
--- a/apps/web/src/features/usage/components/monthly-limit.tsx
+++ b/apps/web/src/features/usage/components/monthly-limit.tsx
@@ -23,11 +23,11 @@ export function MonthlyLimit(props: {
<h2 class="text-sm font-medium text-ink">Monthly limit</h2>
<Show when={props.onInfo}>
<Button
+ aria-label="About monthly usage"
+ tooltip="About monthly usage"
ref={props.infoButtonRef}
size="icon-sm"
variant="ghost"
- depth={3}
- label="About monthly usage"
onClick={props.onInfo}
>
<InfoIcon class="size-4 text-ink-muted" />
diff --git a/apps/web/src/features/usage/components/usage-info-dialog.tsx b/apps/web/src/features/usage/components/usage-info-dialog.tsx
index 58e0f90ee9..556b9e7572 100644
--- a/apps/web/src/features/usage/components/usage-info-dialog.tsx
+++ b/apps/web/src/features/usage/components/usage-info-dialog.tsx
@@ -27,10 +27,10 @@ export function UsageInfoDialog(props: {
Monthly limit
</Dialog.Title>
<Button
+ aria-label="Close usage explanation"
+ tooltip="Close usage explanation"
size="icon-sm"
variant="ghost"
- depth={3}
- label="Close usage explanation"
onClick={props.onClose}
>
<XIcon class="size-4" />
diff --git a/apps/web/src/features/usage/views/usage-settings.tsx b/apps/web/src/features/usage/views/usage-settings.tsx
index 989d5e8824..2e176077ae 100644
--- a/apps/web/src/features/usage/views/usage-settings.tsx
+++ b/apps/web/src/features/usage/views/usage-settings.tsx
@@ -88,8 +88,7 @@ export function UsageSettingsView(props: { context: UsageContext }) {
<Show when={props.context.failed()}>
<Button
class="self-start"
- variant="outline"
- depth={3}
+ variant="secondary"
onClick={props.context.refresh}
>
Try again
@@ -137,8 +136,7 @@ export function UsageSettingsView(props: { context: UsageContext }) {
description="Subscribe to a paid plan to keep going."
>
<Button
- variant="accent"
- depth={3}
+ variant="primary"
size="sm"
onClick={props.context.openPlans}
>
@@ -195,8 +193,7 @@ export function UsageSettingsView(props: { context: UsageContext }) {
ref={(button) => {
purchaseTrigger = button;
}}
- variant="outline"
- depth={3}
+ variant="secondary"
size="sm"
class="rounded-full px-4"
onClick={() => setPurchaseOpen(true)}
@@ -282,8 +279,7 @@ export function UsageSettingsView(props: { context: UsageContext }) {
<Show when={developer().openBillingLab}>
{(open) => (
<Button
- variant="accent"
- depth={3}
+ variant="primary"
size="sm"
class="self-start"
onClick={open()}
@@ -295,9 +291,8 @@ export function UsageSettingsView(props: { context: UsageContext }) {
<div class="flex flex-wrap gap-2">
<Button
variant={
- developer().plan() === 'free' ? 'accent' : 'outline'
+ developer().plan() === 'free' ? 'primary' : 'secondary'
}
- depth={3}
size="sm"
aria-pressed={developer().plan() === 'free'}
onClick={() => developer().previewPlan('free')}
@@ -306,9 +301,8 @@ export function UsageSettingsView(props: { context: UsageContext }) {
</Button>
<Button
variant={
- developer().plan() === 'paid' ? 'accent' : 'outline'
+ developer().plan() === 'paid' ? 'primary' : 'secondary'
}
- depth={3}
size="sm"
aria-pressed={developer().plan() === 'paid'}
onClick={() => developer().previewPlan('paid')}
@@ -316,8 +310,7 @@ export function UsageSettingsView(props: { context: UsageContext }) {
Preview paid plan
</Button>
<Button
- variant="outline"
- depth={3}
+ variant="secondary"
size="sm"
disabled={developer().beforeLaunch()}
onClick={() => developer().openLimitDialog('free')}
@@ -325,8 +318,7 @@ export function UsageSettingsView(props: { context: UsageContext }) {
Open Free usage-limit dialog
</Button>
<Button
- variant="outline"
- depth={3}
+ variant="secondary"
size="sm"
disabled={developer().beforeLaunch()}
onClick={() => developer().openLimitDialog('paid')}
@@ -334,8 +326,9 @@ export function UsageSettingsView(props: { context: UsageContext }) {
Open paid usage-limit dialog
</Button>
<Button
- variant={developer().beforeLaunch() ? 'accent' : 'outline'}
- depth={3}
+ variant={
+ developer().beforeLaunch() ? 'primary' : 'secondary'
+ }
size="sm"
aria-pressed={developer().beforeLaunch()}
onClick={developer().previewBeforeLaunch}
@@ -344,7 +337,6 @@ export function UsageSettingsView(props: { context: UsageContext }) {
</Button>
<Button
variant="ghost"
- depth={3}
size="sm"
disabled={!developer().active()}
onClick={developer().reset}
diff --git a/apps/web/src/features/whatsapp-linked/components/account-card.tsx b/apps/web/src/features/whatsapp-linked/components/account-card.tsx
index a7be96a4c3..4fea1ac824 100644
--- a/apps/web/src/features/whatsapp-linked/components/account-card.tsx
+++ b/apps/web/src/features/whatsapp-linked/components/account-card.tsx
@@ -38,7 +38,7 @@ export function ConnectCard(props: {
<Item.Actions class="self-center">
<Button
type="button"
- variant="strong"
+ variant="primary"
disabled={props.pending}
onClick={props.onConnect}
>
diff --git a/apps/web/src/features/whatsapp-linked/components/chat-list.tsx b/apps/web/src/features/whatsapp-linked/components/chat-list.tsx
index 5093e20939..95757066b6 100644
--- a/apps/web/src/features/whatsapp-linked/components/chat-list.tsx
+++ b/apps/web/src/features/whatsapp-linked/components/chat-list.tsx
@@ -129,7 +129,7 @@ export function ChatList(props: {
fallback={
<Button
type="button"
- variant="outline"
+ variant="secondary"
size="sm"
aria-label={
props.adding.has(chat.jid)
diff --git a/apps/web/src/features/whatsapp-linked/components/pairing-dialog.tsx b/apps/web/src/features/whatsapp-linked/components/pairing-dialog.tsx
index b6ae6c72c1..7427f6c48c 100644
--- a/apps/web/src/features/whatsapp-linked/components/pairing-dialog.tsx
+++ b/apps/web/src/features/whatsapp-linked/components/pairing-dialog.tsx
@@ -50,7 +50,7 @@ function CodeSlot(props: {
<Match when={props.expired}>
<CodeBox>
<p role="status">Code expired</p>
- <Button type="button" variant="strong" onClick={props.onRetry}>
+ <Button type="button" variant="primary" onClick={props.onRetry}>
Show a new code
</Button>
</CodeBox>
@@ -141,7 +141,7 @@ function PasskeyStep(props: {
</Show>
<Button
type="button"
- variant="strong"
+ variant="primary"
disabled={!props.challengeReady || !!running()}
onClick={props.onConfirm}
>
@@ -304,7 +304,7 @@ export function PairingDialog(props: {
? 'Linking was cancelled.'
: "Linking didn't finish."}
</p>
- <Button type="button" variant="strong" onClick={props.onRetry}>
+ <Button type="button" variant="primary" onClick={props.onRetry}>
Show a new code
</Button>
</div>
@@ -312,12 +312,7 @@ export function PairingDialog(props: {
</Switch>
</ActionDialogShell.Body>
<ActionDialogShell.Footer>
- <Button
- type="button"
- variant="ghost"
- depth={2}
- onClick={props.onCancel}
- >
+ <Button type="button" variant="ghost" onClick={props.onCancel}>
Cancel
</Button>
</ActionDialogShell.Footer>
diff --git a/apps/web/src/features/whatsapp-linked/views/whatsapp-page.tsx b/apps/web/src/features/whatsapp-linked/views/whatsapp-page.tsx
index 2c3a7f728f..82acfdae35 100644
--- a/apps/web/src/features/whatsapp-linked/views/whatsapp-page.tsx
+++ b/apps/web/src/features/whatsapp-linked/views/whatsapp-page.tsx
@@ -32,7 +32,12 @@ function LoadFailure(props: { what: string; onRetry: () => void }) {
return (
<div class="flex items-center gap-3 px-4 py-2 text-sm text-ink-muted">
<span role="alert">Couldn't load {props.what}.</span>
- <Button type="button" size="sm" variant="outline" onClick={props.onRetry}>
+ <Button
+ type="button"
+ size="sm"
+ variant="secondary"
+ onClick={props.onRetry}
+ >
Try again
</Button>
</div>
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index aacb70aecc..9276f6a602 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -78,43 +78,6 @@
--left-of-channel-rail: calc(var(--left-of-connector) - var(--channel-rail-width) / 2);
--channel-rail-center: calc(var(--left-of-channel-rail) + var(--channel-rail-width) / 2);
- /* Glass chrome, ported from the marketing site's hero CTA ring
- (solid-site `.home-hero-cta-bar`). The look is four things layered on a
- translucent surface: a backdrop blur, a bright inner top edge, a dark
- inner bottom edge, and a diagonal specular rim. Touch surfaces use only
- the diagonal reflections with short, dimmer opposing corners.
-
- Split in two so the size scale and the theme stay independent:
-
- - PALETTE (below, plus a light-mode pass) says which way the light comes
- from and how strong the effect is at full size. The site is dark-only,
- so its hard-coded values are the dark half; in a light theme the lift
- comes from white, not from the (dark) ink color.
- - GEOMETRY (owned by the utilities) says how big it is: blur/shadow
- extents, and `--glass-scale` multiplying every palette strength. The
- utilities set their tokens *on the element*, which would out-specify an
- inherited light-mode value, so they must never name a color or a
- strength directly — palette lives here, and only here. */
- --glass-tint: var(--color-content-1);
- --glass-press-tint: var(--color-content-1);
- --glass-shade-color: var(--color-surface-0);
- --glass-shadow-alpha: 0.55;
- --glass-highlight-base: 6%;
- --glass-shade-base: 40%;
- --glass-rim-strong-base: 13.5%;
- --glass-rim-soft-base: 9%;
- --glass-rim-shade-base: 0%;
- --glass-rim-gap-ratio: 0;
- --glass-desktop-outline: rgb(0 0 0 / 0.4);
- --glass-desktop-inner-edge: rgb(255 255 255 / 0.08);
- --glass-desktop-top-edge: rgb(255 255 255 / 0.12);
- /* Dark desktop glass separates by its outline; light adds a cast shadow. */
- --glass-desktop-cast-alpha: 0;
- --elevated-control-scale: 0.4;
- /* Mobile chrome has two diagonal reflections with quiet opposing corners. */
- --island-rim-strong: 28%;
- --island-rim-soft: 12%;
-
/* Depth-0 defaults for content rendered outside a Layer marker. */
--layer-surface: var(--color-surface-0);
--layer-inset: var(--color-surface-0);
@@ -125,35 +88,6 @@
}
-/* Light themes invert where the glass gets its lift: the bright edge is white
- rather than the (dark) ink color, the bottom edge is a hint of ink rather
- than a hole punched in black, and the cast shadow is softer so the surface
- reads as raised instead of cut out. Palette only — the geometry tokens are
- shared, so every size scales the same way in both themes. */
-html[data-theme-light='true'] {
- --glass-tint: white;
- --glass-press-tint: white;
- --glass-shade-color: var(--color-content-0);
- --glass-shadow-alpha: 0.28;
- --glass-highlight-base: 55%;
- --glass-shade-base: 8%;
- --glass-rim-strong-base: 52.5%;
- --glass-rim-soft-base: 30%;
- /* A faint ink rim keeps white reflections legible on pale surfaces. */
- --glass-rim-shade-base: 7%;
- /* Keep quiet corners close to the highlight instead of exposing a dark rim. */
- --glass-rim-gap-ratio: 0.85;
- --glass-desktop-outline: var(--color-edge-frame);
- --glass-desktop-inner-edge: rgb(255 255 255 / 0.6);
- --glass-desktop-top-edge: rgb(255 255 255 / 0.9);
- /* A fine outline alone vanishes on near-white content: keep the glass cast
- shadow, and give controls a full 1px edge like a bordered input. */
- --glass-desktop-cast-alpha: var(--glass-shadow-alpha);
- --elevated-control-scale: 1;
- --island-rim-strong: 75%;
- --island-rim-soft: 40%;
-}
-
html[data-platform='ios'],
body.tauri-ios {
--app-border-width: 1px;
@@ -696,6 +630,181 @@ body.tauri-ios {
--sidepanel-label-width: 5.5rem;
}
+/* Runtime theme tokens. Dark is the default; light overrides follow.
+ Reset shared materials at every theme marker so previews resolve locally.
+ Root-only and device conditions retain their existing scope. */
+:root,
+[data-theme-light] {
+ /* Neutral borders. Focus, status, and glass edges stay independent. */
+ --border-primary: oklch(1 0 0 / 16%);
+ --border-secondary: oklch(1 0 0 / 12%);
+ --border-tertiary: oklch(1 0 0 / 8%);
+ --divider: oklch(1 0 0 / 4%);
+
+ /* Button materials. */
+ --button-primary-bg: var(--color-accent);
+ --button-primary-ink: white;
+ --button-primary-state-mix: black;
+ --button-primary-hover: color-mix(in srgb, var(--button-primary-bg) 82%, var(--button-primary-state-mix));
+ --button-primary-pressed: color-mix(in srgb, var(--button-primary-bg) 72%, var(--button-primary-state-mix));
+ --button-neutral-bg: white;
+ --button-neutral-ink: black;
+ --button-neutral-hover: color-mix(in srgb, var(--button-neutral-bg) 82%, var(--button-neutral-ink));
+ --button-neutral-pressed: color-mix(in srgb, var(--button-neutral-bg) 72%, var(--button-neutral-ink));
+ --button-focus: var(--color-edge-focus, var(--color-accent));
+ --button-elevated-outline: var(--glass-desktop-outline);
+ --button-elevated-top-edge: var(--glass-desktop-top-edge);
+ --button-elevated-inner-edge: var(--glass-desktop-inner-edge);
+
+ /* Tint the face before applying opacity so dark state strengths stay fixed. */
+ --button-secondary-face: color-mix(in srgb, white 98%, var(--color-accent) 2%);
+ --button-secondary-bg: oklch(from var(--button-secondary-face) l c h / 4%);
+ --button-secondary-hover: oklch(from var(--button-secondary-face) l c h / 6%);
+ --button-secondary-pressed: oklch(from var(--button-secondary-face) l c h / 8%);
+ --button-outline-hover: oklch(1 0 0 / 8%);
+ --button-outline-pressed: oklch(1 0 0 / 10%);
+ --button-tertiary-bg: transparent;
+ --button-tertiary-hover: oklch(1 0 0 / 10%);
+ --button-tertiary-pressed: oklch(1 0 0 / 14%);
+
+ --button-danger-bg: oklch(from var(--color-failure) l c h / 10%);
+ --button-danger-hover: oklch(from var(--color-failure) l c h / 26%);
+ --button-danger-pressed: oklch(from var(--color-failure) l c h / 32%);
+ --button-success-bg: oklch(from var(--color-success) l c h / 8%);
+ --button-success-hover: oklch(from var(--color-success) l c h / 16%);
+ --button-success-pressed: oklch(from var(--color-success) l c h / 22%);
+
+ /* Negative spread keeps the faint contact shadow beneath the button. */
+ --button-shadow: 0 2px 1px -1px oklch(0 0 0 / 10%);
+
+ /* Avatar edges remain at the current 0.4 review strength. */
+ --color-avatar-edge: oklch(0 0 0 / 0.4);
+
+ /* The document owns the glass palette; geometry stays in the utilities. */
+ &:where(:root) {
+ /* Colors and strengths stay here; utilities own blur, dimensions, and
+ --glass-scale so control sizes share the same material. */
+ --glass-tint: var(--color-content-1);
+ --glass-press-tint: var(--color-content-1);
+ --glass-shade-color: var(--color-surface-0);
+ --glass-shadow-alpha: 0.55;
+ --glass-highlight-base: 6%;
+ --glass-shade-base: 40%;
+ --glass-rim-strong-base: 13.5%;
+ --glass-rim-soft-base: 9%;
+ --glass-rim-shade-base: 0%;
+ --glass-rim-gap-ratio: 0;
+ --glass-desktop-outline: rgb(0 0 0 / 0.4);
+ --glass-desktop-inner-edge: rgb(255 255 255 / 0.08);
+ --glass-desktop-top-edge: rgb(255 255 255 / 0.12);
+ /* Dark desktop glass separates by its outline; light adds a cast shadow. */
+ --glass-desktop-cast-alpha: 0;
+ --elevated-control-scale: 0.4;
+ /* Mobile chrome has two diagonal reflections with quiet opposing corners. */
+ --island-rim-strong: 28%;
+ --island-rim-soft: 12%;
+ }
+
+ /* Preserve the darker thread rail only on an explicitly dark document. */
+ &:is(html):where([data-theme-light='false']) {
+ --color-thread-rail: color-mix(in oklch, var(--color-surface) 70%, var(--color-ink));
+ }
+}
+
+[data-theme-light='true'] {
+ /* Neutral borders. */
+ --border-primary: oklch(0 0 0 / 16%);
+ --border-secondary: oklch(0 0 0 / 12%);
+ --border-tertiary: oklch(0 0 0 / 8%);
+ --divider: oklch(0 0 0 / 4%);
+
+ /* Button materials. */
+ --button-neutral-bg: black;
+ --button-neutral-ink: white;
+ /* Keep hover and pressed shading neutral over the lightly tinted face. */
+ --button-secondary-bg: var(--button-secondary-face);
+ --button-secondary-hover: color-mix(in srgb, var(--button-secondary-face), black 4%);
+ --button-secondary-pressed: color-mix(in srgb, var(--button-secondary-face), black 8%);
+ /* Raised light controls keep the outer frame without inset highlights. */
+ --button-elevated-top-edge: transparent;
+ --button-elevated-inner-edge: transparent;
+ --button-outline-hover: oklch(0 0 0 / 4%);
+ --button-outline-pressed: oklch(0 0 0 / 8%);
+ --button-tertiary-hover: oklch(0 0 0 / 4%);
+ --button-tertiary-pressed: oklch(0 0 0 / 8%);
+
+ --button-danger-bg: oklch(from var(--color-failure) l c h / 20%);
+ --button-success-bg: oklch(from var(--color-success) l c h / 20%);
+ --button-success-hover: oklch(from var(--color-success) l c h / 26%);
+ --button-success-pressed: oklch(from var(--color-success) l c h / 32%);
+
+ --button-shadow: 0 2px 1px -1px oklch(0 0 0 / 5%);
+
+ /* Avatar and composer surfaces. */
+ --color-avatar-edge: oklch(1 0 0 / 0.4);
+ --color-composer: var(--color-surface-4);
+
+ /* Light document glass keeps its existing root-only scope. */
+ &:is(html) {
+ --glass-tint: white;
+ --glass-press-tint: white;
+ --glass-shade-color: var(--color-content-0);
+ --glass-shadow-alpha: 0.28;
+ --glass-highlight-base: 55%;
+ --glass-shade-base: 8%;
+ --glass-rim-strong-base: 52.5%;
+ --glass-rim-soft-base: 30%;
+ /* A faint ink rim keeps white reflections legible on pale surfaces. */
+ --glass-rim-shade-base: 7%;
+ /* Keep quiet corners close to the highlight instead of exposing a dark rim. */
+ --glass-rim-gap-ratio: 0.85;
+ --glass-desktop-outline: var(--color-edge-frame);
+ --glass-desktop-inner-edge: rgb(255 255 255 / 0.6);
+ --glass-desktop-top-edge: rgb(255 255 255 / 0.9);
+ /* A fine outline alone vanishes on near-white content: keep the glass cast
+ shadow, and give controls a full 1px edge like a bordered input. */
+ --glass-desktop-cast-alpha: var(--glass-shadow-alpha);
+ --elevated-control-scale: 1;
+ --island-rim-strong: 75%;
+ --island-rim-soft: 40%;
+
+ &:not([data-touch-device='true']) {
+ --color-control-raised: color-mix(in oklch, var(--color-surface-2) 98%, var(--color-content-0));
+ }
+ }
+}
+@theme inline {
+ --color-border-primary: var(--border-primary);
+ --color-border-secondary: var(--border-secondary);
+ --color-border-tertiary: var(--border-tertiary);
+ --color-divider: var(--divider);
+ --color-button-primary-bg: var(--button-primary-bg);
+ --color-button-primary-hover: var(--button-primary-hover);
+ --color-button-primary-pressed: var(--button-primary-pressed);
+ --color-button-primary-ink: var(--button-primary-ink);
+ --color-button-neutral-bg: var(--button-neutral-bg);
+ --color-button-neutral-ink: var(--button-neutral-ink);
+ --color-button-neutral-hover: var(--button-neutral-hover);
+ --color-button-neutral-pressed: var(--button-neutral-pressed);
+ --color-button-secondary-bg: var(--button-secondary-bg);
+ --color-button-secondary-hover: var(--button-secondary-hover);
+ --color-button-secondary-pressed: var(--button-secondary-pressed);
+ --color-button-outline-hover: var(--button-outline-hover);
+ --color-button-outline-pressed: var(--button-outline-pressed);
+ --color-button-tertiary-bg: var(--button-tertiary-bg);
+ --color-button-tertiary-hover: var(--button-tertiary-hover);
+ --color-button-tertiary-pressed: var(--button-tertiary-pressed);
+ --color-button-danger-bg: var(--button-danger-bg);
+ --color-button-danger-hover: var(--button-danger-hover);
+ --color-button-danger-pressed: var(--button-danger-pressed);
+ --color-button-success-bg: var(--button-success-bg);
+ --color-button-success-hover: var(--button-success-hover);
+ --color-button-success-pressed: var(--button-success-pressed);
+ --color-button-focus: var(--button-focus);
+ --shadow-button: var(--button-shadow);
+ --spacing-button-control: 2rem;
+}
+
/* Interface languages whose scripts Inter doesn't cover. Latin text keeps the
default faces; the script's glyphs come from each platform's native UI font
(macOS, Windows, then Noto on Linux/Android), and `lang` on <html> (set by
@@ -749,28 +858,8 @@ html:not([data-touch-device="true"]) [data-invert] {
@custom-variant light-mode (&:where([data-theme-light="true"] *));
@custom-variant dark-mode (&:where([data-theme-light="false"] *));
-/* Dark surfaces need a larger ink step for the thread path to remain visible.
- Both inputs stay opaque, so overlapping rail segments still render evenly. */
-html[data-theme-light='false'] {
- --color-thread-rail: color-mix(in oklch, var(--color-surface) 70%, var(--color-ink));
-}
-
-/* The avatar hairline follows the surface it sits on: it darkens the edge on
- dark surfaces and lightens it on light ones, so the avatar settles into the
- page instead of being ringed against it. Ancestor-scoped for the same reason
- as the variants above.
-
- NOTE: turned up to 0.4 so the treatment is obvious while it is being
- reviewed. The intended production value is 0.08 — change both alphas below
- (and the @theme default) once the look is settled. */
-[data-theme-light='false'] {
- --color-avatar-edge: oklch(0 0 0 / 0.4);
-}
-
-[data-theme-light='true'] {
- --color-avatar-edge: oklch(1 0 0 / 0.4);
- --color-composer: var(--color-surface-4);
-}
+/* Expanded content is not a pressed action; only popup triggers stay active. */
+@custom-variant popup-open (&:where([aria-haspopup]:not([aria-haspopup="false"]))[aria-expanded="true"]);
/* Desktop floating surfaces use a close contact shadow rather than the longer
touch shadow. */
@@ -779,22 +868,7 @@ html:not([data-touch-device='true']) {
--shadow-control: 0 1px 2px rgb(0 0 0 / 0.06);
}
-html[data-theme-light='true']:not([data-touch-device='true']) {
- --color-control-raised: color-mix(in oklch, var(--color-surface-2) 98%, var(--color-content-0));
-}
-
-/* Right-side header actions share a quiet, hover-only background. Touch header
- islands own their controls' chrome (the compose island's filled send button,
- say), so the flattening stops at an island boundary. */
-@utility header-actions {
- & [data-button]:is([data-variant="ghost"], [data-variant="outline"]):not([data-header-island] *) {
- @apply glass-none border-0 bg-transparent;
-
- &:not(:hover):not(:active) {
- background-image: none;
- }
- }
-}
+/* Header Button presentation belongs to the shared Button recipes. */
/* Floating "island" chrome shared by the mobile dock buttons, header islands,
and other floating mobile controls. Consumers add their own shape classes
@@ -927,6 +1001,14 @@ html[data-theme-light='true']:not([data-touch-device='true']) {
--elevation-ambient-shadow: var(--shadow-control);
}
+/* Reuse shared elevation with Button-specific edge colors. */
+@utility button-elevated {
+ @apply elevated;
+ --glass-desktop-outline: var(--button-elevated-outline);
+ --glass-desktop-top-edge: var(--button-elevated-top-edge);
+ --glass-desktop-inner-edge: var(--button-elevated-inner-edge);
+}
+
/* Strip the glass under a variant (e.g. a container query collapsing a pill
to a bare icon, where a rim would chip it). Variant-prefixed utilities sort
after plain ones, so `@max-2xl/u-list:glass-none` beats a plain `glass`. */
@@ -1098,8 +1180,8 @@ html[data-platform='ios'][data-touch-device='true'] :is(
[data-input] [data-composer-collapsed],
[data-mobile-dock-island],
[data-header-island],
- [data-slot='button-group'].glass,
- :is(button, a, [role='button'], [role='tab']):is(.glass, .island, [class~='touch:island'])
+ [data-slot='button-group']:is(.glass, [class~='touch:glass']),
+ :is(button, a, [role='button'], [role='tab']):is(.glass, [class~='touch:glass'], .island, [class~='touch:island'])
) {
/* The shimmer replaces native tap feedback only on these press surfaces. */
-webkit-tap-highlight-color: transparent;
@@ -1831,8 +1913,10 @@ html:not([data-touch-device="true"]) [data-message][data-targeted]:hover{
transition: none;
}
-:focus-visible {
- outline: none;
+@layer base {
+ :focus-visible {
+ outline: none;
+ }
}
input[type="time"]::-webkit-calendar-picker-indicator {
diff --git a/apps/web/src/lib/core/comments/Thread.tsx b/apps/web/src/lib/core/comments/Thread.tsx
index 856a7f1705..b0404c1ef2 100644
--- a/apps/web/src/lib/core/comments/Thread.tsx
+++ b/apps/web/src/lib/core/comments/Thread.tsx
@@ -186,7 +186,7 @@ export function ThreadBody(props: ThreadBodyProps) {
variant="ghost"
onClick={() => setResolved(false)}
>
- <ArrowCounterClockwise />
+ <ArrowCounterClockwise class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Reopen
</Button>
</Show>
@@ -204,7 +204,7 @@ export function ThreadBody(props: ThreadBodyProps) {
context.setActiveThread(null);
}}
>
- <Check />
+ <Check class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Resolve
</Button>
</div>
diff --git a/apps/web/src/lib/core/component/AI/component/AIChatEmptyState.tsx b/apps/web/src/lib/core/component/AI/component/AIChatEmptyState.tsx
index e7e7c64659..6b043f9bf3 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 ? 'outline' : 'ghost'}
+ variant={copiedKey() === item.key ? 'secondary' : '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' ? 'outline' : 'ghost'}
+ variant={copiedKey() === 'json' ? 'secondary' : '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.tsx
index cd5ea3ff45..072c407b02 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 the
empty-states styling PR to keep it focused. */}
<Button
- variant={isCopied() ? 'outline' : 'ghost'}
+ variant={isCopied() ? 'secondary' : '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.tsx
index 839c684de2..c3ab72bf1a 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="accent" onClick={sendAll}>
+ <Button variant="primary" 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="accent"
+ variant="primary"
onClick={() => {
fireAndForget(makeRequest(), 'ai-debug');
}}
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.tsx
index 75caaa850c..affe49aab2 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,13 @@ 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="accent">
+ <Button onClick={() => input.setIsGenerating(true)} variant="primary">
Generate
</Button>
- <Button onClick={() => input.setIsGenerating(false)} variant="accent">
+ <Button
+ onClick={() => input.setIsGenerating(false)}
+ variant="primary"
+ >
Stop
</Button>
</div>
@@ -471,7 +474,7 @@ function ProviderFailureDemoBody(props: {
if (e.key === 'Enter') send();
}}
/>
- <Button variant="accent" onClick={send}>
+ <Button variant="primary" onClick={send}>
Send
</Button>
</div>
@@ -678,10 +681,10 @@ function TableStreamInner() {
return (
<Item col label="Table stream with controls">
<div class="flex gap-x-2 items-center">
- <Button onClick={startStream} variant="accent">
+ <Button onClick={startStream} variant="primary">
Stream
</Button>
- <Button onClick={() => setIsPaused((p) => !p)} variant="accent">
+ <Button onClick={() => setIsPaused((p) => !p)} variant="primary">
{isPaused() ? 'Resume' : 'Pause'}
</Button>
<label class="flex items-center gap-x-1 text-xs">
@@ -701,7 +704,7 @@ function TableStreamInner() {
Raw
</label>
<Button
- variant="accent"
+ variant="primary"
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.tsx
index 458860ffbd..1d70731a39 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
@@ -173,7 +173,7 @@ export default function HttpStreamDebug() {
<div class="flex gap-2">
<Button
onClick={sendMessage}
- variant="accent"
+ variant="primary"
disabled={isStreaming()}
>
{isStreaming() ? 'Streaming...' : 'Send Message'}
@@ -186,7 +186,7 @@ export default function HttpStreamDebug() {
setError(null);
setIsStreaming(false);
}}
- variant="outline"
+ variant="secondary"
>
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.tsx
index 69b08ac149..5a7a65fa24 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
@@ -198,25 +198,25 @@ export default function StaticMarkdownStreamDebug() {
</div>
<div class="flex items-center gap-2">
<Button
- variant="accent"
+ variant="primary"
size="sm"
onClick={startStream}
disabled={isStreaming()}
>
- <PlayIcon />
+ <PlayIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Stream
</Button>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={stopRun}
disabled={!isStreaming()}
>
- <StopIcon />
+ <StopIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Stop
</Button>
<Button variant="ghost" size="sm" onClick={resetOutput}>
- <TrashIcon />
+ <TrashIcon class="size-3 touch:size-6 shrink-0 pointer-events-none" />
Reset
</Button>
</div>
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.tsx
index 2c477928e0..e30a54425d 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="accent"
+ variant="primary"
>
Stream
</Button>
<Button
- variant="accent"
+ variant="primary"
onClick={() => {
setStream(undefined);
chat.setMessages([]);
diff --git a/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx b/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx
index d86ef9ddb6..0fbaea77ab 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ChatInput.test.tsx
@@ -197,9 +197,7 @@ describe('compact mobile chat drafts', () => {
expect(wrapper.classList.contains('max-h-5')).toBe(true);
mocks.startDictation();
expect(wrapper.classList.contains('max-h-5')).toBe(false);
- const cancel = document.querySelector<HTMLButtonElement>(
- '[label="Cancel dictation"]'
- )!;
+ const cancel = screen.getByRole('button', { name: 'Cancel dictation' });
input.focus();
cancel.focus();
expect(wrapper.classList.contains('max-h-5')).toBe(false);
diff --git a/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx b/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx
index 10c6156332..a6e0465281 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ChatInput.tsx
@@ -272,26 +272,26 @@ export function ChatInput(props: ChatInputComponentProps) {
const LeftButton = () => (
<Button
+ tooltip="Attach files"
variant="ghost"
- size="icon-composer"
- class="text-ink not-touch:text-composer-ink touch:size-6"
- label="Attach files"
+ size="icon-md"
+ class="text-ink not-touch:text-composer-ink"
aria-label="Attach files"
onClick={() => {
// Open synchronously from the tap so the native picker retains user activation.
fileInputRef?.click();
}}
>
- <PaperclipIcon />
+ <PaperclipIcon class="size-5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
const StopButton = () => (
<Button
- variant={isTouchDevice() ? 'ghost' : 'strong'}
- size="icon-composer"
- label="Stop generating"
- hotkey={TOKENS.chat.stop}
+ aria-label="Stop generating"
+ tooltip={{ content: 'Stop generating', hotkey: TOKENS.chat.stop }}
+ variant={isTouchDevice() ? 'ghost' : 'secondary'}
+ size="icon-md"
onClick={() => props.onStop?.()}
class={cn(
'touch:size-7.5',
@@ -307,9 +307,7 @@ export function ChatInput(props: ChatInputComponentProps) {
const SendButton = () => (
<UiSendButton
appearance="composer"
- tooltip={'Ask AI'}
- shortcut="enter"
- tooltipPlacement="top"
+ tooltip={{ content: 'Ask AI', placement: 'top', shortcut: 'enter' }}
disabled={!canSendMessage()}
class="touch:rounded-full"
onClick={() => sendMessage()}
diff --git a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx
index 0dc54bb64a..46f095830e 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ModelCatalogPicker.tsx
@@ -388,14 +388,15 @@ function ModelCatalogSheet(
<Button
variant="ghost"
size="icon-md"
- label="Back to Suggested"
+ aria-label="Back to Suggested"
+ tooltip="Back to Suggested"
onClick={() => {
setShowAll(false);
setQuery('');
searchInput?.focus();
}}
>
- <ArrowLeft />
+ <ArrowLeft class="size-4 shrink-0 touch:size-6" />
</Button>
</Show>
<MobileDrawer.Title class="min-w-0 flex-1 truncate font-medium">
diff --git a/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsx b/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsx
index e0494cbbea..b2ce67ea40 100644
--- a/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/ModelSelector.tsx
@@ -72,7 +72,7 @@ export function ModelSelector(props: ModelSelectorProps) {
placement="top-end"
triggerClass={cn(
'h-8 w-auto gap-1.5 border-0 px-2 text-sm text-ink-subtle hover:bg-hover',
- 'not-touch:h-[33.75px] not-touch:text-base not-touch:gap-[5.625px] not-touch:px-[7.5px] not-touch:[&_svg]:size-[15px] not-touch:light-mode:text-composer-placeholder not-touch:light-mode:font-normal',
+ 'not-touch:h-[33.75px] not-touch:text-base not-touch:gap-[5.625px] not-touch:px-[7.5px] not-touch:light-mode:text-composer-placeholder not-touch:light-mode:font-normal',
props.compact && 'not-touch:p-[3.75px]',
isMobile() &&
'touch:min-h-11 touch:min-w-11 justify-center rounded-full',
diff --git a/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx b/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx
index 104db25cfa..c1be255b81 100644
--- a/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx
+++ b/apps/web/src/lib/core/component/AI/component/input/SpeedToggle.tsx
@@ -37,9 +37,9 @@ export function SpeedToggle(props: { model: string }) {
return (
<Show when={speed()}>
<Button
+ tooltip={label()}
variant="ghost"
size="icon-md"
- label={label()}
aria-label={label()}
aria-pressed={enabled()}
onMouseDown={(event) => event.preventDefault()}
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.tsx
index 43d3cad4dd..837d788572 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
@@ -42,8 +42,13 @@ export function useAiDataConsentGate() {
<div class="flex flex-row items-center justify-between px-2 h-10 gap-2 border-b border-b-edge-muted">
<div class="flex flex-row items-center gap-2">
<Dialog.CloseButton>
- <Button label="Close" variant="ghost" size="icon-sm">
- <CloseIcon />
+ <Button
+ aria-label="Close"
+ tooltip="Close"
+ variant="ghost"
+ size="icon-sm"
+ >
+ <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Dialog.CloseButton>
<Dialog.Title>AI Data Sharing</Dialog.Title>
@@ -59,7 +64,7 @@ export function useAiDataConsentGate() {
<Button variant="ghost" onClick={denyConsent}>
Cancel
</Button>
- <Button variant="strong" onClick={grantConsent}>
+ <Button variant="secondary" onClick={grantConsent}>
Accept
</Button>
</div>
diff --git a/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx b/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx
index c39f3f0b5b..071a7dc325 100644
--- a/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx
+++ b/apps/web/src/lib/core/component/AI/component/message/AssistantMessage.tsx
@@ -178,7 +178,6 @@ export function AssistantMessage(props: {
<Button
variant="ghost"
size="icon-sm"
- noTouchResize
class="p-1 text-ink-extra-muted hover:text-ink-muted"
tooltip={
isLoading()
@@ -197,15 +196,16 @@ export function AssistantMessage(props: {
>
<Show
when={!isLoading()}
- fallback={<LoadingIcon class="animate-spin" />}
+ fallback={
+ <LoadingIcon class="animate-spin size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
>
- <WideFileMd />
+ <WideFileMd class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
<Button
variant="ghost"
size="icon-sm"
- noTouchResize
class="p-1 text-ink-extra-muted hover:text-ink-muted"
tooltip={
copied()
@@ -214,8 +214,13 @@ export function AssistantMessage(props: {
}
onClick={handleCopy}
>
- <Show when={!copied()} fallback={<CheckIcon />}>
- <ClipboardIcon />
+ <Show
+ when={!copied()}
+ fallback={
+ <CheckIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
+ }
+ >
+ <ClipboardIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Show>
</Button>
<Show when={props.ttft && ENABLE_TTFT}>
diff --git a/apps/web/src/lib/core/component/AI/component/message/UserMessage.tsx b/apps/web/src/lib/core/component/AI/component/message/UserMessage.tsx
index ee323ce83c..5374f018cb 100644
--- a/apps/web/src/lib/core/component/AI/component/message/UserMessage.tsx
+++ b/apps/web/src/lib/core/component/AI/component/message/UserMessage.tsx
@@ -141,7 +141,7 @@ export function UserMessage(props: {
size="icon-md"
onClick={() => setIsEditing(true)}
>
- <PencilIcon />
+ <PencilIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</Show>
diff --git a/apps/web/src/lib/core/component/AI/component/tool/Tool.tsx b/apps/web/src/lib/core/component/AI/component/tool/Tool.tsx
index a9532ccf3b..0e0a29f52c 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/Tool.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/Tool.tsx
@@ -115,7 +115,6 @@ function ResultToggle(props: ToolResultToggleProps) {
type="button"
variant="ghost"
size="sm"
- noTouchResize
aria-expanded={props.expanded}
class="shrink-0 whitespace-nowrap px-1 text-ink-extra-muted hover:text-ink-muted"
onClick={(event) => {
@@ -128,6 +127,7 @@ function ResultToggle(props: ToolResultToggleProps) {
<span>{props.status}</span>
</Show>
<CaretRight
+ class="size-3 touch:size-6 shrink-0 pointer-events-none"
aria-hidden="true"
classList={{
'rotate-90': props.expanded,
diff --git a/apps/web/src/lib/core/component/AI/component/tool/calendar/DraftComposer.tsx b/apps/web/src/lib/core/component/AI/component/tool/calendar/DraftComposer.tsx
index 60f4416943..7c1c0309b1 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/calendar/DraftComposer.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/calendar/DraftComposer.tsx
@@ -266,7 +266,7 @@ function CalendarDraftComposerContent(props: CalendarDraftComposerProps) {
<>
<span>Could not load your calendars.</span>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={retryCalendarData}
>
@@ -288,7 +288,7 @@ function CalendarDraftComposerContent(props: CalendarDraftComposerProps) {
<Show when={requestedNeedsAccess() && requestedInbox()}>
{(link) => (
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(
@@ -306,7 +306,7 @@ function CalendarDraftComposerContent(props: CalendarDraftComposerProps) {
</Show>
<Show when={!requestedInbox()}>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() =>
fireAndForget(
diff --git a/apps/web/src/lib/core/component/AI/component/tool/calendar/EventPreview.tsx b/apps/web/src/lib/core/component/AI/component/tool/calendar/EventPreview.tsx
index 12dfbbf136..ac1b2d45a8 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/calendar/EventPreview.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/calendar/EventPreview.tsx
@@ -314,17 +314,19 @@ export function CalendarToolEventPreview(props: CalendarToolEventPreviewProps) {
</Button>
</Show>
<Button
+ aria-label={`Previous ${previewView() === 'dayGridMonth' ? 'month' : 'week'}`}
+ tooltip={`Previous ${previewView() === 'dayGridMonth' ? 'month' : 'week'}`}
variant="ghost"
size="icon-sm"
- label={`Previous ${previewView() === 'dayGridMonth' ? 'month' : 'week'}`}
onClick={() => navigate('previous')}
>
<CaretLeftIcon class="size-4" />
</Button>
<Button
+ aria-label={`Next ${previewView() === 'dayGridMonth' ? 'month' : 'week'}`}
+ tooltip={`Next ${previewView() === 'dayGridMonth' ? 'month' : 'week'}`}
variant="ghost"
size="icon-sm"
- label={`Next ${previewView() === 'dayGridMonth' ? 'month' : 'week'}`}
onClick={() => navigate('next')}
>
<CaretRightIcon class="size-4" />
diff --git a/apps/web/src/lib/core/component/AI/component/tool/email/DraftComposer.tsx b/apps/web/src/lib/core/component/AI/component/tool/email/DraftComposer.tsx
index 12012c60b1..88566c807b 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/email/DraftComposer.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/email/DraftComposer.tsx
@@ -511,7 +511,7 @@ export function EmailDraftComposer(props: EmailDraftComposerProps) {
<Show when={canRetrySender()}>
<Button
size="sm"
- variant="outline"
+ variant="secondary"
disabled={uiDisabled()}
onClick={retrySender}
>
diff --git a/apps/web/src/lib/core/component/DocumentPreview.tsx b/apps/web/src/lib/core/component/DocumentPreview.tsx
index 28cad370b0..63075cc33c 100644
--- a/apps/web/src/lib/core/component/DocumentPreview.tsx
+++ b/apps/web/src/lib/core/component/DocumentPreview.tsx
@@ -473,7 +473,7 @@ export function CalendarEventPreviewDetails(props: {
class="mt-1 flex flex-wrap items-center gap-1"
onClick={(event) => event.stopPropagation()}
>
- <Button variant="outline" size="xs" onClick={open()}>
+ <Button variant="secondary" size="xs" onClick={open()}>
<CalendarCheckIcon />
Open
</Button>
@@ -851,7 +851,7 @@ export function DocumentPreviewContent(props: DocumentPreviewContentProps) {
variant="ghost"
aria-label="Reference actions"
>
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content blockingBackdrop class="z-nested-action-menu">
<Dropdown.Group>
diff --git a/apps/web/src/lib/core/component/EmailPermissionsBanner.tsx b/apps/web/src/lib/core/component/EmailPermissionsBanner.tsx
index 494d5d22d4..f34cbed9bd 100644
--- a/apps/web/src/lib/core/component/EmailPermissionsBanner.tsx
+++ b/apps/web/src/lib/core/component/EmailPermissionsBanner.tsx
@@ -14,7 +14,7 @@ export function EmailPermissionsBanner() {
<div class="text-sm shrink-0">No email account connected.</div>
<span class="grow" />
<Button
- variant="accent"
+ variant="primary"
size="sm"
class="px-4"
onClick={() => fireAndForget(startAddInbox(), 'add-inbox')}
diff --git a/apps/web/src/lib/core/component/FileDownload.tsx b/apps/web/src/lib/core/component/FileDownload.tsx
index d3effc98f1..f79fe49ff6 100644
--- a/apps/web/src/lib/core/component/FileDownload.tsx
+++ b/apps/web/src/lib/core/component/FileDownload.tsx
@@ -1,17 +1,19 @@
import { isTouchDevice } from '@core/mobile/isTouchDevice';
import type { FileDownloadController } from '@core/util/createFileDownload';
import { fireAndForget } from '@core/util/fireAndForget';
+import ShareIcon from '@icon/share.svg';
import DownloadIcon from '@icon/system/regular/download-simple.svg';
import SpinnerIcon from '@icon/system/regular/spinner.svg';
import XIcon from '@icon/system/regular/x.svg';
-import ShareIcon from '@phosphor/export.svg';
-import { Button, Dropdown } from '@ui';
+import { Button, ButtonGroup, Dropdown } from '@ui';
import { createSignal, Show } from 'solid-js';
+import { Dynamic } from 'solid-js/web';
import { useHoldParentHoverCardOpen } from './HoverCard';
export function FileDownloadButton(props: {
download: FileDownloadController;
iconOnly?: boolean;
+ grouped?: boolean;
}) {
const [menuOpen, setMenuOpen] = createSignal(false);
useHoldParentHoverCardOpen(() => menuOpen() || props.download.busy());
@@ -33,9 +35,16 @@ export function FileDownloadButton(props: {
if (props.download.phase() === 'idle') setMenuOpen(false);
};
const save = () => fireAndForget(start(), 'file-download');
+ const buttonSize = () => {
+ if (props.iconOnly) return props.grouped ? 'icon-sm' : 'icon-md';
+ return props.grouped ? undefined : 'md';
+ };
const icon = () => (
- <Show when={props.download.busy()} fallback={<DownloadIcon />}>
- <SpinnerIcon class="animate-spin" />
+ <Show
+ when={props.download.busy()}
+ fallback={<DownloadIcon class="size-4 shrink-0 touch:size-6" />}
+ >
+ <SpinnerIcon class="size-4 shrink-0 animate-spin touch:size-6" />
</Show>
);
@@ -44,36 +53,42 @@ export function FileDownloadButton(props: {
when={isTouchDevice() && props.download.canOfferShare()}
fallback={
<>
- <Button
+ <Dynamic
+ component={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
- size={props.iconOnly ? 'icon-md' : 'md'}
- label={label()}
+ size={buttonSize()}
+ aria-label={label()}
+ tooltip={label()}
disabled={props.download.busy()}
onClick={save}
>
{icon()}
<Show when={!props.iconOnly}>{label()}</Show>
- </Button>
+ </Dynamic>
<Show when={props.download.busy()}>
- <Button
+ <Dynamic
+ component={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
- size={props.iconOnly ? 'icon-md' : 'md'}
- label="Cancel download"
+ size={buttonSize()}
+ aria-label="Cancel download"
+ tooltip="Cancel download"
onClick={props.download.cancel}
>
<Show when={props.iconOnly} fallback="Cancel">
- <XIcon />
+ <XIcon class="size-4 shrink-0 touch:size-6" />
</Show>
- </Button>
+ </Dynamic>
</Show>
</>
}
>
<Dropdown open={menuOpen()} onOpenChange={setMenuOpen}>
<Dropdown.Trigger
+ as={props.grouped ? ButtonGroup.Button : Button}
variant="ghost"
- size={props.iconOnly ? 'icon-md' : 'md'}
- label={label()}
+ size={buttonSize()}
+ aria-label={label()}
+ tooltip={label()}
>
{icon()}
<Show when={!props.iconOnly}>{label()}</Show>
diff --git a/apps/web/src/lib/core/component/FindBar.tsx b/apps/web/src/lib/core/component/FindBar.tsx
index 138f0ba39b..324f6b748e 100644
--- a/apps/web/src/lib/core/component/FindBar.tsx
+++ b/apps/web/src/lib/core/component/FindBar.tsx
@@ -105,7 +105,7 @@ function FindBarSubmitButton() {
!controller.hasUnsubmittedChanges() && !!controller.query().trim(),
}}
>
- <MagnifyingGlass />
+ <MagnifyingGlass class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -204,7 +204,7 @@ function FindBarPreviousButton() {
direction() === 'desc' ? controller.next() : controller.previous()
}
>
- <CaretUp />
+ <CaretUp class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -225,7 +225,7 @@ function FindBarNextButton() {
direction() === 'desc' ? controller.previous() : controller.next()
}
>
- <CaretDown />
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
@@ -239,7 +239,7 @@ function FindBarCloseButton() {
aria-label="Close find bar"
onClick={() => controller.close()}
>
- <X />
+ <X class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
);
}
diff --git a/apps/web/src/lib/core/component/ForwardToChannel.tsx b/apps/web/src/lib/core/component/ForwardToChannel.tsx
index 79911ef835..728c85c848 100644
--- a/apps/web/src/lib/core/component/ForwardToChannel.tsx
+++ b/apps/web/src/lib/core/component/ForwardToChannel.tsx
@@ -669,8 +669,7 @@ export function ForwardToChannel(props: ForwardToChannelProps) {
Cancel
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="primary"
disabled={selectedOptions().length === 0 || isSubmitting()}
onClick={() => {
const options = selectedOptions();
diff --git a/apps/web/src/lib/core/component/ImageGalleryPreview.tsx b/apps/web/src/lib/core/component/ImageGalleryPreview.tsx
index 4979c23f55..bbec4815fd 100644
--- a/apps/web/src/lib/core/component/ImageGalleryPreview.tsx
+++ b/apps/web/src/lib/core/component/ImageGalleryPreview.tsx
@@ -136,7 +136,7 @@ export const ImageGalleryPreview: Component<ImageGalleryPreviewProps> = (
disabled={props.isContext}
>
<Button variant="ghost" size="icon-md">
- <ExpandIcon />
+ <ExpandIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Dialog.Trigger>
<Dropdown>
@@ -145,7 +145,7 @@ export const ImageGalleryPreview: Component<ImageGalleryPreviewProps> = (
size="icon-md"
disabled={props.isContext}
>
- <ThreeDotsIcon />
+ <ThreeDotsIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content>
<Dropdown.Group>
diff --git a/apps/web/src/lib/core/component/ImagePreview.tsx b/apps/web/src/lib/core/component/ImagePreview.tsx
index cc533a1162..d180f67dbc 100644
--- a/apps/web/src/lib/core/component/ImagePreview.tsx
+++ b/apps/web/src/lib/core/component/ImagePreview.tsx
@@ -152,7 +152,7 @@ export function ImagePreview(props: ImagePreviewProps) {
<div class="group-hover:visible invisible absolute top-2 right-2 bg-surface rounded-2xl border border-edge flex flex-row items-center gap-1 z-10">
<Dialog.Trigger disabled={props.isContext}>
<Button variant="ghost" size="icon-md">
- <ExpandIcon />
+ <ExpandIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Dialog.Trigger>
<Dropdown>
@@ -161,7 +161,7 @@ export function ImagePreview(props: ImagePreviewProps) {
size="icon-md"
disabled={props.isContext}
>
- <ThreeDotsIcon />
+ <ThreeDotsIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content>
<Dropdown.Group>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/accessory/CodeBoxAccessory.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/accessory/CodeBoxAccessory.tsx
index c3070a09bb..e2b0cad862 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/accessory/CodeBoxAccessory.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/accessory/CodeBoxAccessory.tsx
@@ -273,7 +273,7 @@ export function CodeBoxAccessory(props: {
deleteCode();
}}
>
- <TrashCan />
+ <TrashCan class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<CopyButton
@@ -383,9 +383,7 @@ function SvgPreview(props: { svgContent: () => string; overlay?: boolean }) {
};
return (
- <div class={'absolute top-12 inset-x-0 bottom-0 z-10 p-2'}>
- {renderSvg()}
- </div>
+ <div class="absolute top-12 inset-x-0 bottom-0 z-10 p-2">{renderSvg()}</div>
);
}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
index 361d1b101d..d3c96e34ba 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
@@ -545,7 +545,7 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {
variant="ghost"
aria-label="Document card actions"
>
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content mount={portalMount()}>
<Dropdown.Group>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
index 11c0471495..ecb246df75 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx
@@ -259,7 +259,7 @@ function InlinePreview(props: {
data-document-name={props.documentName}
class="opacity-50"
>
- <Show when={props.documentName} fallback={'Loading...'}>
+ <Show when={props.documentName} fallback="Loading...">
{(name) => name().replaceAll('\n', ' ').trim()}
</Show>
<MentionAccessories
@@ -305,7 +305,7 @@ function InlinePreview(props: {
data-block-name={props.blockName}
data-document-name={props.documentName}
>
- <Show when={props.documentName} fallback={'Unknown'}>
+ <Show when={props.documentName} fallback="Unknown">
{(name) => name().replaceAll('\n', ' ').trim()}
</Show>
<MentionAccessories
@@ -735,7 +735,8 @@ function DatabaseMention(props: DocumentMentionDecoratorProps) {
<Button
variant="ghost"
size="icon-xs"
- label="Expand database"
+ aria-label="Expand database"
+ tooltip="Expand database"
on:mousedown={(event) => event.preventDefault()}
on:click={expand}
>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/HorizontalRule.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/HorizontalRule.tsx
index 686b190714..0b419e7206 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/HorizontalRule.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/HorizontalRule.tsx
@@ -67,6 +67,7 @@ export function HorizontalRule(props: HorizontalRuleDecoratorProps) {
<div class="absolute h-full top-0 right-2 flex flex-row gap-1 items-center">
{editor()?.isEditable() && (
<Button
+ variant="ghost"
class="size-8 p-0 border-0 bg-transparent hover:bg-hover"
tooltip="Remove"
on:mousedown={(e: MouseEvent) => {
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipPullRequest.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipPullRequest.tsx
index 522e05002b..a4415ee59c 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipPullRequest.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipPullRequest.tsx
@@ -116,7 +116,6 @@ export const MagicChipPullRequest: Component<{ url: string }> = (props) => {
variant: 'ghost',
size: 'sm',
fullWidth: true,
- noTouchResize: true,
class:
'h-8 min-w-0 justify-start rounded-lg bg-hover p-2 transition-none not-touch:not-disabled:hover:bg-active not-touch:not-disabled:hover:bg-none not-disabled:active:bg-none',
})}
@@ -133,7 +132,6 @@ export const MagicChipPullRequest: Component<{ url: string }> = (props) => {
variant="ghost"
size="sm"
fullWidth
- noTouchResize
class="h-8 min-w-0 flex-1 justify-start rounded-lg bg-hover p-2 transition-none not-touch:not-disabled:hover:bg-active not-touch:not-disabled:hover:bg-none not-disabled:active:bg-none"
aria-label={label()}
data-magic-chip-pull-request={props.url}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipView.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipView.tsx
index a209a548bf..20e25d8ac0 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipView.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MagicChip/MagicChipView.tsx
@@ -200,7 +200,6 @@ export const MagicChipView: Component<{
<Button
variant="ghost"
size="icon-sm"
- noTouchResize
aria-label="Collapse to mention"
on:click={(event) => {
event.preventDefault();
@@ -208,13 +207,12 @@ export const MagicChipView: Component<{
props.onCollapse?.();
}}
>
- <ArrowsIn />
+ <ArrowsIn class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Button
- variant="outline"
+ variant="secondary"
size="sm"
- noTouchResize
class="aspect-square bg-transparent p-0 font-normal @[600px]:aspect-auto @[600px]:px-2"
aria-label="Open session"
disabled={props.loading || !props.onOpen}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MarkdownVideo.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MarkdownVideo.tsx
index ef0f9b0507..6634e41806 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MarkdownVideo.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MarkdownVideo.tsx
@@ -391,7 +391,7 @@ export function MarkdownVideo(props: VideoDecoratorProps) {
<div class="absolute bg-surface top-2 right-2 flex flex-row z-10">
<Dialog.CloseButton>
<Button variant="ghost" size="icon-md">
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Dialog.CloseButton>
</div>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx
index a57a18cede..8afe95b818 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/MediaButtons.tsx
@@ -51,7 +51,7 @@ export function MediaButtons(props: MediaButtonsProps) {
props.enlarge?.();
}}
>
- <ArrowsOut />
+ <ArrowsOut class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.Trigger>
</Show>
<Show when={props.newTab && !isMobile()}>
@@ -65,7 +65,7 @@ export function MediaButtons(props: MediaButtonsProps) {
props.newTab?.();
}}
>
- <NewTab />
+ <NewTab class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
<Show when={props.delete}>
@@ -79,7 +79,7 @@ export function MediaButtons(props: MediaButtonsProps) {
props.delete?.();
}}
>
- <Trash />
+ <Trash class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Show>
</>
@@ -102,7 +102,7 @@ export function MediaButtons(props: MediaButtonsProps) {
variant="ghost"
tooltip="More options"
>
- <ThreeDotsIcon />
+ <ThreeDotsIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content>
<Dropdown.Group>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteActionsMenu.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteActionsMenu.tsx
index 49e4a5b8f1..a138cbb407 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteActionsMenu.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteActionsMenu.tsx
@@ -21,7 +21,7 @@ export function PasteActionsMenu(props: {
<div class={props.class} on:click={(e) => e.stopPropagation()}>
<Dropdown open={open()} onOpenChange={setOpen}>
<Dropdown.Trigger size="icon-sm" variant="ghost">
- <DotsThree />
+ <DotsThree class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content mount={portalMount()}>
<Dropdown.Group>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteTextViewer.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteTextViewer.tsx
index 822424b43d..9392a7b250 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteTextViewer.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/paste/PasteTextViewer.tsx
@@ -32,7 +32,7 @@ export function PasteTextViewer(props: {
tooltip="Copy"
on:click={() => props.onCopy()}
>
- <Copy />
+ <Copy class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</>
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.tsx
index d1c2488367..fd110de44b 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
@@ -266,11 +266,13 @@ export function FloatingFormatMenu(props: {
const InlineButton = (buttonProps: { item: InlineOption }) => (
<Button
- label={buttonProps.item.label}
- shortcut={buttonProps.item.shortcut}
+ aria-label={buttonProps.item.label}
+ tooltip={{
+ content: buttonProps.item.label,
+ shortcut: buttonProps.item.shortcut,
+ }}
size="icon-sm"
- depth={3}
- variant={selection()?.[buttonProps.item.format] ? 'accent' : 'ghost'}
+ variant={selection()?.[buttonProps.item.format] ? 'primary' : 'ghost'}
onPointerDown={(e: PointerEvent) => e.preventDefault()}
onClick={(e: MouseEvent | KeyboardEvent) => {
e.preventDefault();
@@ -290,11 +292,10 @@ export function FloatingFormatMenu(props: {
<Dropdown.Trigger
variant="ghost"
size="icon-sm"
- depth={3}
tooltip="More formatting"
tabIndex={-1}
>
- <DotsThreeLarge />
+ <DotsThreeLarge class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Dropdown.Trigger>
<Dropdown.Content onCloseAutoFocus={refocusEditor}>
<Dropdown.Group>
@@ -325,7 +326,6 @@ export function FloatingFormatMenu(props: {
variant="ghost"
size="sm"
class="gap-1"
- depth={3}
tooltip="Text style"
tabIndex={-1}
>
@@ -385,7 +385,6 @@ export function FloatingFormatMenu(props: {
<Button
variant="ghost"
size="icon-sm"
- depth={3}
onPointerDown={(e: PointerEvent) => e.preventDefault()}
onClick={handleLink}
tooltip={selection()?.hasLinks ? 'Remove Link' : 'Insert Link'}
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.tsx
index 9de57990d4..7761d9dce1 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
@@ -450,11 +450,11 @@ export function FloatingLinkMenu(props: {
<div class="flex items-center gap-0.5 ease-in-out">
<Button
onClick={openInNewTab}
- variant="accent"
+ variant="primary"
size="icon-sm"
tooltip="Open in new tab"
>
- <NewTab />
+ <NewTab class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
onClick={handleEditClick}
@@ -462,7 +462,7 @@ export function FloatingLinkMenu(props: {
size="icon-sm"
tooltip="Edit link"
>
- <Pencil />
+ <Pencil class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
onClick={copyLink}
@@ -470,7 +470,7 @@ export function FloatingLinkMenu(props: {
size="icon-sm"
tooltip="Copy link"
>
- <Copy />
+ <Copy class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Button
onClick={handleUnlink}
@@ -478,7 +478,7 @@ export function FloatingLinkMenu(props: {
size="icon-sm"
tooltip="Remove link"
>
- <Trash />
+ <Trash class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
</div>
@@ -518,12 +518,13 @@ export function FloatingLinkMenu(props: {
>
<Button
onClick={handleSubmit}
- variant="cta"
+ variant="primary"
size="sm"
tooltip="Apply link changes"
disabled={!pendingLinkInfo()?.url && !pendingLinkInfo()?.linkText}
>
- <Check /> Apply
+ <Check class="size-3 touch:size-6 shrink-0 pointer-events-none" />{' '}
+ Apply
</Button>
</div>
</MenuWrapper>
diff --git a/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx b/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx
index 4cd8d12b98..b15258a76e 100644
--- a/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx
+++ b/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx
@@ -87,30 +87,41 @@ export function Lightbox(props: LightboxProps) {
>
<LightboxToolbar isVisible={true}>
<Button
+ aria-label="Copy image"
+ tooltip="Copy image"
variant="ghost"
size="icon-md"
onClick={images.copyToClipboard}
disabled={images.isBusy() || images.isPrefetching()}
- label="Copy image"
>
- {images.isCopying() ? <SpinnerIcon /> : <ClipboardIcon />}
+ {images.isCopying() ? (
+ <SpinnerIcon />
+ ) : (
+ <ClipboardIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
<Button
+ aria-label="Download image"
+ tooltip="Download image"
variant="ghost"
size="icon-md"
onClick={images.downloadImage}
disabled={images.isBusy() || images.isPrefetching()}
- label="Download image"
>
- {images.isDownloading() ? <SpinnerIcon /> : <DownloadIcon />}
+ {images.isDownloading() ? (
+ <SpinnerIcon />
+ ) : (
+ <DownloadIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ )}
</Button>
<Dialog.CloseButton
+ aria-label="Close"
+ tooltip="Close"
as={Button}
variant="ghost"
size="icon-md"
- label="Close"
>
- <XIcon />
+ <XIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Dialog.CloseButton>
</LightboxToolbar>
diff --git a/apps/web/src/lib/core/component/NotificationsModal.tsx b/apps/web/src/lib/core/component/NotificationsModal.tsx
index 3d80466590..880b6ff8df 100644
--- a/apps/web/src/lib/core/component/NotificationsModal.tsx
+++ b/apps/web/src/lib/core/component/NotificationsModal.tsx
@@ -31,6 +31,7 @@ function _NotificationsButton(props: {
return (
<div class="relative p-0 flex" tabIndex={-1}>
<Button
+ variant="ghost"
class={cn(
'px-1',
drawerControl.isOpen() &&
@@ -43,7 +44,7 @@ function _NotificationsButton(props: {
}}
size="icon-sm"
>
- <Bell />
+ <Bell class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
<Suspense fallback={null}>
<Show when={unreadCount() > 0}>
diff --git a/apps/web/src/lib/core/component/TopBar/LoginButton.tsx b/apps/web/src/lib/core/component/TopBar/LoginButton.tsx
index 516f971200..a48ec3c586 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="outline"
+ variant="secondary"
size="sm"
onClick={() => navigate(`/login${window.location.search}`)}
>
@@ -24,7 +24,7 @@ export function LoginButton() {
</Button>
<span class="text-xs text-ink-muted italic">or</span>
<Button
- variant="accent"
+ variant="primary"
size="sm"
onClick={() => navigate(`/welcome${window.location.search}`)}
>
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
index c67a604eb4..31e9acd249 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
@@ -369,12 +369,13 @@ vi.mock('@ui', async () => {
children?: JSX.Element;
disabled?: boolean;
tooltip?: string;
+ 'aria-label'?: string;
onClick?: () => void;
}) => (
<button
disabled={props.disabled}
onClick={props.onClick}
- aria-label={props.tooltip}
+ aria-label={props['aria-label'] ?? props.tooltip}
>
{props.children}
</button>
@@ -420,7 +421,7 @@ vi.mock('@ui', async () => {
ItemIndicator: Container,
Group: Container,
}),
- ButtonGroup: Object.assign(Container, { Divider: () => null }),
+ ButtonGroup: Object.assign(Container, { Button, Divider: () => null }),
Tabs: (props: {
'aria-label'?: string;
onChange?: (value: string) => void;
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
index fec5cc69d9..41a1083d92 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
@@ -56,6 +56,7 @@ import clickOutside from '@core/directive/clickOutside';
import { registerHotkey } from '@core/hotkey/hotkeys';
import { TOKENS } from '@core/hotkey/tokens';
import { isMobile } from '@core/mobile/isMobile';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { blockHotkeyScopeSignal } from '@core/signal/blockElement';
import { blockEditPermissionEnabledSignal } from '@core/signal/load';
import { useIsDocumentOwner } from '@core/signal/permissions';
@@ -114,6 +115,7 @@ import { useNavigate } from '@solidjs/router';
import { useQuery, useQueryClient } from '@tanstack/solid-query';
import {
Button,
+ ButtonGroup,
CopyButton,
cn,
Dropdown,
@@ -479,7 +481,7 @@ function TeamAccessSection(props: { teamShare: TeamShareControls }) {
</div>
<Dropdown>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
aria-label="Team access"
class="min-w-16.75 py-1 pl-2 pr-1 flex items-center gap-1"
>
@@ -611,7 +613,7 @@ function LinkSharingControls(props: LinkSharingControlsProps) {
setPermissions={props.setLinkShareAccessLevel}
/>
</div>
- <Button variant="outline" onClick={props.copyLink}>
+ <Button variant="secondary" onClick={props.copyLink}>
<CopyIcon class="size-4" />
<span>Copy Link</span>
</Button>
@@ -810,9 +812,9 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
</div>
<Show when={effectiveActiveTab() === 'share' && props.canForward}>
<Button
- variant="ghost"
+ variant="primary"
size="sm"
- class="shrink-0 ml-2 pl-2 disabled:text-ink-muted text-accent"
+ class="shrink-0 ml-2"
disabled={
(forwardRef()?.getSelectedOptions().length ?? 0) === 0
}
@@ -886,7 +888,7 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
</Show>
<Show when={!props.canForward}>
<div class="px-4 py-3">
- <Button variant="outline" onClick={props.copyLink}>
+ <Button variant="secondary" onClick={props.copyLink}>
<CopyIcon class="size-4" />
<span>Copy Link</span>
</Button>
@@ -1922,7 +1924,7 @@ export function ShareModal(props: ShareModalProps) {
</Show>
<Show when={!canForward()}>
<div class="flex justify-end px-4 py-3">
- <Button variant="outline" onClick={copyLink}>
+ <Button variant="secondary" onClick={copyLink}>
<CopyIcon class="size-4" />
<span>Copy Link</span>
</Button>
@@ -2212,6 +2214,7 @@ export function ShareTrigger(props: {
blockType?: ShareBlockType;
hotkeyScope?: string;
copyLink?: () => void;
+ size?: 'sm' | 'md';
}) {
const isAuthenticated = useIsAuthenticated();
const inBlock = isInBlock();
@@ -2332,17 +2335,22 @@ export function ShareTrigger(props: {
sharePermission.teamShareAccessLevel
);
});
+ const iconSize = () =>
+ isTouchDevice() || props.size === 'md' ? 'icon-md' : 'icon-sm';
return (
- <HeaderActionGroup label="Sharing">
+ <HeaderActionGroup label="Sharing" size={props.size}>
<div
ref={requests.ref}
- class="flex items-center touch:gap-1"
+ class="flex items-stretch touch:items-center touch:gap-1"
onPointerEnter={warmShareDialog}
onFocusIn={warmShareDialog}
>
- <Tooltip
- label={
+ <HeaderActionButton
+ grouped
+ size={isTouchDevice() ? undefined : props.size}
+ label="Share"
+ tooltip={
shareStatus()?.tooltip ??
(blockType() === 'agent'
? 'Share agent session'
@@ -2352,32 +2360,29 @@ export function ShareTrigger(props: {
? 'This item has been shared with you.'
: `Share ${blockType()}`)
}
- >
- <HeaderActionButton
- label="Share"
- icon={
- <ShareRequestIcon count={requests.count()}>
- <IconShared class="size-4" />
- </ShareRequestIcon>
+ icon={
+ <ShareRequestIcon count={requests.count()}>
+ <IconShared class="size-4" />
+ </ShareRequestIcon>
+ }
+ onClick={() => {
+ if (!isAuthenticated()) {
+ openLoginModal();
+ } else {
+ analytics.track('share_menu_open', { blockType: blockType() });
+ requests.open();
}
- onClick={() => {
- if (!isAuthenticated()) {
- openLoginModal();
- } else {
- analytics.track('share_menu_open', { blockType: blockType() });
- requests.open();
- }
- }}
- />
- </Tooltip>
+ }}
+ />
<CopyButton
+ as={ButtonGroup.Button}
variant="ghost"
tooltip="Copy Share Link"
- size="icon-md"
+ size={iconSize()}
onClick={ShareLinkAction().action}
>
- <Dynamic component={ShareLinkAction().icon} class="size-3.5!" />
+ <Dynamic component={ShareLinkAction().icon} class="size-3.5" />
</CopyButton>
</div>
</HeaderActionGroup>
@@ -2482,7 +2487,7 @@ export function ShareOptions(props: {
return (
<Dropdown modal={false} open={isOpen()} onOpenChange={setIsOpen}>
<Dropdown.Trigger
- variant="outline"
+ variant="secondary"
disabled={props.disabled}
class={`min-w-16.75 py-1 pl-2 pr-1 flex items-center gap-1 ${props.noBorder ? 'border-0 sm:border' : ''}`}
on:keydown={(e: KeyboardEvent) => {
diff --git a/apps/web/src/lib/core/email-link/ProviderDialog.tsx b/apps/web/src/lib/core/email-link/ProviderDialog.tsx
index e302864f02..19ae831060 100644
--- a/apps/web/src/lib/core/email-link/ProviderDialog.tsx
+++ b/apps/web/src/lib/core/email-link/ProviderDialog.tsx
@@ -36,16 +36,14 @@ export function EmailProviderDialog(
Connect Gmail, Outlook.com, or an individual Microsoft 365 account.
</Dialog.Description>
<Button
- variant="strong"
- depth={3}
+ variant="secondary"
disabled={props.disabled}
onClick={() => props.onSelect('GMAIL')}
>
Gmail
</Button>
<Button
- variant="strong"
- depth={3}
+ variant="secondary"
disabled={props.disabled || !props.outlookAvailable}
onClick={() => props.onSelect('OUTLOOK')}
>
@@ -58,7 +56,6 @@ export function EmailProviderDialog(
</Show>
<Button
variant="ghost"
- depth={3}
disabled={props.disabled}
onClick={() => props.onOpenChange(false)}
>
diff --git a/apps/web/src/lib/core/internal/App.tsx b/apps/web/src/lib/core/internal/App.tsx
index 9115030c68..8589392484 100644
--- a/apps/web/src/lib/core/internal/App.tsx
+++ b/apps/web/src/lib/core/internal/App.tsx
@@ -72,7 +72,8 @@ const App: Component = () => {
center={
<Center>
<Button variant="ghost" onClick={togglePublicPermissions}>
- {documentAccess()} <CaretDown />
+ {documentAccess()}{' '}
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</Center>
}
@@ -80,8 +81,10 @@ const App: Component = () => {
<div class="flex flex-row flex-wrap justify-center gap-4">
<For each={Themes}>
{() => (
- <Button variant="outline">
- <Subtract /> Button Text <CaretDown />
+ <Button variant="secondary">
+ <Subtract class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />{' '}
+ Button Text{' '}
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</For>
@@ -89,8 +92,10 @@ const App: Component = () => {
<div class="flex flex-row flex-wrap justify-center gap-4">
<Index each={ThemesWithSeparator}>
{() => (
- <Button variant="outline">
- <Subtract /> Button Text <CaretDown />
+ <Button variant="secondary">
+ <Subtract class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />{' '}
+ Button Text{' '}
+ <CaretDown class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Index>
@@ -98,8 +103,8 @@ const App: Component = () => {
<div class="flex flex-row flex-wrap justify-center gap-4">
<Index each={Themes}>
{() => (
- <Button variant="outline" size="icon-md">
- <Acorn />
+ <Button variant="secondary" size="icon-md">
+ <Acorn class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Index>
@@ -107,9 +112,9 @@ const App: Component = () => {
<div class="flex flex-row flex-wrap justify-center gap-4">
<Index each={ThemesWithSeparator}>
{() => (
- <Button variant="outline" size="icon-md">
- <Acorn />
- <CaretDown />
+ <Button variant="secondary" size="icon-md">
+ <Acorn class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ <CaretDown class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Index>
@@ -117,9 +122,9 @@ const App: Component = () => {
<div class="flex flex-row flex-wrap justify-center gap-4">
<Index each={ThemesWithSeparator}>
{() => (
- <Button variant="outline" size="icon-md">
- <Acorn />
- <CaretDown />
+ <Button variant="secondary" size="icon-md">
+ <Acorn class="size-4 touch:size-6 shrink-0 pointer-events-none" />
+ <CaretDown class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
)}
</Index>
@@ -136,7 +141,7 @@ const App: Component = () => {
</div>
<div class="flex flex-row flex-wrap justify-center gap-4">
<Dropdown>
- <Dropdown.Trigger variant="outline" tabIndex={-1}>
+ <Dropdown.Trigger variant="secondary" 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.tsx
index 097c5e3e32..54c33c961f 100644
--- a/apps/web/src/lib/core/internal/DataDebug.tsx
+++ b/apps/web/src/lib/core/internal/DataDebug.tsx
@@ -90,8 +90,9 @@ const DataDebug: Component = () => {
</div>
}
center={
- <Button variant="outline" onClick={handleRefresh}>
- <Refresh /> Refresh
+ <Button variant="secondary" onClick={handleRefresh}>
+ <Refresh class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />{' '}
+ Refresh
</Button>
}
></Bar>
diff --git a/apps/web/src/lib/core/internal/ThemeDebug.tsx b/apps/web/src/lib/core/internal/ThemeDebug.tsx
index 198aeaf056..84dcafe837 100644
--- a/apps/web/src/lib/core/internal/ThemeDebug.tsx
+++ b/apps/web/src/lib/core/internal/ThemeDebug.tsx
@@ -29,12 +29,17 @@ const INK_VARIANTS = [
const BUTTON_VARIANTS = [
'ghost',
'outline',
- 'accent',
- 'strong',
+ 'secondary',
'danger',
- 'cta',
+ 'primary',
] as const;
-const BUTTON_CONTENT_VARIANTS = ['outline', 'accent', 'strong', 'cta'] as const;
+const BUTTON_CONTENT_VARIANTS = ['outline', 'secondary', 'primary'] as const;
+const BUTTON_ICON_SIZES = {
+ sm: 'icon-sm',
+ md: 'icon-md',
+ lg: 'icon-lg',
+ xl: 'icon-xl',
+} as const;
const BUTTON_SIZES = ['sm', 'md', 'lg', 'xl'] as const;
const BADGE_SIZES = ['sm', 'md', 'lg'] as const;
const BADGE_VARIANTS = ['ghost', 'outline'] as const;
@@ -286,12 +291,12 @@ function ThemeDebug() {
Icon only
</span>
<Button
+ aria-label={`Add (${variant}, ${size})`}
+ tooltip={`Add (${variant}, ${size})`}
variant={variant}
- size={size}
- square
- label={`Add (${variant}, ${size})`}
+ size={BUTTON_ICON_SIZES[size]}
>
- <PlusIcon />
+ <PlusIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</div>
<div class="flex flex-col items-start gap-1.5">
@@ -307,7 +312,7 @@ function ThemeDebug() {
Icon + text
</span>
<Button variant={variant} size={size}>
- <PlusIcon />
+ <PlusIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
Button
</Button>
</div>
@@ -422,18 +427,10 @@ function ThemeDebug() {
</Panel.Header>
<Panel.Body class="p-4">
<div class="flex flex-wrap gap-2">
- <Button variant="ghost" depth={depth}>
- Ghost
- </Button>
- <Button variant="outline" depth={depth}>
- Base
- </Button>
- <Button variant="accent" depth={depth}>
- Active
- </Button>
- <Button variant="danger" depth={depth}>
- Danger
- </Button>
+ <Button variant="ghost">Ghost</Button>
+ <Button variant="secondary">Base</Button>
+ <Button variant="primary">Active</Button>
+ <Button variant="danger">Danger</Button>
</div>
</Panel.Body>
</Panel>
@@ -461,7 +458,7 @@ function ThemeDebug() {
<Button variant="ghost" size="sm">
Cancel
</Button>
- <Button variant="strong" size="sm">
+ <Button variant="secondary" 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.tsx
index c9f121e64b..fe6ae052c9 100644
--- a/apps/web/src/lib/core/mobile/IosPushNotificationModal.tsx
+++ b/apps/web/src/lib/core/mobile/IosPushNotificationModal.tsx
@@ -45,7 +45,7 @@ export function IosPushNotificationModal() {
Later
</button>
<Button
- variant="strong"
+ variant="secondary"
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.tsx
index 6621880d6b..77501e4abb 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="strong" size="sm">
+ <Dialog.CloseButton as={Button} variant="secondary" 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.tsx
index d823a6bc8e..5c23a20dec 100644
--- a/apps/web/src/lib/core/mobile/NativeAppUpdateRequiredDialog.tsx
+++ b/apps/web/src/lib/core/mobile/NativeAppUpdateRequiredDialog.tsx
@@ -53,7 +53,7 @@ export function NativeAppUpdateRequiredDialog(props: {
<div class="flex justify-end gap-2">
<Show when={platform}>
<Button
- variant="strong"
+ variant="secondary"
size="sm"
disabled={opening()}
onClick={() => fireAndForget(openStore(), 'native-update-link')}
@@ -63,14 +63,14 @@ export function NativeAppUpdateRequiredDialog(props: {
</Show>
<Show when={props.onRestart}>
<Button
- variant="accent"
+ variant="primary"
size="sm"
onClick={() => props.onRestart?.()}
>
Restart to update
</Button>
</Show>
- <Button onClick={props.onClose} variant="strong" size="sm">
+ <Button onClick={props.onClose} variant="secondary" size="sm">
OK
</Button>
</div>
diff --git a/apps/web/src/lib/core/pipedream/connect-native.tsx b/apps/web/src/lib/core/pipedream/connect-native.tsx
index f2d57a1a12..31c735da58 100644
--- a/apps/web/src/lib/core/pipedream/connect-native.tsx
+++ b/apps/web/src/lib/core/pipedream/connect-native.tsx
@@ -57,7 +57,7 @@ export function openNativePipedreamConnectUI(
</Show>
<div class="flex gap-2">
<Button
- variant="outline"
+ variant="secondary"
onClick={() => fireAndForget(launch(), 'pipedream-connect-open')}
>
Open browser again
diff --git a/apps/web/src/lib/i18n/browser-test/menus.tsx b/apps/web/src/lib/i18n/browser-test/menus.tsx
index 25ecfa8fec..3cd68bb465 100644
--- a/apps/web/src/lib/i18n/browser-test/menus.tsx
+++ b/apps/web/src/lib/i18n/browser-test/menus.tsx
@@ -11,7 +11,7 @@ import { render } from 'solid-js/web';
import { SettingsSidebar } from '../../../features/settings/components/settings-sidebar';
import { LanguageSettings } from '../../../features/settings/LanguageSettings';
import { macroLightTheme } from '../../../features/theme/themes/macro-light';
-import { themeCssVars } from '../../../features/theme/utils/themeColorTokens';
+import { themeCssVars } from '../../../features/theme/utils/themeCssVars';
import { authKeys } from '../../queries/auth/keys';
import { teamKeys } from '../../queries/team/keys';
import type { TranslationKey } from '../dictionary';
diff --git a/apps/web/src/routes/BasePath.tsx b/apps/web/src/routes/BasePath.tsx
index 40ae20999b..a98d47e814 100644
--- a/apps/web/src/routes/BasePath.tsx
+++ b/apps/web/src/routes/BasePath.tsx
@@ -63,7 +63,7 @@ function SessionVerificationFallback(props: {
class="mt-2"
disabled={retrying()}
onClick={handleRetry}
- variant="outline"
+ variant="secondary"
>
{retrying() ? 'Retrying…' : 'Retry'}
</Button>
diff --git a/apps/web/src/routes/TaskRoute.tsx b/apps/web/src/routes/TaskRoute.tsx
index 8ab87c1a89..2ce857c9c4 100644
--- a/apps/web/src/routes/TaskRoute.tsx
+++ b/apps/web/src/routes/TaskRoute.tsx
@@ -79,7 +79,7 @@ function TaskRouteError(props: { notFound: boolean; onRetry?: () => void }) {
</p>
<div class="flex items-center gap-2">
<Button
- variant="outline"
+ variant="secondary"
size="sm"
onClick={() => navigate('/tasks')}
>
@@ -87,7 +87,7 @@ function TaskRouteError(props: { notFound: boolean; onRetry?: () => void }) {
</Button>
<Show when={!props.notFound && props.onRetry}>
{(onRetry) => (
- <Button variant="outline" size="sm" onClick={onRetry()}>
+ <Button variant="secondary" size="sm" onClick={onRetry()}>
Try again
</Button>
)}
diff --git a/apps/web/src/routes/pages.tsx b/apps/web/src/routes/pages.tsx
index 23eb407560..d745a3d965 100644
--- a/apps/web/src/routes/pages.tsx
+++ b/apps/web/src/routes/pages.tsx
@@ -70,7 +70,7 @@ export function LoginPopupSuccess() {
<div class="h-full overflow-y-hidden">
<div class="relative flex flex-row items-center pt-4 h-full">
<Button
- variant="outline"
+ variant="secondary"
onClick={() => {
publishLoginSuccess();
window.close();
diff --git a/apps/web/src/routes/public-booking-shell.tsx b/apps/web/src/routes/public-booking-shell.tsx
index 0b65fd0b7c..e359341838 100644
--- a/apps/web/src/routes/public-booking-shell.tsx
+++ b/apps/web/src/routes/public-booking-shell.tsx
@@ -15,13 +15,14 @@ export function PublicBookingShell(props: ParentProps) {
<Show when={showBack()}>
<header class="sticky top-0 z-10 flex bg-panel/95 px-2 pb-2 pt-[calc(var(--safe-top,0px)+0.5rem)] backdrop-blur-sm">
<Button
+ aria-label="Back to Macro"
+ tooltip="Back to Macro"
variant="ghost"
size="icon-md"
- label="Back to Macro"
onPointerDown={() => hapticImpact('light')}
onClick={() => navigate('/', { replace: true })}
>
- <ArrowLeftIcon />
+ <ArrowLeftIcon class="size-4 touch:size-6 shrink-0 pointer-events-none" />
</Button>
</header>
</Show>
diff --git a/apps/web/tests/e2e/helpers/local-app.ts b/apps/web/tests/e2e/helpers/local-app.ts
index 1cfb5a3420..1cac92a8f2 100644
--- a/apps/web/tests/e2e/helpers/local-app.ts
+++ b/apps/web/tests/e2e/helpers/local-app.ts
@@ -62,7 +62,7 @@ export async function createDocument(page: Page): Promise<string> {
/** Opens the side panel if hidden, then expands the named accordion section. */
export async function openSidePanelSection(page: Page, title: string) {
- const show = page.getByRole('button', { name: 'Show Side Panel' });
+ const show = page.getByRole('button', { name: 'Show details', exact: true });
const trigger = page.getByRole('button', { name: title, exact: true });
await expect(show.or(trigger).first()).toBeVisible({ timeout: 30_000 });
if (await show.isVisible()) {
diff --git a/apps/web/tests/functional/whatsapp-linked.spec.ts b/apps/web/tests/functional/whatsapp-linked.spec.ts
index 66eed54ccb..7edaaa8bbe 100644
--- a/apps/web/tests/functional/whatsapp-linked.spec.ts
+++ b/apps/web/tests/functional/whatsapp-linked.spec.ts
@@ -1353,7 +1353,7 @@ for (const mobile of [false, true]) {
page.getByRole('textbox', { name: 'Message Design Crit' })
).toBeVisible();
await page
- .getByRole('button', { name: mobile ? 'Show details' : /side panel/i })
+ .getByRole('button', { name: 'Show details', exact: true })
.click();
const members = page.getByRole('list', { name: 'WhatsApp members' });
await expect(members).toBeVisible();
diff --git a/apps/web/tests/functional/whatsapp-linked/fixture.tsx b/apps/web/tests/functional/whatsapp-linked/fixture.tsx
index 7e3e5d738e..8de6c12fe9 100644
--- a/apps/web/tests/functional/whatsapp-linked/fixture.tsx
+++ b/apps/web/tests/functional/whatsapp-linked/fixture.tsx
@@ -13,7 +13,7 @@ import { useUserId } from '@core/context/user';
import { Route, Router } from '@solidjs/router';
import { macroDarkTheme } from '@theme/themes/macro-dark';
import { macroLightTheme } from '@theme/themes/macro-light';
-import { themeCssVars } from '@theme/utils/themeColorTokens';
+import { themeCssVars } from '@theme/utils/themeCssVars';
import { onMount, Show, Suspense } from 'solid-js';
// The app's styles, so the page and its screenshots look like the app.
import '../../../src/index.css';
diff --git a/docs/agent-guide/tasks.md b/docs/agent-guide/tasks.md
index 4015236197..4ba20ad6b7 100644
--- a/docs/agent-guide/tasks.md
+++ b/docs/agent-guide/tasks.md
@@ -131,7 +131,7 @@ Saved views are available on main Tasks, not inside Project or CRM task lists.
- Desktop: use the **Saved views** sidebar section. Its icon-only **+** remains available when the section is empty, populated, collapsed, loading, or in an error state. Enter on the focused **+** starts a draft instead of opening the selected task.
- Mobile: the **Saved views** pill sits after **Filters** and before the built-in task tabs, using the same mobile pill component. It shows the selected view's name and active styling, and opens a drawer of saved-view rows with selection and management menus, without a duplicate section heading or a header create button. Create views from changed filters, layout, grouping, or sort in the filter drawer.
-- The empty sidebar and mobile picker show **Your go-to views**, the muted description **Save your setup for next time.**, and a neutral **Create view** button with a leading plus icon in a rounded container with a subtle border, 12px padding, the surrounding background, and no shadow or illustration. It starts the same unsaved draft as desktop **+**; on mobile, the picker closes first. Configure the draft in Filters, then choose **Save view**.
+- The empty sidebar and mobile picker show **Your go-to views**, the muted description **Save your setup for next time.**, and a secondary **Create view** button with a leading plus icon in a rounded container with a subtle border, 12px padding, the surrounding background, and no shadow or illustration. It starts the same unsaved draft as desktop **+**; on mobile, the picker closes first. Configure the draft in Filters, then choose **Save view**.
- Desktop **+** starts an unsaved view without person restrictions and with explicit open-status filters. It expands the section and adds a selected, italic **New view** row labeled **Draft** in the sidebar and mobile picker. Configure filters, then choose **Save view**; the name defaults to **New view** and can be edited before saving. A confirmed save replaces the draft with the named view; **Cancel** in the desktop toolbar or mobile filter drawer, another selection, or leaving Tasks removes the unsaved row. Canceling only the name dialog keeps the draft for later.
- When filters, layout, grouping, or sort differ from the built-in tab defaults, the filled **Save view** button appears immediately left of Filters on desktop and in an edge-to-edge mobile banner above the filter drawer footer. The borderless banner overlays content on a drawer-colored backing and has a leading bookmark icon on its button. Base settings and search alone do not show the banner. It captures current filters, layout, grouping, and ordered sort directions, but excludes text search and scroll state. My Tasks adds **Me** to Assignee; Created by me adds it to Created by. Additional people in the same filter use OR matching.
- Saved views use the normal Assignee and Created by filters, not a separate Scope control. **Me** stays relative; its tooltip says “Matches whoever opens this saved view.” A named person stays fixed. Removing Me removes that restriction.
diff --git a/docs/agent-guide/ui-conventions.md b/docs/agent-guide/ui-conventions.md
index 58984ded7c..4d4e866db6 100644
--- a/docs/agent-guide/ui-conventions.md
+++ b/docs/agent-guide/ui-conventions.md
@@ -21,10 +21,12 @@ semantic control islands on the right. Collection headers use `ListHeader`:
filters, view options, New, then expandable Search. Related detail actions share
a `HeaderActionGroup`; keep sharing, item navigation, and detail/view toggles in
separate groups. View tabs (channel, CRM record, and project sections, Signal and
-Noise) are `Tabs`: separate 32px pills, never inside a group. Groups use the
-canonical elevated surface, fully rounded ends, 32px controls, and 8px gaps.
-A group owns its frame; its child buttons stay flat and do not get extra borders
-or shadows. Nested shared actions reuse the containing group rather than adding
+Noise) are `Tabs`: separate 32px pills, never inside a group. Action groups use
+`variant="secondary" finish="raised"`, fully rounded ends, `sm`/`icon-sm` segments
+(28px controls), and 8px gaps. Tabs, New, and Search retain `md` sizing.
+Compose their actions with `ButtonGroup.Button`; the group shares Button's frame
+materials while each segment keeps its own interaction states. Standalone Buttons
+remain independent. Nested shared actions reuse the containing group rather than adding
another frame, and a group with no visible actions renders nothing. Keep
tooltips on icon-only controls and collapse labels as a pane narrows (`Tabs
iconOnly`, then a menu). Preserve specialized editor toolbars and touch
@@ -34,19 +36,25 @@ keeps its full-width field with facet chips under it. Inputs, search fields,
and filter chips are pills on the control frame. The [design system rule](../../.agents/rules/web/design-system.md)
lists which control to use for each role.
+Desktop view-sidebar header actions use `size="icon-xs"` (24px) with 16px
+glyphs for search, close, and collapse. Preserve each action's icon and the
+shared Button touch targets; do not resize these controls through classes.
On touch devices, low-emphasis header actions remain borderless with their
existing hover and pressed states. Emphasized variants retain their treatment,
including an active call's green ink. Button size does not change variant colors
-or framing. Use `glass={false}` for an explicitly flat frame. Inline
-calendar-invitation text actions remove the transparent border to keep alignment.
+or framing. Primary, neutral, secondary, danger, and success Buttons automatically use raised desktop styling and glass on touch. Use `finish="flat"` to opt out, or `finish="raised"` to frame a ghost/link action. Outline Buttons always stay flat, including when a finish is supplied.
+Primary Buttons use the theme accent and its resolved contrast color. Use `neutral` for solid monochrome emphasis (black in light themes, white in dark themes), and secondary for softer neutral actions. Current Button usages trial secondary instead of outline; the outline API and canonical gallery examples remain available. The separate accent variant remains removed.
+Button API and composition details live in the
+[shared primitive contract](../../.agents/rules/web/ui-primitives.md#button-and-buttongroup).
+Inline calendar-invitation text actions remove the transparent border to keep alignment.
## Canonical desktop surfaces
-Use `not-touch:elevated` for desktop control surfaces. Buttons, button groups,
-inputs, and unselected tab pills share the same `shadow-elevated` treatment as
-composers, menus, settings cards, and dialogs: a fine outer outline, faint inner
-edge, brighter top edge, and compact shadow. Keep semantic fills and component
-geometry; a button group owns the frame so its child buttons remain flat.
+Use `not-touch:elevated` for existing desktop control surfaces other than Button
+and ButtonGroup. Button applies its raised desktop recipe and the shared touch
+glass utility automatically; ButtonGroup applies the same material once to its
+frame. Explicit segments remain flat. Inputs and unselected tab pills retain
+their existing surfaces.
In dark mode, compact controls use thinner, lower-opacity edges than composers
and floating panels. Keep desktop shadows close and faint, with only a slight top
highlight, and define the border with subtle edge contrast.
@@ -59,7 +67,11 @@ draw a full 1px frame edge, menus keep the glass cast shadow, and
`ComposerSurface` (composers and settings cards) keeps the wide `composer-shadow`
halo. Touch surfaces retain their existing shadows.
-Desktop view tabs share one rounded track, with a small inset and a fully rounded selected pill. The selected pill uses the pressed fill and a subtle edge; tabs have no internal dividers. Wrapping preset choices can remain separate pills. Keep the existing touch-specific tab treatment and the agent composer's sliding track.
+Desktop view tabs share one flat rounded track, with a small inset and a fully
+rounded selected pill. Use borders and selected fills without raised edges,
+gradients, or shadows. Buttons use variant-specific pressed fills. Wrapping
+preset choices can remain separate pills. Keep each surface's existing touch
+treatment and the agent composer's sliding track (`variant="track"`).
Reuse `Button`, `Input`, `InputGroup`, `Tabs`, `ComposerSurface`, `menu-surface`, and
`elevated-surface` instead of introducing one-off surface styling. Every menu,
@@ -121,10 +133,10 @@ single-select rows keep their rounded shape.
## Dialog actions
-Cancel uses a ghost button. Confirm, save, and create actions use strong: the
-outline surface and border with semibold text, without inverted colors. Disabled
-and pending primary actions retain the strong variant. Mobile confirmation drawers
-use the same action hierarchy.
+Cancel uses a ghost button. Use primary for the main confirm, save, or create
+action; it uses the theme accent. Use neutral for solid monochrome emphasis and
+secondary for softer neutral actions. Loading actions use `loading`. Mobile
+confirmation drawers use the same action hierarchy.
## List-item sharing
diff --git a/docs/design/saved-views.md b/docs/design/saved-views.md
index 9b6d597793..f60abebdf1 100644
--- a/docs/design/saved-views.md
+++ b/docs/design/saved-views.md
@@ -100,7 +100,7 @@ Compose the list through compound components and reuse styled menu items across
its context and overflow menus. The mobile picker shows rows without a duplicate
section heading or general create button. The compact sidebar and picker empty
state show the heading “Your go-to views”, the muted description “Save your setup
-for next time.” and a neutral Create view button with a leading plus icon, without
+for next time.” and a `secondary`, `sm` Create view button with a leading plus icon, without
a separate illustration. A subtly bordered, rounded container uses 12px padding,
inherits the surrounding background, and has no shadow. The sidebar header's
icon-only plus remains available in every section state, including when the