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.

fix(ui): align control icons, variants, and switch thumbs (#9085)

dev-rb57b60c8d528d
diff --git a/.agents/rules/web/design-system.md b/.agents/rules/web/design-system.md
index 763eb2568f..321e43be16 100644
--- a/.agents/rules/web/design-system.md
+++ b/.agents/rules/web/design-system.md
@@ -52,6 +52,8 @@ construction. Browse them at `/app/component/ui` (Foundations → Controls).
sizing on the rendered icon, not on Button or ancestor SVG selectors. Enforced
for wrappers by ast-grep `tsx-no-descendant-button-styles`, warning.
- 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.
+- Quiet Back, Close, Cancel, and unframed inline utility actions use explicit `variant="ghost"`; omitting the variant opts into primary emphasis. Keep intentional framed groups and selected-state actions in their own variants. Size every rendered glyph explicitly, including children passed through action wrappers; Button does not size descendant SVGs.
+- Selected reaction chips are a deliberate local exception: `ReactionChip` uses `appearance="bare"` with accent-tint, accent-text, and overlay classes to preserve its soft selected treatment without a new Button variant. Keep unselected reactions on `secondary`.
- 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.
diff --git a/.agents/rules/web/ui-primitives.md b/.agents/rules/web/ui-primitives.md
index cd77649981..f2991a213e 100644
--- a/.agents/rules/web/ui-primitives.md
+++ b/.agents/rules/web/ui-primitives.md
@@ -81,6 +81,9 @@ Applies to `apps/web/src/components/ui`, including ports from shadcn-solid.
and `lg` is 20px. `ToggleSwitch` tracks use `xs` 28×14px, `sm` (default)
32×16px, and `md` 40×20px. Do not resize internal SVGs or override selection
colors from callers or enclosing pages; checked controls use the theme accent.
+- Switch thumbs stay fixed white in both states and every theme, with a secondary border.
+ Only the track changes to the theme accent when checked; do not apply accent-contrast to the thumb.
+ Use the shared `ToggleSwitch` for code-preview controls instead of separately styled Kobalte parts.
- Render `Checkbox.Control` or `RadioGroup.ItemControl` once per value; each
includes its native input and default indicator. Do not add a second Input slot.
- Use `InlineCheckbox` only as an aria-hidden decoration for an interactive row
diff --git a/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx b/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx
index 2d633b4ef1..b6edd07255 100644
--- a/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx
+++ b/apps/web/src/components/app/tab-layout/DesktopTabStrip.tsx
@@ -56,7 +56,7 @@ function TabItem(props: { tabManager: TabManager; tab: DesktopTab }) {
props.tabManager.closeTab(props.tab.id);
}}
>
- <XIcon />
+ <XIcon class="size-3.5" />
</Button>
</Show>
</div>
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 ace6834c45..c6ed1dd424 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
@@ -65,7 +65,7 @@ function DateField(props: DateFieldProps) {
),
})}
>
- <CalendarBlankIcon />
+ <CalendarBlankIcon class="size-3.5 shrink-0" />
<span class="truncate">
{selectedDate()
? dateLabelFormatter.format(selectedDate())
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 3fe60c6853..c9568adc2c 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
@@ -121,7 +121,7 @@ export function TimeRangeEditor(props: {
tooltip="Clear"
onClick={clear}
>
- <XIcon />
+ <XIcon class="size-3.5" />
</Button>
</Show>
}
diff --git a/apps/web/src/components/ui/components/CopyButton.docs.tsx b/apps/web/src/components/ui/components/CopyButton.docs.tsx
index 6754ee1fed..bfae7beba3 100644
--- a/apps/web/src/components/ui/components/CopyButton.docs.tsx
+++ b/apps/web/src/components/ui/components/CopyButton.docs.tsx
@@ -13,7 +13,7 @@ function VariantsDemo() {
variant={variant}
onClick={() => navigator.clipboard.writeText('Copied from Macro')}
>
- <CopyIcon />
+ <CopyIcon class="size-4" />
Copy {variant}
</CopyButton>
)}
@@ -36,7 +36,7 @@ function SizesDemo() {
variant="secondary"
onClick={() => navigator.clipboard.writeText('Copied from Macro')}
>
- <CopyIcon />
+ <CopyIcon class="size-4" />
{size !== 'icon-md' && 'Copy'}
</CopyButton>
)}
diff --git a/apps/web/src/components/ui/components/HoldButton.docs.tsx b/apps/web/src/components/ui/components/HoldButton.docs.tsx
index a82ac74a82..fd942c37ce 100644
--- a/apps/web/src/components/ui/components/HoldButton.docs.tsx
+++ b/apps/web/src/components/ui/components/HoldButton.docs.tsx
@@ -13,7 +13,7 @@ function HoldDemo() {
duration={2000}
onConfirm={() => setConfirmed((count) => count + 1)}
>
- <TrashIcon />
+ <TrashIcon class="size-4" />
Hold to delete
</HoldButton>
<span class="text-sm text-ink-muted">Confirmed {confirmed()} times</span>
diff --git a/apps/web/src/components/ui/components/InputGroup.docs.tsx b/apps/web/src/components/ui/components/InputGroup.docs.tsx
index 467e3dd3fc..f8f51f7f20 100644
--- a/apps/web/src/components/ui/components/InputGroup.docs.tsx
+++ b/apps/web/src/components/ui/components/InputGroup.docs.tsx
@@ -54,7 +54,7 @@ function AddonsDemo() {
<InputGroup.Input placeholder="macro.com" aria-label="Website" />
<InputGroup.Addon align="inline-end">
<InputGroup.Button size="icon-md" aria-label="Open website">
- <ArrowRightIcon />
+ <ArrowRightIcon class="size-4" />
</InputGroup.Button>
</InputGroup.Addon>
</InputGroup>
diff --git a/apps/web/src/components/ui/components/InputGroup.tsx b/apps/web/src/components/ui/components/InputGroup.tsx
index 011b1b07ea..3de9f64626 100644
--- a/apps/web/src/components/ui/components/InputGroup.tsx
+++ b/apps/web/src/components/ui/components/InputGroup.tsx
@@ -315,7 +315,7 @@ function InputGroupClearButton(props: InputGroupClearButtonProps) {
onPointerDown={(event) => event.preventDefault()}
onClick={() => group.clear()}
>
- <XIcon />
+ <XIcon class="size-3.5 shrink-0" />
</InputGroupButton>
</Show>
);
diff --git a/apps/web/src/components/ui/components/Tabs.docs.tsx b/apps/web/src/components/ui/components/Tabs.docs.tsx
index b46fbcb29f..216cb1aba5 100644
--- a/apps/web/src/components/ui/components/Tabs.docs.tsx
+++ b/apps/web/src/components/ui/components/Tabs.docs.tsx
@@ -175,7 +175,7 @@ export default defineDoc({
id: 'icon-only',
title: 'Icon only',
description:
- 'A narrow header collapses labels to icons. Each label stays the accessible name and becomes the tooltip.',
+ 'A narrow header collapses labels to icons. Each option keeps an inset square inside the grouped track; its label stays the accessible name and becomes the tooltip.',
render: IconOnlyDemo,
},
{
diff --git a/apps/web/src/components/ui/components/Tabs.tsx b/apps/web/src/components/ui/components/Tabs.tsx
index a8e8cd9cfe..56c15395b2 100644
--- a/apps/web/src/components/ui/components/Tabs.tsx
+++ b/apps/web/src/components/ui/components/Tabs.tsx
@@ -33,6 +33,17 @@ const tabIconSizes: Record<TabsSize, { square: string; labeled: string }> = {
xl: { square: 'size-6', labeled: 'size-5' },
};
+// The grouped frame adds 2px of border and 4px of padding around each tab.
+// Reserve the inset square explicitly; tooltip wrappers cannot resolve h-full
+// against a track that only has a minimum height.
+const joinedIconSizes: Record<TabsSize, string> = {
+ xs: 'size-4.5',
+ sm: 'size-5.5',
+ md: 'size-6.5',
+ lg: 'size-8.5',
+ xl: 'size-10.5',
+};
+
function tabContentClasses(size: TabsSize) {
return cn(labeledControlContents[size], size === 'md' && 'px-3');
}
@@ -233,7 +244,7 @@ function PillOption<T extends string>(props: {
(square()
? iconControlSizes[props.size]
: labeledControlFrames[props.size]),
- props.joined && square() && 'aspect-square',
+ props.joined && square() && joinedIconSizes[props.size],
'touch:min-h-8',
square() && 'touch:min-w-8',
props.fullWidth && !square() && 'flex-1'
@@ -259,10 +270,7 @@ function PillOption<T extends string>(props: {
return (
<Show when={square()} fallback={item()}>
- <Tooltip
- label={props.option.label}
- class={props.joined ? 'h-full' : undefined}
- >
+ <Tooltip label={props.option.label} class="shrink-0">
{item()}
</Tooltip>
</Show>
diff --git a/apps/web/src/components/ui/components/ToggleSwitch.docs.tsx b/apps/web/src/components/ui/components/ToggleSwitch.docs.tsx
index 56754a0219..34a7f04869 100644
--- a/apps/web/src/components/ui/components/ToggleSwitch.docs.tsx
+++ b/apps/web/src/components/ui/components/ToggleSwitch.docs.tsx
@@ -150,7 +150,7 @@ export default defineDoc({
id: 'form-state',
title: 'Read-only and invalid',
description:
- 'Native form props and Kobalte state remain available. Track and thumb motion respect prefers-reduced-motion.',
+ 'Native form props and Kobalte state remain available. The thumb stays white across themes and states, and motion respects prefers-reduced-motion.',
render: FormStateDemo,
},
{
diff --git a/apps/web/src/components/ui/components/ToggleSwitch.tsx b/apps/web/src/components/ui/components/ToggleSwitch.tsx
index daa99acf7d..2e044596fa 100644
--- a/apps/web/src/components/ui/components/ToggleSwitch.tsx
+++ b/apps/web/src/components/ui/components/ToggleSwitch.tsx
@@ -97,7 +97,7 @@ export const ToggleSwitch = (props: ToggleSwitchProps): JSX.Element => {
>
<KobalteSwitch.Thumb
class={cn(
- 'absolute rounded-full border border-border-secondary bg-[white] transition-[width,translate,background-color] duration-150 ease-out data-checked:bg-accent-contrast motion-reduce:transition-none',
+ 'absolute rounded-full border border-border-secondary bg-[white] transition-[width,translate] duration-150 ease-out motion-reduce:transition-none',
sizing().thumb,
!local.disabled && !others.readOnly && sizing().pressed
)}
diff --git a/apps/web/src/components/ui/components/Toolbar.docs.tsx b/apps/web/src/components/ui/components/Toolbar.docs.tsx
index 3202c2610a..87cbfd56b5 100644
--- a/apps/web/src/components/ui/components/Toolbar.docs.tsx
+++ b/apps/web/src/components/ui/components/Toolbar.docs.tsx
@@ -14,16 +14,16 @@ function BasicDemo() {
<Toolbar size="icon-sm">
<Toolbar.Group>
<Toolbar.Button aria-label="Undo" tooltip="Undo">
- <ArrowCounterClockwiseIcon />
+ <ArrowCounterClockwiseIcon class="size-4" />
</Toolbar.Button>
</Toolbar.Group>
<Toolbar.Divider />
<Toolbar.Group>
<Toolbar.Button aria-label="Copy" tooltip="Copy">
- <CopyIcon />
+ <CopyIcon class="size-4" />
</Toolbar.Button>
<Toolbar.Button aria-label="Copy link" tooltip="Copy link">
- <LinkIcon />
+ <LinkIcon class="size-4" />
</Toolbar.Button>
</Toolbar.Group>
<Toolbar.Divider />
@@ -32,7 +32,7 @@ function BasicDemo() {
tooltip="Delete"
class="text-failure-ink"
>
- <TrashIcon />
+ <TrashIcon class="size-4" />
</Toolbar.Button>
</Toolbar>
);
@@ -56,7 +56,7 @@ function MediumDemo() {
size="icon-md"
onClick={() => setZoom((value) => Math.max(25, value - 25))}
>
- <ZoomOutIcon />
+ <ZoomOutIcon class="size-4" />
</Toolbar.Button>
<Toolbar.Button class="w-14 tabular-nums" onClick={() => setZoom(100)}>
{zoom()}%
@@ -67,7 +67,7 @@ function MediumDemo() {
size="icon-md"
onClick={() => setZoom((value) => Math.min(200, value + 25))}
>
- <ZoomInIcon />
+ <ZoomInIcon class="size-4" />
</Toolbar.Button>
</Toolbar.Group>
</Toolbar>
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 efcd8758a9..e66bf81c76 100644
--- a/apps/web/src/features/block-ai/components/properties-panel.tsx
+++ b/apps/web/src/features/block-ai/components/properties-panel.tsx
@@ -184,7 +184,7 @@ function IconButton(props: {
disabled={props.disabled}
onClick={() => props.onClick()}
>
- <props.icon />
+ <props.icon class="size-3.5" />
</Button>
);
}
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 e93480999a..d98264b75b 100644
--- a/apps/web/src/features/block-ai/components/tool-bar.tsx
+++ b/apps/web/src/features/block-ai/components/tool-bar.tsx
@@ -85,8 +85,8 @@ export function ToolBar(props: {
<Icon
class={
t.tool === 'select' || t.tool === 'direct'
- ? '-scale-x-100'
- : undefined
+ ? 'size-4 -scale-x-100'
+ : 'size-4'
}
/>
</Button>
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 c7ee1d3c6c..4e715fea33 100644
--- a/apps/web/src/features/block-canvas/components/arrange-controls.tsx
+++ b/apps/web/src/features/block-canvas/components/arrange-controls.tsx
@@ -52,7 +52,10 @@ export function CanvasAlignmentControls(props: {
disabled={props.count < 2}
onClick={() => props.onAlign(alignment)}
>
- <Dynamic component={icon} />
+ <Dynamic
+ component={icon}
+ class="size-3.5 touch:size-6 shrink-0 pointer-events-none"
+ />
</ButtonGroup.Button>
</>
)}
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 0d2d3e3aaa..fce9da9ff1 100644
--- a/apps/web/src/features/block-canvas/views/canvas-toolbars.tsx
+++ b/apps/web/src/features/block-canvas/views/canvas-toolbars.tsx
@@ -66,7 +66,7 @@ export function CanvasDrawingToolbar(props: {
variant={props.tool === tool.id ? 'primary' : 'ghost'}
onClick={() => props.onTool(tool.id)}
>
- <Dynamic component={tool.icon} />
+ <Dynamic component={tool.icon} class="size-4" />
</Toolbar.Button>
)}
</For>
@@ -87,7 +87,7 @@ export function CanvasDrawingToolbar(props: {
props.onAttach?.({ x: rect.left + rect.width / 2, y: rect.top });
}}
>
- <Paperclip />
+ <Paperclip class="size-4" />
</Toolbar.Button>
</Show>
</Toolbar>
@@ -230,7 +230,7 @@ export function CanvasZoomToolbar(props: CanvasZoomProps) {
tooltip="Zoom out"
onClick={() => props.onZoom(1 / 1.2)}
>
- <Minus />
+ <Minus class="size-4" />
</Toolbar.Button>
<CanvasZoomMenu {...props} />
<Toolbar.Button
@@ -238,7 +238,7 @@ export function CanvasZoomToolbar(props: CanvasZoomProps) {
tooltip="Zoom in"
onClick={() => props.onZoom(1.2)}
>
- <Plus />
+ <Plus class="size-4" />
</Toolbar.Button>
</Toolbar.Group>
</Toolbar>
diff --git a/apps/web/src/features/block-database/component/WebhooksDialog.tsx b/apps/web/src/features/block-database/component/WebhooksDialog.tsx
index d351ffef9d..ef5095b38a 100644
--- a/apps/web/src/features/block-database/component/WebhooksDialog.tsx
+++ b/apps/web/src/features/block-database/component/WebhooksDialog.tsx
@@ -117,7 +117,7 @@ export function WebhooksDialog(props: {
variant="secondary"
onClick={() => copy(url())}
>
- <CopyIcon />
+ <CopyIcon class="size-4" />
Copy
</CopyButton>
</div>
@@ -136,7 +136,7 @@ export function WebhooksDialog(props: {
variant="ghost"
onClick={() => copy(curl())}
>
- <CopyIcon />
+ <CopyIcon class="size-3.5" />
Copy
</CopyButton>
</div>
diff --git a/apps/web/src/features/block-md/component/FindAndReplace.tsx b/apps/web/src/features/block-md/component/FindAndReplace.tsx
index 57ddd5105c..56a8b3cc0b 100644
--- a/apps/web/src/features/block-md/component/FindAndReplace.tsx
+++ b/apps/web/src/features/block-md/component/FindAndReplace.tsx
@@ -35,7 +35,7 @@ function FindBarButton(props: {
onMouseDown={keepInputFocus}
onClick={() => props.onClick()}
>
- <props.icon />
+ <props.icon class="size-3.5" />
</Button>
</Tooltip>
);
diff --git a/apps/web/src/features/block-md/component/FormatTools.tsx b/apps/web/src/features/block-md/component/FormatTools.tsx
index 720e3f4671..716c301624 100644
--- a/apps/web/src/features/block-md/component/FormatTools.tsx
+++ b/apps/web/src/features/block-md/component/FormatTools.tsx
@@ -92,7 +92,7 @@ function VerticalBar() {
type DropdownItemProps = {
label: string;
- icon: Component;
+ icon: Component<JSX.SvgSVGAttributes<SVGSVGElement>>;
show: boolean;
themeClass?: string;
before?: JSX.Element;
@@ -239,7 +239,7 @@ const InlineFormatButton = (props: {
}
disabled={props.buttonIsDisabled()}
>
- <Dynamic component={icon} />
+ <Dynamic component={icon} class="size-4" />
</Button>
);
};
@@ -293,7 +293,7 @@ export const ElementFormatButton = (props: {
}
disabled={props.buttonIsDisabled()}
>
- <Dynamic component={icon} />
+ <Dynamic component={icon} class="size-4" />
</Button>
);
};
@@ -335,12 +335,7 @@ const ElementFormatMenuItem = (
>
<Show when={icon()}>
{(IconComp) => (
- <Dynamic
- component={
- IconComp() as Component<JSX.SvgSVGAttributes<SVGSVGElement>>
- }
- class="size-4 shrink-0"
- />
+ <Dynamic component={IconComp()} class="size-4 shrink-0" />
)}
</Show>
<span class="flex-1 truncate">{inner()}</span>
@@ -899,6 +894,7 @@ export function FormatTools(props: {
>
<Dynamic
component={selection()?.hasLinks ? BrokenLinkIcon : LinkIcon}
+ class="size-4"
/>
</Button>
<MoreInlineDropdown />
@@ -1053,6 +1049,7 @@ export function FormatTools(props: {
>
<Dynamic
component={selection()?.hasLinks ? BrokenLinkIcon : LinkIcon}
+ class="size-4"
/>
</Button>
<MediaSelector buttonIsDisabled={buttonIsDisabled} />
diff --git a/apps/web/src/features/block-md/component/MarkdownPopup.tsx b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
index 78807eeaf4..93c3bcd61d 100644
--- a/apps/web/src/features/block-md/component/MarkdownPopup.tsx
+++ b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
@@ -728,7 +728,7 @@ export function MarkdownPopup(props: {
onClick={handleInsertComment}
tooltip="Comment"
>
- <ChatTeardrop />
+ <ChatTeardrop class="size-4" />
</Toolbar.Button>
</Show>
<Toolbar.Button
diff --git a/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx b/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
index 0eb95affb9..0ae4ca9b31 100644
--- a/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
+++ b/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
@@ -151,7 +151,7 @@ export default function SpreadsheetDemo() {
aria-busy={actions.pending() === 'ask'}
onClick={() => fireAndForget(actions.ask(), 'spreadsheet-draft')}
>
- <ChatWithAgentIcon />
+ <ChatWithAgentIcon class="size-3.5" />
Ask Macro
</Button>
<Button
diff --git a/apps/web/src/features/block-write/components/DocxFindBar.tsx b/apps/web/src/features/block-write/components/DocxFindBar.tsx
index 4e07dabcb4..83742db723 100644
--- a/apps/web/src/features/block-write/components/DocxFindBar.tsx
+++ b/apps/web/src/features/block-write/components/DocxFindBar.tsx
@@ -132,7 +132,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
aria-pressed={props.matchCase}
onClick={() => props.onToggleMatchCase()}
>
- <TextAa />
+ <TextAa class="size-4" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Whole words only"
@@ -140,7 +140,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
aria-pressed={props.wholeWord}
onClick={() => props.onToggleWholeWord()}
>
- <TextT />
+ <TextT class="size-4" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Previous match"
@@ -148,7 +148,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
disabled={!props.count}
onClick={() => props.onPrevious()}
>
- <CaretUp />
+ <CaretUp class="size-4" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Next match"
@@ -156,7 +156,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
disabled={!props.count}
onClick={() => props.onNext()}
>
- <CaretDown />
+ <CaretDown class="size-4" />
</Toolbar.Button>
<Show when={props.canEdit}>
<Toolbar.Button
@@ -166,7 +166,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
onClick={() => props.onToggleReplace()}
data-docx-find-replace-toggle
>
- <Swap />
+ <Swap class="size-4" />
</Toolbar.Button>
</Show>
<Toolbar.Button
@@ -174,7 +174,7 @@ export function DocxFindBar(props: DocxFindBarProps) {
tooltip={{ content: 'Close', shortcut: 'Escape' }}
onClick={() => props.onClose()}
>
- <X />
+ <X class="size-4" />
</Toolbar.Button>
</div>
<Show when={props.canEdit && props.replacing}>
diff --git a/apps/web/src/features/block-write/components/DocxToolbar.tsx b/apps/web/src/features/block-write/components/DocxToolbar.tsx
index 1033376a1f..beb0cf2937 100644
--- a/apps/web/src/features/block-write/components/DocxToolbar.tsx
+++ b/apps/web/src/features/block-write/components/DocxToolbar.tsx
@@ -181,34 +181,39 @@ const INLINE: Array<{
icon: () => JSX.Element;
shortcut?: string;
}> = [
- { format: 'bold', label: 'Bold', icon: () => <TextB />, shortcut: 'Mod+B' },
+ {
+ format: 'bold',
+ label: 'Bold',
+ icon: () => <TextB class="size-4.5" />,
+ shortcut: 'Mod+B',
+ },
{
format: 'italic',
label: 'Italic',
- icon: () => <TextItalic />,
+ icon: () => <TextItalic class="size-4.5" />,
shortcut: 'Mod+I',
},
{
format: 'underline',
label: 'Underline',
- icon: () => <TextUnderline />,
+ icon: () => <TextUnderline class="size-4.5" />,
shortcut: 'Mod+U',
},
{
format: 'strike',
label: 'Strikethrough',
- icon: () => <TextStrikethrough />,
+ icon: () => <TextStrikethrough class="size-4.5" />,
},
{
format: 'superscript',
label: 'Superscript',
- icon: () => <TextSuperscript />,
+ icon: () => <TextSuperscript class="size-4.5" />,
shortcut: 'Mod+Shift+=',
},
{
format: 'subscript',
label: 'Subscript',
- icon: () => <TextSubscript />,
+ icon: () => <TextSubscript class="size-4.5" />,
shortcut: 'Mod+=',
},
];
@@ -262,14 +267,26 @@ const ALIGNMENTS: Array<{
label: string;
icon: () => JSX.Element;
}> = [
- { alignment: 'left', label: 'Align left', icon: () => <TextAlignLeft /> },
+ {
+ alignment: 'left',
+ label: 'Align left',
+ icon: () => <TextAlignLeft class="size-4.5" />,
+ },
{
alignment: 'center',
label: 'Align center',
- icon: () => <TextAlignCenter />,
+ icon: () => <TextAlignCenter class="size-4.5" />,
+ },
+ {
+ alignment: 'right',
+ label: 'Align right',
+ icon: () => <TextAlignRight class="size-4.5" />,
+ },
+ {
+ alignment: 'justify',
+ label: 'Justify',
+ icon: () => <TextAlignJustify class="size-4.5" />,
},
- { alignment: 'right', label: 'Align right', icon: () => <TextAlignRight /> },
- { alignment: 'justify', label: 'Justify', icon: () => <TextAlignJustify /> },
];
/**
@@ -292,7 +309,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
<Toolbar
size="icon-sm"
aria-label="Document formatting"
- class="flex h-10 w-full min-w-0 gap-0.5 overflow-x-auto overscroll-x-contain rounded-none border-0 bg-transparent px-3 py-0 touch:h-[48px] touch:touch-pan-x touch:px-1 [&_[data-button]]:size-7 [&_[data-button]>svg]:size-[18px]! [&_select]:h-7"
+ class="flex h-10 w-full min-w-0 gap-0.5 overflow-x-auto overscroll-x-contain rounded-none border-0 bg-transparent px-3 py-0 touch:h-[48px] touch:touch-pan-x touch:px-1 [&_[data-button]]:size-7 [&_select]:h-7"
>
<Show when={props.canEdit}>
<Toolbar.Group>
@@ -301,14 +318,14 @@ export function DocxToolbar(props: DocxToolbarProps) {
tooltip={{ content: 'Undo', shortcut: 'Mod+Z' }}
onClick={() => props.onUndo()}
>
- <ArrowCounterClockwise />
+ <ArrowCounterClockwise class="size-4.5" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Redo"
tooltip={{ content: 'Redo', shortcut: 'Mod+Shift+Z' }}
onClick={() => props.onRedo()}
>
- <ArrowClockwise />
+ <ArrowClockwise class="size-4.5" />
</Toolbar.Button>
</Toolbar.Group>
<Toolbar.Divider class="mx-1.5 my-2.5" />
@@ -403,7 +420,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
</For>
<ToolbarMenu
label="Text color"
- icon={<TextAUnderline />}
+ icon={<TextAUnderline class="size-4.5" />}
testId="color"
onClose={props.onRefocus}
>
@@ -425,7 +442,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
</ToolbarMenu>
<ToolbarMenu
label="Highlight"
- icon={<Highlighter />}
+ icon={<Highlighter class="size-4.5" />}
testId="highlight"
onClose={props.onRefocus}
>
@@ -450,7 +467,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
tooltip="Clear formatting"
onClick={() => props.onClearFormat()}
>
- <TextTSlash />
+ <TextTSlash class="size-4.5" />
</Toolbar.Button>
</Toolbar.Group>
<Toolbar.Divider class="mx-1.5 my-2.5" />
@@ -460,14 +477,14 @@ export function DocxToolbar(props: DocxToolbarProps) {
tooltip="Bulleted list"
onClick={() => props.onList('bullet')}
>
- <ListBullets />
+ <ListBullets class="size-4.5" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Numbered list"
tooltip="Numbered list"
onClick={() => props.onList('number')}
>
- <ListNumbers />
+ <ListNumbers class="size-4.5" />
</Toolbar.Button>
</Toolbar.Group>
<Toolbar.Divider class="mx-1.5 my-2.5" />
@@ -488,18 +505,18 @@ export function DocxToolbar(props: DocxToolbarProps) {
tooltip={{ content: 'Decrease indent', shortcut: 'Shift+Tab' }}
onClick={() => props.onIndent(false)}
>
- <TextOutdent />
+ <TextOutdent class="size-4.5" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Increase indent"
tooltip="Increase indent"
onClick={() => props.onIndent(true)}
>
- <TextIndent />
+ <TextIndent class="size-4.5" />
</Toolbar.Button>
<ToolbarMenu
label="Line spacing"
- icon={<ArrowsDownUp />}
+ icon={<ArrowsDownUp class="size-4.5" />}
testId="line-spacing"
onClose={props.onRefocus}
>
@@ -526,12 +543,12 @@ export function DocxToolbar(props: DocxToolbarProps) {
tooltip="Insert table"
onClick={() => props.onInsertTable()}
>
- <Table />
+ <Table class="size-4.5" />
</Toolbar.Button>
<Show when={props.inBody}>
<ToolbarMenu
label="Insert footnote or endnote"
- icon={<AsteriskSimple />}
+ icon={<AsteriskSimple class="size-4.5" />}
testId="notes"
onClose={props.onRefocus}
>
@@ -546,7 +563,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
<Show when={props.inTable}>
<ToolbarMenu
label="Table rows and columns"
- icon={<RowsPlusBottom />}
+ icon={<RowsPlusBottom class="size-4.5" />}
testId="table"
onClose={props.onRefocus}
>
@@ -572,7 +589,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
data-docx-track-changes
onClick={() => props.onToggleTracking()}
>
- <GitDiff />
+ <GitDiff class="size-4.5" />
</Toolbar.Button>
<Toolbar.Button
aria-label={
@@ -588,8 +605,11 @@ export function DocxToolbar(props: DocxToolbarProps) {
aria-pressed={props.showMarkup}
onClick={() => props.onToggleMarkup()}
>
- <Show when={props.showMarkup} fallback={<EyeSlash />}>
- <Eye />
+ <Show
+ when={props.showMarkup}
+ fallback={<EyeSlash class="size-4.5" />}
+ >
+ <Eye class="size-4.5" />
</Show>
</Toolbar.Button>
<Show when={props.tracking || props.onRevision}>
@@ -599,7 +619,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
disabled={!props.onRevision}
onClick={() => props.onAccept(false)}
>
- <Check />
+ <Check class="size-4.5" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Reject change"
@@ -607,21 +627,21 @@ export function DocxToolbar(props: DocxToolbarProps) {
disabled={!props.onRevision}
onClick={() => props.onReject(false)}
>
- <X />
+ <X class="size-4.5" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Accept all changes"
tooltip="Accept all changes"
onClick={() => props.onAccept(true)}
>
- <Checks />
+ <Checks class="size-4.5" />
</Toolbar.Button>
<Toolbar.Button
aria-label="Reject all changes"
tooltip="Reject all changes"
onClick={() => props.onReject(true)}
>
- <XCircle />
+ <XCircle class="size-4.5" />
</Toolbar.Button>
</Show>
</Toolbar.Group>
@@ -633,7 +653,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
tooltip={{ content: 'Comment on selection', shortcut: 'Mod+Alt+M' }}
onClick={() => props.onComment()}
>
- <ChatCircleText />
+ <ChatCircleText class="size-4.5" />
</Toolbar.Button>
</Show>
<Toolbar.Button
@@ -641,7 +661,7 @@ export function DocxToolbar(props: DocxToolbarProps) {
tooltip={{ content: 'Find and replace', shortcut: 'Mod+F' }}
onClick={() => props.onFind()}
>
- <MagnifyingGlass />
+ <MagnifyingGlass class="size-4.5" />
</Toolbar.Button>
</Toolbar>
</div>
diff --git a/apps/web/src/features/channel/Input/ChannelInput.tsx b/apps/web/src/features/channel/Input/ChannelInput.tsx
index aee300d872..35564a75a3 100644
--- a/apps/web/src/features/channel/Input/ChannelInput.tsx
+++ b/apps/web/src/features/channel/Input/ChannelInput.tsx
@@ -496,7 +496,7 @@ export function ChannelInput(props: ChannelInputProps) {
{
id: 'gif',
label: 'GIF',
- icon: <GifIcon class="size-3.5" />,
+ icon: <GifIcon class="size-5" />,
onSelect: () =>
runInEditor((editor) => action.action(editor, actionContext), {
focus: true,
@@ -516,7 +516,7 @@ export function ChannelInput(props: ChannelInputProps) {
{
id: 'mention',
label: 'Mention',
- icon: <AtIcon class="size-3.5" />,
+ icon: <AtIcon class="size-5" />,
hint: '@',
onSelect: () =>
runInEditor(openMentionTypeahead, { focus: true }),
@@ -527,7 +527,7 @@ export function ChannelInput(props: ChannelInputProps) {
{
id: 'attach',
label: 'Attach files',
- icon: <PaperclipIcon class="size-3.5" />,
+ icon: <PaperclipIcon class="size-5" />,
onSelect: () => collapsedInput.attach(),
},
...gif(),
diff --git a/apps/web/src/features/channel/Input/ComposerAddMenu.tsx b/apps/web/src/features/channel/Input/ComposerAddMenu.tsx
index dce7ade7c1..c358f0fc39 100644
--- a/apps/web/src/features/channel/Input/ComposerAddMenu.tsx
+++ b/apps/web/src/features/channel/Input/ComposerAddMenu.tsx
@@ -137,7 +137,7 @@ function AddDropdown(props: {
: undefined
}
>
- <span class="flex size-3.5 shrink-0 items-center justify-center text-ink-muted">
+ <span class="flex size-5 shrink-0 items-center justify-center text-ink-muted">
{item.icon}
</span>
<span class="min-w-0 flex-1 flex flex-wrap items-baseline gap-x-3">
diff --git a/apps/web/src/features/channel/Input/FormatButtons.tsx b/apps/web/src/features/channel/Input/FormatButtons.tsx
index 171d8ddee9..74c5052e65 100644
--- a/apps/web/src/features/channel/Input/FormatButtons.tsx
+++ b/apps/web/src/features/channel/Input/FormatButtons.tsx
@@ -37,28 +37,28 @@ export function FormatButtons(props: FormatButtonsProps) {
active={selection()?.bold}
onClick={() => props.onInlineFormat('bold')}
>
- <TextBoldIcon />
+ <TextBoldIcon class="size-4" />
</FormatButton>
<FormatButton
label="Italic"
active={selection()?.italic}
onClick={() => props.onInlineFormat('italic')}
>
- <TextItalicIcon />
+ <TextItalicIcon class="size-4" />
</FormatButton>
<FormatButton
label="Strikethrough"
active={selection()?.strikethrough}
onClick={() => props.onInlineFormat('strikethrough')}
>
- <TextStrikethroughIcon />
+ <TextStrikethroughIcon class="size-4" />
</FormatButton>
<FormatButton
label="Inline code"
active={selection()?.code}
onClick={() => props.onInlineFormat('code')}
>
- <TextCodeIcon />
+ <TextCodeIcon class="size-4" />
</FormatButton>
<div class="w-px h-5 bg-edge-muted" />
<FormatButton
@@ -66,28 +66,28 @@ export function FormatButtons(props: FormatButtonsProps) {
active={elementsInRange()?.has('list-bullet')}
onClick={() => toggleNodeFormat('list-bullet')}
>
- <ListBulletsIcon />
+ <ListBulletsIcon class="size-4" />
</FormatButton>
<FormatButton
label="Numbered list"
active={elementsInRange()?.has('list-number')}
onClick={() => toggleNodeFormat('list-number')}
>
- <ListNumbersIcon />
+ <ListNumbersIcon class="size-4" />
</FormatButton>
<FormatButton
label="Checklist"
active={elementsInRange()?.has('list-check')}
onClick={() => toggleNodeFormat('list-check')}
>
- <ListChecksIcon />
+ <ListChecksIcon class="size-4" />
</FormatButton>
<FormatButton
label="Blockquote"
active={elementsInRange()?.has('quote')}
onClick={() => toggleNodeFormat('quote')}
>
- <TextQuoteIcon />
+ <TextQuoteIcon class="size-4" />
</FormatButton>
</>
);
diff --git a/apps/web/src/features/channel/Message/ReactionChip.tsx b/apps/web/src/features/channel/Message/ReactionChip.tsx
index d4d0787a18..6334304b72 100644
--- a/apps/web/src/features/channel/Message/ReactionChip.tsx
+++ b/apps/web/src/features/channel/Message/ReactionChip.tsx
@@ -99,9 +99,12 @@ export function ReactionChip(props: ReactionChipProps) {
}))
}
size="sm"
- variant={props.selected ? 'primary' : 'secondary'}
+ variant="secondary"
+ appearance={props.selected ? 'bare' : undefined}
class={cn(
'flex flex-row items-center h-7 min-w-7 gap-1',
+ props.selected &&
+ 'border-border-secondary bg-accent-bg text-accent aria-pressed:overlay-active not-touch:not-data-disabled:hover:overlay-accent-bg',
!props.interactive && 'pointer-events-auto'
)}
disabled={!props.interactive}
diff --git a/apps/web/src/features/crm/activity-tasks-adapter.tsx b/apps/web/src/features/crm/activity-tasks-adapter.tsx
index debac4f8b1..452a2def8e 100644
--- a/apps/web/src/features/crm/activity-tasks-adapter.tsx
+++ b/apps/web/src/features/crm/activity-tasks-adapter.tsx
@@ -123,7 +123,11 @@ function ActivityTasksBody(props: {
class="flex items-center gap-3 px-3 py-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/email-view/components/EmailDetailView.tsx b/apps/web/src/features/email-view/components/EmailDetailView.tsx
index ae039998c0..e8824a269d 100644
--- a/apps/web/src/features/email-view/components/EmailDetailView.tsx
+++ b/apps/web/src/features/email-view/components/EmailDetailView.tsx
@@ -254,7 +254,7 @@ export function EmailDetailView(props: {
aria-label="Back"
onClick={closeThread}
>
- <ArrowLeftIcon class="size-4" />
+ <ArrowLeftIcon class="size-4 touch:size-6" />
</Button>
</Show>
<div ref={setHeaderMenuMount} class="flex items-center" />
diff --git a/apps/web/src/features/external-view/route-views.tsx b/apps/web/src/features/external-view/route-views.tsx
index 11933b4773..1f9acbe954 100644
--- a/apps/web/src/features/external-view/route-views.tsx
+++ b/apps/web/src/features/external-view/route-views.tsx
@@ -73,7 +73,7 @@ function BackToExternal() {
)
}
>
- <CaretLeftIcon />
+ <CaretLeftIcon class="size-3.5 touch:size-6" />
</Button>
);
}
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 51682457a1..beb2a9be2a 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
@@ -34,7 +34,7 @@ export function LocalRuntimeSetupDialog(props: {
aria-label={t('localRuntime.close')}
onClick={() => props.onClose()}
>
- <XIcon />
+ <XIcon class="size-4" />
</Button>
</div>
</Panel.Header>
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 9d548863a7..224c69549c 100644
--- a/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
+++ b/apps/web/src/features/property/side-panel/properties/EntityPropertiesSection.tsx
@@ -679,19 +679,19 @@ function PropertyRowActions(props: {
onMouseDown={stopRowInteraction}
>
<Show when={canPin()}>
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon-sm"
title={pinLabel()}
aria-label={pinLabel()}
aria-pressed={isPinned()}
disabled={isSaving()}
- class="flex size-5 items-center justify-center rounded-full text-ink-muted hover:bg-hover hover:text-ink focus-visible:outline-2 focus-visible:outline-accent disabled:pointer-events-none disabled:opacity-50"
onClick={togglePin}
>
- <Show when={isPinned()} fallback={<PushPinIcon class="size-3" />}>
- <PushPinSlashIcon class="size-3" />
+ <Show when={isPinned()} fallback={<PushPinIcon class="size-4" />}>
+ <PushPinSlashIcon class="size-4" />
</Show>
- </button>
+ </Button>
</Show>
<Show when={canRemove()}>
<button
diff --git a/apps/web/src/features/routines/routine-template.tsx b/apps/web/src/features/routines/routine-template.tsx
index 9764c6750f..6c2738a38b 100644
--- a/apps/web/src/features/routines/routine-template.tsx
+++ b/apps/web/src/features/routines/routine-template.tsx
@@ -311,7 +311,7 @@ function SendTemplate(props: { routineId: string; name: string }) {
disabled={recipients().length === 0 || sending()}
onClick={() => fireAndForget(send(), 'routines')}
>
- <PaperPlaneIcon />
+ <PaperPlaneIcon class="size-4" />
Send
</Button>
</div>
diff --git a/apps/web/src/features/routines/views/routine-detail.tsx b/apps/web/src/features/routines/views/routine-detail.tsx
index 9ea4c32b34..c9b196255c 100644
--- a/apps/web/src/features/routines/views/routine-detail.tsx
+++ b/apps/web/src/features/routines/views/routine-detail.tsx
@@ -139,12 +139,12 @@ export function RoutineDetailView(props: {
<Show when={routine().templateId}>
{(templateId) => (
<Button
- variant="primary"
+ variant="ghost"
size="sm"
onClick={() => props.onOpenTemplate(templateId())}
>
Created from template
- <ArrowUpRightIcon />
+ <ArrowUpRightIcon class="size-3.5" />
</Button>
)}
</Show>
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 1eab6f4ea1..916a11c955 100644
--- a/apps/web/src/features/routines/views/routine-template-view.tsx
+++ b/apps/web/src/features/routines/views/routine-template-view.tsx
@@ -76,7 +76,7 @@ export function RoutineTemplateView(props: {
class="ml-auto shrink-0"
onClick={() => props.onActivate()}
>
- <PlayIcon />
+ <PlayIcon class="size-4" />
Activate for me
</Button>
</Show>
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 67e4038f7e..ed2576338b 100644
--- a/apps/web/src/features/routines/views/share-template-dialog.tsx
+++ b/apps/web/src/features/routines/views/share-template-dialog.tsx
@@ -185,7 +185,7 @@ export function ShareTemplateDialog(props: {
<Show when={props.template} fallback={<span />}>
<div class="flex flex-wrap gap-2">
<Button variant="secondary" onClick={() => props.onCopyLink()}>
- <LinkIcon />
+ <LinkIcon class="size-4" />
Copy template link
</Button>
<Button
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 95757066b6..e27de8b3b4 100644
--- a/apps/web/src/features/whatsapp-linked/components/chat-list.tsx
+++ b/apps/web/src/features/whatsapp-linked/components/chat-list.tsx
@@ -139,7 +139,7 @@ export function ChatList(props: {
disabled={props.adding.has(chat.jid)}
onClick={() => props.onAdd(chat)}
>
- <PlusIcon />
+ <PlusIcon class="size-3.5" />
{/* Phones keep every row's action visible, so just the + there. */}
<span class="mobile:hidden">
{props.adding.has(chat.jid)
diff --git a/apps/web/src/lib/core/component/DocumentPreview.tsx b/apps/web/src/lib/core/component/DocumentPreview.tsx
index 63075cc33c..2268e1b0b8 100644
--- a/apps/web/src/lib/core/component/DocumentPreview.tsx
+++ b/apps/web/src/lib/core/component/DocumentPreview.tsx
@@ -474,7 +474,7 @@ export function CalendarEventPreviewDetails(props: {
onClick={(event) => event.stopPropagation()}
>
<Button variant="secondary" size="xs" onClick={open()}>
- <CalendarCheckIcon />
+ <CalendarCheckIcon class="size-3.5" />
Open
</Button>
</div>
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 e2b0cad862..638ac6af7d 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
@@ -18,7 +18,6 @@ import FileRs from '@icon/system/regular/file-rs.svg';
import FileSql from '@icon/system/regular/file-sql.svg';
import FileTs from '@icon/system/regular/file-ts.svg';
import TrashCan from '@icon/system/regular/trash-simple.svg';
-import { Switch } from '@kobalte/core/switch';
import { $isCodeNode, CodeNode } from '@lexical/code';
import {
$isCustomCodeNode,
@@ -26,7 +25,7 @@ import {
normalizedLanguage,
type SupportedLanguage,
} from '@macro-inc/lexical-core';
-import { Button, CopyButton, cn, Dropdown } from '@ui';
+import { Button, CopyButton, cn, Dropdown, ToggleSwitch } from '@ui';
import {
$getNodeByKey,
type EditorThemeClasses,
@@ -247,18 +246,16 @@ export function CodeBoxAccessory(props: {
<Show when={showPreviewToggle()}>
<div class="flex items-center gap-2 mr-2">
<div class="text-xs text-ink-extra-muted/50">Preview</div>
- <Switch
+ <ToggleSwitch
+ size="sm"
+ label="Preview"
+ labelClass="sr-only"
checked={isPreviewMode()}
onChange={(enabled) => {
setIsPreviewMode(enabled);
setPreviewModeOnNode(enabled);
}}
- >
- <Switch.Input class="sr-only" />
- <Switch.Control class="inline-flex h-4 w-8 hover:ring hover:ring-edge rounded-full border-2 border-transparent transition-colors bg-edge focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 data-checked:bg-accent">
- <Switch.Thumb class="block size-3 rounded-full bg-surface transition-transform data-checked:translate-x-4" />
- </Switch.Control>
- </Switch>
+ />
</div>
</Show>
<Show when={props.editor.isEditable()}>
@@ -287,7 +284,7 @@ export function CodeBoxAccessory(props: {
return copyCode();
}}
>
- <Copy />
+ <Copy class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</CopyButton>
</div>
</div>
@@ -434,12 +431,13 @@ export const StaticCodeBoxAccessory = (props: {
<Show when={showPreviewToggle()}>
<div class="flex items-center gap-2">
<div class={cn('text-xs', textColor())}>Preview</div>
- <Switch checked={isPreviewMode()} onChange={setIsPreviewMode}>
- <Switch.Input class="sr-only" />
- <Switch.Control class="inline-flex h-4 w-8 hover:ring hover:ring-edge rounded-full border-2 border-transparent transition-colors bg-edge focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 data-checked:bg-accent">
- <Switch.Thumb class="block size-3 rounded-full transition-transform data-checked:translate-x-4 bg-surface" />
- </Switch.Control>
- </Switch>
+ <ToggleSwitch
+ size="sm"
+ label="Preview"
+ labelClass="sr-only"
+ checked={isPreviewMode()}
+ onChange={setIsPreviewMode}
+ />
</div>
</Show>
<CopyButton
@@ -453,7 +451,7 @@ export const StaticCodeBoxAccessory = (props: {
return copyCode();
}}
>
- <Copy />
+ <Copy class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />
</CopyButton>
</div>
</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 fd110de44b..fcf69930ee 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
@@ -280,7 +280,7 @@ export function FloatingFormatMenu(props: {
inlineFormat(buttonProps.item.format);
}}
>
- <Dynamic component={buttonProps.item.icon} />
+ <Dynamic component={buttonProps.item.icon} class="size-4" />
</Button>
);
@@ -391,6 +391,7 @@ export function FloatingFormatMenu(props: {
>
<Dynamic
component={selection()?.hasLinks ? BrokenLinkIcon : LinkIcon}
+ class="size-4"
/>
</Button>
</Show>
diff --git a/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx b/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx
index b15258a76e..a6ec002b3b 100644
--- a/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx
+++ b/apps/web/src/lib/core/component/Lightbox/Lightbox.tsx
@@ -22,7 +22,13 @@ import { LightboxChrome } from './LightboxChrome';
import { LightboxToolbar } from './LightboxToolbar';
const SpinnerIcon: Component<JSX.SvgSVGAttributes<SVGSVGElement>> = (p) => (
- <Spinner {...p} class="animate-spin" />
+ <Spinner
+ {...p}
+ class={cn(
+ 'size-4 touch:size-6 shrink-0 pointer-events-none animate-spin',
+ p.class
+ )}
+ />
);
type LightboxProps = {