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.

style(web): refine shared controls and dark surfaces (#6944)

teo184e12bc68f3
diff --git a/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsx b/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsx
index 5347e1b196..6c1f59442a 100644
--- a/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsx
+++ b/apps/web/src/components/app/app-sidebar/calendar-sidebar-preview.tsx
@@ -15,7 +15,6 @@ import {
} from '@app/features/calendar/utils/time-format';
import { openCalendarView } from '@app/features/calendar-view/calendar-navigation';
import { useOpenEventComposer } from '@app/features/calendar-view/components/use-open-event-composer';
-
import { HoverCard } from '@core/component/HoverCard';
import { ScrollIndicators } from '@core/component/VerticalScrollIndicators';
import { openExternalUrl } from '@core/util/url';
@@ -308,10 +307,10 @@ function PreviewContent(props: { dropdownMount?: HTMLElement }) {
aria-label="New event"
label="New event"
tooltipPlacement="top"
- variant="ghost"
+ variant="outline"
size="icon-md"
depth={4}
- class="rounded-lg glass bg-surface"
+ class="rounded-lg bg-surface"
onClick={() => openEventComposer()}
>
<PlusIcon class="size-4" />
@@ -321,10 +320,10 @@ function PreviewContent(props: { dropdownMount?: HTMLElement }) {
aria-label="Calendar settings"
label="Calendar settings"
tooltipPlacement="top"
- variant="ghost"
+ variant="outline"
size="icon-md"
depth={4}
- class="rounded-lg bg-surface shadow-menu ring ring-edge-muted"
+ class="rounded-lg bg-surface"
>
<GearIcon class="size-4" />
</Dropdown.Trigger>
@@ -455,7 +454,7 @@ export function CalendarSidebarPreview(
<Surface
depth={2}
hideBorder
- class="h-[min(24rem,calc(100vh-2rem))] w-[min(20rem,calc(100vw-2rem))] overflow-hidden rounded-xl shadow-menu ring ring-edge"
+ class="menu-surface h-[min(24rem,calc(100vh-2rem))] w-[min(20rem,calc(100vw-2rem))] overflow-hidden rounded-xl"
>
<div
class="size-full"
diff --git a/apps/web/src/components/app/app-sidebar/sidebar-promo.tsx b/apps/web/src/components/app/app-sidebar/sidebar-promo.tsx
index 439e5afedc..5ec54de267 100644
--- a/apps/web/src/components/app/app-sidebar/sidebar-promo.tsx
+++ b/apps/web/src/components/app/app-sidebar/sidebar-promo.tsx
@@ -33,6 +33,7 @@ export const SidebarPromoCard = (props: SidebarPromoCardProps) => {
<Show when={props.onDismiss}>
{(onDismiss) => (
<Button
+ size="icon-xs"
variant="ghost"
class="shrink-0 size-5 rounded-sm p-0 [&_svg]:size-3"
label="Dismiss"
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 5cde99e32c..fac6655b61 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
@@ -27,7 +27,7 @@ export function SidebarSearchMenu(props: {
}
}}
>
- <Dropdown.Trigger {...props.triggerProps} label="Search">
+ <Dropdown.Trigger size="icon-md" {...props.triggerProps} label="Search">
<MagnifyingGlassIcon class="size-5" />
</Dropdown.Trigger>
<DropdownMenu.Portal>
diff --git a/apps/web/src/components/app/app-sidebar/sidebar.tsx b/apps/web/src/components/app/app-sidebar/sidebar.tsx
index 8cd3f5c770..e97ce31b5a 100644
--- a/apps/web/src/components/app/app-sidebar/sidebar.tsx
+++ b/apps/web/src/components/app/app-sidebar/sidebar.tsx
@@ -569,6 +569,7 @@ const SidebarSectionMenu = (props: {
onOpenChange={props.onOpenChange}
>
<Dropdown.Trigger
+ size="icon-xs"
variant="ghost"
class="opacity-0 group-hover/section:opacity-100 focus-visible:opacity-100 transition-opacity rounded-md size-5 min-h-0 p-0 bg-transparent hover:bg-ink/6 [&_svg]:size-3.5"
label={`Customize ${props.label}`}
@@ -639,6 +640,7 @@ const TryCard = (props: {
Quick Start
</h3>
<Button
+ size="icon-xs"
variant="ghost"
class="shrink-0 size-5 rounded-sm p-0 [&_svg]:size-3"
label="Dismiss Quick Start"
@@ -864,7 +866,7 @@ export const SidebarSettingsWidget = (props: SidebarSettingsWidgetProps) => {
onOpenChange={props.onMenuOpenChange}
>
<Dropdown.Trigger
- variant="ghost"
+ variant="plain"
class={cn(
'flex items-center rounded-md cursor-default text-ink-extra-muted not-disabled:hover:bg-ink/3 h-9',
props.compact
@@ -936,7 +938,7 @@ export const SidebarSettingsWidget = (props: SidebarSettingsWidgetProps) => {
<div class="truncate text-sm text-ink-muted">{email()}</div>
</div>
</div>
- <div class="-mx-1.5 mt-2 mb-1.5 h-px bg-edge-muted" />
+ <div class="-mx-1.5 mt-2 mb-1.5 h-px bg-edge-divider" />
<Show when={props.gettingStartedLink}>
{(link) => (
<Dropdown.Item
@@ -1488,7 +1490,10 @@ export const AppSidebar = (props: AppSidebarProps) => {
class={cn(
'group/sidebar flex flex-col gap-0 overflow-hidden bg-surface px-3 pb-3 pt-4 text-[13px]',
isExpanded() &&
- 'relative h-full shrink-0 max-w-55 w-55 border-r border-edge-muted opacity-100',
+ 'relative h-full shrink-0 max-w-55 w-55 border-edge-frame opacity-100',
+ isExpanded() &&
+ (globalSplitManager()?.splits().length ?? 1) <= 1 &&
+ 'border-r',
props.sidebarState === 'hidden' &&
'fixed left-0 top-0 bottom-0 h-full -translate-x-full max-w-0 w-0 opacity-0 pointer-events-none',
isCollapsed() && 'fixed z-modal-content',
@@ -1496,7 +1501,7 @@ export const AppSidebar = (props: AppSidebarProps) => {
!overlayOpen() &&
'left-0 inset-y-0 h-full max-w-0 w-0 opacity-0 pointer-events-none -translate-x-2',
isOverlayExpanded() &&
- 'left-0 inset-y-0 h-full max-w-55 w-55 opacity-100 translate-x-0 rounded-r-xl shadow-menu ring-1 ring-edge-muted'
+ 'left-0 inset-y-0 h-full max-w-55 w-55 opacity-100 translate-x-0 rounded-r-xl shadow-menu ring-1 ring-edge-frame'
)}
data-expanded={isExpandedView()}
data-slim={isSlim()}
diff --git a/apps/web/src/components/app/side-panel/SidePanel.tsx b/apps/web/src/components/app/side-panel/SidePanel.tsx
index 62c5713831..6790767ba3 100644
--- a/apps/web/src/components/app/side-panel/SidePanel.tsx
+++ b/apps/web/src/components/app/side-panel/SidePanel.tsx
@@ -309,10 +309,10 @@ function Toggle() {
<Show when={ctx.hasSections()}>
<Button
depth={2}
- variant={isTouchDevice() ? 'ghost' : 'outline'}
- size="icon-sm"
+ variant="plain"
+ size="icon-md"
class={cn(
- !isTouchDevice() && 'bg-surface',
+ 'rounded-xl',
isTouchDevice() &&
'rounded-full border-0 hover:bg-transparent! active:bg-transparent! focus-visible:bg-transparent! active:text-accent',
isTouchDevice() && ctx.isOpen() && 'text-accent'
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 19af48f3df..b7598d3095 100644
--- a/apps/web/src/components/app/sidebar-next/create-button.tsx
+++ b/apps/web/src/components/app/sidebar-next/create-button.tsx
@@ -3,14 +3,14 @@ import { TOKENS } from '@core/hotkey/tokens';
import PlusIcon from '@phosphor/plus.svg';
import { Button, type ButtonProps } from '@ui';
-/** The rail's monochrome create trigger, with themed hover and press feedback.
+/** The rail's create trigger, with the same treatment as Search.
* Kobalte forwards its trigger ref and handlers through the custom component.
*/
const RailCreateTrigger = (props: ButtonProps) => (
<Button
{...props}
- variant="strong"
- class="rounded-full bg-ink-muted"
+ variant="ghost"
+ class="size-10 rounded-xl [&_svg]:size-5"
size="icon-md"
label="Create"
tooltipPlacement="right"
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 f34c3289c2..6b6ee0b271 100644
--- a/apps/web/src/components/app/sidebar-next/list-nav.tsx
+++ b/apps/web/src/components/app/sidebar-next/list-nav.tsx
@@ -175,13 +175,16 @@ export const ListNav = (props: ListNavProps) => {
<SidebarOpenInSplitMenu
content={content}
onOpenChange={props.onContextMenuOpenChange}
- // The trigger defaults to `w-full h-7`, which clips the square button.
- triggerClass="size-9"
+ // The trigger defaults to `w-full h-7`, which clips the round button.
+ triggerClass="size-10"
>
<Button
variant="ghost"
size="icon-md"
- class="cursor-default rounded-xl"
+ class={cn(
+ 'size-10 cursor-default rounded-xl',
+ isActive() && 'bg-hover text-ink'
+ )}
label={props.item.label}
aria-description={
[props.unread && 'Unread items', props.activeCall && 'Active call']
@@ -203,21 +206,11 @@ export const ListNav = (props: ListNavProps) => {
onMouseDown={onMouseDown}
onClick={onClick}
>
- {/* Fixed geometry keeps the marker flush to the rail edge without
- moving the glyph when selection changes. */}
- <span
- aria-hidden="true"
- class={cn(
- 'absolute -left-2.5 top-1/2 h-3/4 w-1 -translate-y-1/2 rounded-r-full bg-ink-muted',
- isActive() ? 'opacity-100' : 'opacity-0'
- )}
- />
-
<NavGlyph
icon={props.item.icon}
iconActive={props.item.iconActive}
filled={isActive()}
- class={cn('size-5.5', isActive() && 'text-ink-muted')}
+ class="size-5.5"
/>
<Show
when={props.activeCall}
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 6458c2fadd..af5d916bd9 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
@@ -48,7 +48,7 @@ export const SearchRailButton = () => {
tooltipPlacement: 'right',
hotkey: TOKENS.sidebar.goTo.search,
'data-sidebar-next-search': '',
- class: '[&_svg]:size-5',
+ class: 'size-10 rounded-xl [&_svg]:size-5',
}}
/>
);
diff --git a/apps/web/src/components/app/sidebar-next/sidebar-rail.tsx b/apps/web/src/components/app/sidebar-next/sidebar-rail.tsx
index 8f3aa25cab..6bbd731569 100644
--- a/apps/web/src/components/app/sidebar-next/sidebar-rail.tsx
+++ b/apps/web/src/components/app/sidebar-next/sidebar-rail.tsx
@@ -4,6 +4,7 @@ import { navigateToSidebarView } from '@components/app/app-sidebar/sidebar';
import { useSplitLayout } from '@components/app/split-layout/layout';
import { hotkeyScopeNeutralAttribute } from '@core/dom-selectors';
import { useActiveCallsQuery } from '@queries/call/call';
+import { cn } from '@ui';
import { For } from 'solid-js';
import { SidebarRailCreateButton } from './create-button';
import { FooterActions } from './footer-actions';
@@ -52,10 +53,10 @@ export const SidebarRail = () => {
<div
{...hotkeyScopeNeutralAttribute}
data-ui="sidebar-rail"
- classList={{
- 'border-r': (globalSplitManager()?.splits().length ?? 1) <= 1,
- }}
- class="relative flex h-full w-14 shrink-0 flex-col items-center gap-2 overflow-hidden border-edge-muted bg-surface px-2.5 pb-3 pt-3"
+ class={cn(
+ 'relative flex h-full w-14 shrink-0 flex-col items-center gap-2 overflow-hidden border-edge-frame bg-panel px-2.5 pb-3 pt-3',
+ (globalSplitManager()?.splits().length ?? 1) <= 1 && 'border-r'
+ )}
>
<SidebarRailCreateButton />
<SearchRailButton />
diff --git a/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx b/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx
index 093bbe6d95..1eddec258b 100644
--- a/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx
+++ b/apps/web/src/components/app/split-layout/components/PopoverSplitRenderer.tsx
@@ -178,7 +178,10 @@ function PopoverSplitModal(props: {
onOpenChange={onOpenChange}
contentRef={attachPanel}
>
- <Panel depth={2} class="rounded-xl bg-dialog *:max-h-[75vh]">
+ <Panel
+ hideBorder
+ class="bg-transparent rounded-[inherit] *:max-h-[75vh]"
+ >
<Content />
</Panel>
</Dialog>
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 c6786ba5b0..6b44a65d78 100644
--- a/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx
@@ -65,7 +65,7 @@ export function SplitDrawer(
};
const getPositionClasses = () => {
- const baseClasses = `absolute bg-surface border-edge-muted z-annotation-layer flex flex-col`;
+ const baseClasses = `absolute bg-surface border-edge-frame z-annotation-layer flex flex-col`;
let positionClasses = '';
switch (props.side) {
case 'top':
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 e38f8e1131..998ff4500c 100644
--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
@@ -340,7 +340,7 @@ function SoupNavigationButtons() {
<Show when={shouldShow()}>
<div class="flex items-center gap-0.5">
<Button
- class="p-1 rounded-lg"
+ size="icon-md"
label="Previous item"
hotkey={TOKENS.entity.step.start}
disabled={!canNavigateUp()}
@@ -349,7 +349,7 @@ function SoupNavigationButtons() {
<CaretUp class="size-4" />
</Button>
<Button
- class="p-1 rounded-lg"
+ size="icon-md"
label="Next item"
hotkey={TOKENS.entity.step.end}
disabled={!canNavigateDown()}
@@ -642,7 +642,7 @@ export function SplitHeader(props: {
}}
/>
- <div class="h-full grow shrink flex items-center justify-end gap-0.5 px-2 touch:px-0 touch:gap-2">
+ <div class="header-actions h-full grow shrink flex items-center justify-end gap-0.5 px-2 touch:px-0 touch:gap-2">
<div
class="contents"
ref={(ref) => {
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 d095a315ad..92139048ab 100644
--- a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
@@ -329,8 +329,8 @@ export function SplitPanel(props: SplitPanelProps) {
</div>
<Show when={!usesComposableLayout() && bottomPanel()}>
{(panel) => (
- <div class="h-1/2 min-h-0 min-w-0 border-t border-edge-muted bg-surface flex flex-col">
- <div class="flex h-10 shrink-0 items-center gap-2 border-b border-edge-muted px-2">
+ <div class="h-1/2 min-h-0 min-w-0 border-t border-edge-frame bg-surface flex flex-col">
+ <div class="flex h-10 shrink-0 items-center gap-2 border-b border-edge-frame px-2">
<h3 class="min-w-0 flex-1 truncate text-sm font-medium text-ink-muted">
{panel().title}
</h3>
diff --git a/apps/web/src/components/icon/share.svg b/apps/web/src/components/icon/share.svg
new file mode 100644
index 0000000000..47157bd22f
--- /dev/null
+++ b/apps/web/src/components/icon/share.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+ <path d="M4 13v4a3 3 0 0 0 3 3h10a3 3 0 0 0 3-3v-4M12 14V4m-4 4 4-4 4 4"/>
+</svg>
diff --git a/apps/web/src/components/ui/components/ActionDialogShell.tsx b/apps/web/src/components/ui/components/ActionDialogShell.tsx
index 7fd40f00ea..037aa49bf1 100644
--- a/apps/web/src/components/ui/components/ActionDialogShell.tsx
+++ b/apps/web/src/components/ui/components/ActionDialogShell.tsx
@@ -23,7 +23,7 @@ function Body(props: SlotProps) {
class={cn(
'min-h-0 space-y-6 overflow-y-auto p-5',
'[&_[data-slot=text-field]]:gap-2 [&_[data-slot=text-field-label]]:text-[13px] [&_[data-slot=text-field-label]]:leading-[18px] [&_[data-slot=text-field-label]]:font-medium',
- '[&_input[data-slot]]:h-11 [&_input[data-slot]]:text-sm [&_input[data-slot]]:shadow-none [&_input[data-slot]]:focus-visible:ring-2 [&_input[data-slot]]:focus-visible:ring-edge-muted [&_input[data-slot]]:focus-visible:outline-none',
+ '[&_input[data-slot]]:h-11 [&_input[data-slot]]:text-sm',
props.class
)}
>
@@ -57,8 +57,7 @@ function Footer(props: SlotProps) {
return (
<div
class={cn(
- 'flex shrink-0 flex-wrap items-center justify-end gap-2 border-t border-edge-muted px-5 py-3',
- '[&_[data-slot=button]]:rounded-lg [&_[data-slot=button][data-disabled]]:opacity-100 [&_[data-slot=button][data-disabled]]:text-ink-muted [&_[data-slot=button][data-disabled]:not([data-variant=ghost])]:bg-ink/10',
+ 'flex shrink-0 flex-wrap items-center justify-end gap-2 border-t border-edge-divider px-5 py-3',
props.class
)}
>
diff --git a/apps/web/src/components/ui/components/Button.tsx b/apps/web/src/components/ui/components/Button.tsx
index 12b782aa7c..ccd90e7381 100644
--- a/apps/web/src/components/ui/components/Button.tsx
+++ b/apps/web/src/components/ui/components/Button.tsx
@@ -15,51 +15,49 @@ import { Tooltip } from './Tooltip';
const BUTTON_TOUCH_STYLES =
"touch:min-h-9 touch:min-w-9 touch:[&>svg:not([class*='size-'])]:size-6";
-// Touch controls use the enclosing glass shimmer; desktop hover/press feedback
-// is painted as a translucent scrim over the variant's base background-color
-// (via the `overlay-*` background-image utility)
-// rather than replacing/thinning the base color, so buttons keep their full
-// color on hover. The `cta`/`contrast` variants use a surface scrim so their
-// solid backgrounds lighten toward the text color instead of washing out.
+// Text actions use flat frames. Icon actions and embedded controls remain
+// unframed; navigation keeps its independent quiet selection treatment.
/** Canonical variant classes for buttons and button-like elements. */
export const buttonVariants = createVariants(
cn(
'relative inline-flex shrink-0 items-center justify-center whitespace-nowrap text-sm',
- 'rounded-md border-1 border-transparent font-medium outline-none select-none transition-colors [&_*]:select-none',
- 'data-disabled:cursor-not-allowed data-disabled:opacity-30',
+ 'rounded-full border border-edge-button bg-control text-ink-muted font-medium outline-none select-none transition-colors duration-120 motion-reduce:transition-none [&_*]:select-none',
+ 'not-touch:not-disabled:hover:overlay-hover not-touch:not-disabled:hover:text-ink not-disabled:active:overlay-active',
+ 'focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-edge-focus',
+ 'aria-pressed:overlay-active aria-pressed:text-ink',
+ 'data-disabled:cursor-not-allowed data-disabled:opacity-50',
'[&_svg]:pointer-events-none [&_svg]:shrink-0'
),
{
variant: {
danger:
- 'bg-failure-bg text-failure dark:bg-failure-bg not-touch:not-disabled:hover:bg-failure/25 not-touch:not-disabled:active:bg-failure/30',
- outline:
- 'bg-surface/70 text-ink-muted border-edge-muted 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',
+ 'text-failure not-touch:not-disabled:hover:text-failure aria-pressed:text-failure',
+ outline: '',
+ accent: 'text-ink font-semibold',
success:
- 'bg-success-bg not-touch:not-disabled:hover:overlay-success-bg text-success',
- 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-ink text-surface-4 focus-visible:ring-surface-4/70 not-touch:not-disabled:hover:overlay-[color-mix(in_oklch,var(--color-surface-4)_12%,transparent)] not-touch:not-disabled:active:overlay-[color-mix(in_oklch,var(--color-surface-4)_22%,transparent)]',
- cta: 'bg-accent text-accent-contrast focus-visible:ring-accent-contrast/70 [--color-edge:var(--color-accent-contrast-muted)] [--color-edge-muted:var(--color-accent-contrast-muted)] not-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)]',
+ 'text-success not-touch:not-disabled:hover:text-success aria-pressed:text-success',
+ // Retained for existing callers; ordinary actions always have a frame.
+ ghost: '',
+ plain: 'border-0 bg-transparent',
+ strong: 'text-ink font-semibold',
+ cta: 'text-ink font-semibold',
+ navigation: 'border-transparent bg-transparent',
},
size: {
xs: "h-5 gap-1 px-1 text-xs [&>svg:not([class*='size-'])]:size-3",
'icon-xs': "size-5 p-0.5 [&>svg:not([class*='size-'])]:size-3",
sm: CONTROL_SIZE_VARIANTS.sm,
md: CONTROL_SIZE_VARIANTS.md,
- lg: `${CONTROL_SIZE_VARIANTS.lg} rounded-lg`,
- xl: "h-12 gap-2 px-4 text-base rounded-lg [&>svg:not([class*='size-'])]:size-5",
+ 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",
+ "size-9 aspect-square rounded-xl 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 not-touch:rounded-full p-1 touch:[&_svg]:size-3.5 not-touch:size-[33.75px] not-touch:p-[3.75px] not-touch:[&_svg]:size-[20.625px]',
+ '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]',
},
},
{
@@ -129,6 +127,7 @@ export function buttonClasses(options: ButtonClassOptions = {}): string {
return cn(
buttonVariants({ variant, size }),
+ (isIconSize(size ?? 'md') || square) && 'border-0 bg-transparent',
fullWidth && 'w-full',
!noTouchResize && BUTTON_TOUCH_STYLES,
square && 'aspect-square p-0',
@@ -140,26 +139,15 @@ function isIconSize(size: ButtonSize): boolean {
return size.startsWith('icon-');
}
-// The glass treatment (see the `glass` utility in index.css) — the same
-// material as the app's menus and dialogs. Every variant carries it; `ghost`
-// is the one exception because it has no surface of its own to catch the
-// light: a rim and drop shadow would put a chip around every bare toolbar
-// icon in the app, and a rim that only appears on hover reads as the icon
-// popping out rather than as a state change, so ghost stays flat throughout
-// and its hover scrim alone marks the state.
-// Literal class strings only — Tailwind's scanner can't see classes built
-// from template strings.
-const glassClass = (variant: ButtonVariant): string => {
- if (variant === 'ghost') return '';
- return 'glass';
-};
-
/**
* 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 Give every screen at most one `cta` or `accent` button.
+ * @do Use icon sizes (or square) for borderless icon actions.
+ * @do Use plain for embedded controls such as the composer agent picker.
+ * @do Use strong ink/weight for primary text actions on the flat frame.
+ * @do Use `navigation` only for selectable navigation or list rows.
* @do Always set `label` on icon-only buttons; it is the accessible name.
* @do Use `danger` only for destructive actions, paired with a confirmation.
* @dont Do not restyle a button with utility classes when a variant already
@@ -200,10 +188,7 @@ export const Button = (props: ButtonProps) => {
noTouchResize: local.noTouchResize,
square: local.square,
}),
- // Inside a ButtonGroup the group owns the frame (it strips per-button
- // borders and rounding), so it carries the glass for the whole row —
- // one pane of glass instead of one per segment.
- group === undefined && glassClass(variant()),
+ group && 'bg-transparent',
local.class
);
diff --git a/apps/web/src/components/ui/components/ButtonGroup.tsx b/apps/web/src/components/ui/components/ButtonGroup.tsx
index 8771226570..2913f2141e 100644
--- a/apps/web/src/components/ui/components/ButtonGroup.tsx
+++ b/apps/web/src/components/ui/components/ButtonGroup.tsx
@@ -27,25 +27,12 @@ type ButtonGroupProps = {
children?: JSX.Element;
};
-// Focus ring painted on the group frame when a contained input-group control
-// is focused; the borderless `ghost` frame opts out.
-const groupFocusRing =
- 'has-[[data-slot=input-group-control]:focus-visible]:border-[color-mix(in_oklch,var(--color-edge)_80%,var(--color-ink))] has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-edge-muted';
-
-/* Mirrors the glass rule in Button.tsx: the group carries the glass for the
- whole row, and a `ghost` group — a bare toolbar cluster with no surface of
- its own — stays flat, hover included. Kept local rather than imported so the
- Button <-> ButtonGroup dependency stays type-only. Literal class strings
- only — Tailwind's scanner can't see template-built classes. */
-const glassClass = (variant: ButtonVariant): string => {
- if (variant === 'ghost') return '';
- return 'glass';
-};
-
/** Canonical classes for the button-group frame. */
export const buttonGroupVariants = createVariants(
cn(
- 'inline-flex items-center justify-center',
+ 'inline-flex items-center justify-center rounded-[10px] data-[orientation=horizontal]:rounded-full border border-edge-button bg-control',
+ '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
@@ -53,32 +40,34 @@ export const buttonGroupVariants = createVariants(
),
{
variant: {
- danger: cn('border-1 border-failure/50', groupFocusRing),
- outline: cn('border-1 border-edge-muted', groupFocusRing),
- accent: cn('border-1 border-accent', groupFocusRing),
- success: cn('border-1 border-success', groupFocusRing),
+ danger: '',
+ outline: '',
+ accent: '',
+ success: '',
ghost: '',
- strong: cn('border-1 border-transparent', groupFocusRing),
- cta: cn('border-1 border-transparent', groupFocusRing),
+ plain: 'border-0 bg-transparent',
+ strong: '',
+ cta: '',
+ navigation: 'border-transparent bg-transparent',
},
// 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: 'rounded-md',
- sm: 'rounded-md data-[orientation=horizontal]:h-6',
- md: 'rounded-md',
- lg: 'rounded-lg',
- xl: 'rounded-lg data-[orientation=horizontal]:h-12',
+ xs: '',
+ sm: 'data-[orientation=horizontal]:h-6',
+ md: '',
+ lg: '',
+ xl: 'data-[orientation=horizontal]:h-12',
'icon-xs':
- 'rounded-md data-[orientation=horizontal]:h-5 data-[orientation=vertical]:w-5',
+ 'data-[orientation=horizontal]:h-5 data-[orientation=vertical]:w-5',
'icon-sm':
- 'rounded-md data-[orientation=horizontal]:h-6 data-[orientation=vertical]:w-6',
+ 'data-[orientation=horizontal]:h-6 data-[orientation=vertical]:w-6',
'icon-composer':
- 'rounded-md not-touch:rounded-full 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]',
+ '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':
- 'rounded-md data-[orientation=horizontal]:h-8 data-[orientation=vertical]:w-8',
+ 'data-[orientation=horizontal]:h-8 data-[orientation=vertical]:w-8',
'icon-lg':
- 'rounded-md data-[orientation=horizontal]:h-9 data-[orientation=vertical]:w-9',
+ 'rounded-xl data-[orientation=horizontal]:h-9 data-[orientation=vertical]:w-9',
},
},
{
@@ -96,13 +85,15 @@ export const buttonGroupDividerVariants = createVariants(
),
{
variant: {
- danger: 'bg-failure/50',
- outline: 'bg-edge-muted',
- accent: 'bg-accent',
- success: 'bg-success',
- ghost: 'bg-edge-muted',
- strong: 'bg-surface-4/50',
- cta: 'bg-surface/50',
+ danger: 'bg-edge-divider',
+ outline: 'bg-edge-divider',
+ accent: 'bg-edge-divider',
+ success: 'bg-edge-divider',
+ ghost: 'bg-edge-divider',
+ plain: 'bg-edge-divider',
+ strong: 'bg-edge-divider',
+ cta: 'bg-edge-divider',
+ navigation: 'bg-edge-divider',
},
},
{
@@ -135,12 +126,11 @@ export const ButtonGroup = (props: ButtonGroupProps) => {
data-size={size()}
class={cn(
buttonGroupVariants({ variant: props.variant, size: props.size }),
- glassClass(props.variant ?? 'ghost'),
props.class
)}
role="group"
>
- {/* Clip the segments independently of the expanding glass frame. */}
+ {/* 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>
diff --git a/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx b/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx
index e1b63798a2..225d6ed121 100644
--- a/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx
+++ b/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx
@@ -120,7 +120,7 @@ function CommandMenuShellRoot(props: SurfaceProps) {
return (
<Panel
- class={cn('max-h-[75vh] rounded-xl bg-transparent', local.class)}
+ class={cn('max-h-[75vh] rounded-[inherit] bg-transparent', local.class)}
{...rest}
>
{local.children}
@@ -130,18 +130,14 @@ function CommandMenuShellRoot(props: SurfaceProps) {
function CommandMenuHeader(props: ParentProps<{ class?: string }>) {
return (
- <Panel.Header class={cn('gap-2 px-4 my-1', props.class)}>
+ <Panel.Header class={cn('gap-2 px-4 py-2', props.class)}>
{props.children}
</Panel.Header>
);
}
function CommandMenuToolbar(props: ParentProps<{ class?: string }>) {
- return (
- <Panel.Toolbar class={cn('bg-dialog', props.class)}>
- {props.children}
- </Panel.Toolbar>
- );
+ return <Panel.Toolbar class={props.class}>{props.children}</Panel.Toolbar>;
}
function CommandMenuBody(
@@ -157,10 +153,7 @@ function CommandMenuBody(
function CommandMenuFooter(props: ParentProps<{ class?: string }>) {
return (
<Panel.Footer
- class={cn(
- 'gap-4 px-4 bg-dialog text-xs text-ink-extra-muted/80',
- props.class
- )}
+ class={cn('gap-4 px-4 text-xs text-ink-extra-muted/80', props.class)}
>
{props.children}
</Panel.Footer>
@@ -265,7 +258,7 @@ export function CommandMenuSearchInput(
return (
<input
class={cn(
- 'flex-1 bg-transparent border-0 outline-none focus:outline-none ring-0 focus:ring-0 text-ink-muted placeholder:text-ink-placeholder',
+ 'min-w-0 flex-1 bg-transparent border-0 outline-none focus:outline-none ring-0 focus:ring-0 text-ink-muted placeholder:text-ink-placeholder',
local.class
)}
{...rest}
diff --git a/apps/web/src/components/ui/components/Dialog.tsx b/apps/web/src/components/ui/components/Dialog.tsx
index 4f0c27eb70..1ddbcb7997 100644
--- a/apps/web/src/components/ui/components/Dialog.tsx
+++ b/apps/web/src/components/ui/components/Dialog.tsx
@@ -165,15 +165,10 @@ function DesktopDialog(props: DialogProps) {
<KobalteDialog.Content
ref={props.contentRef}
class={cn(
- 'portal-scope isolate rounded-xl bg-dialog',
- // Floating dialogs (cmd+k, create, confirm) get the glass
- // treatment; fullscreen fills the viewport, so translucency and
- // a cast shadow would just bleed the page through the content.
- // --color-dialog goes translucent inside so nested bg-dialog
- // chrome (e.g. cmd+k's toolbar/footer) reads as the same pane.
+ 'portal-scope isolate',
props.fullscreen
- ? 'size-full'
- : 'w-200 max-w-[calc(100vw-16px)] glass bg-menu-glass [--color-dialog:var(--color-menu-glass)] [&>[data-layer]>[data-surface]]:border-0!',
+ ? 'size-full bg-page'
+ : 'w-200 max-w-[calc(100vw-16px)] elevated-surface [&>[data-layer]>[data-surface]]:border-0! [&>[data-layer]>[data-surface]]:bg-transparent [&>[data-layer]>[data-surface]]:rounded-[24px]',
animateOnOpen() &&
(props.fullscreen
? 'dialog-fullscreen-open-animation'
diff --git a/apps/web/src/components/ui/components/Dropdown.tsx b/apps/web/src/components/ui/components/Dropdown.tsx
index bce96b2eb8..52983e1978 100644
--- a/apps/web/src/components/ui/components/Dropdown.tsx
+++ b/apps/web/src/components/ui/components/Dropdown.tsx
@@ -227,16 +227,17 @@ function DropdownContent(props: DropdownContentProps) {
class={cn(
// Paint the same surface as context menus, including custom
// contents (calendar month lists) without a Dropdown.Group.
- 'rounded-xl size-auto z-action-menu menu-open-animation glass bg-menu-glass text-sm [--color-surface:var(--color-menu)]',
+ 'menu-surface rounded-xl size-auto z-action-menu menu-open-animation text-sm',
local.class
)}
depth={local.depth ?? 2}
as={Surface}
+ hideBorder
{...rest}
onOpenAutoFocus={handleOpenAutoFocus}
ref={setContentRef}
>
- <div class="flex flex-col gap-(--app-border-width) bg-edge-muted/60 size-full">
+ <div class="flex flex-col divide-y divide-edge-divider size-full">
{local.children}
</div>
</KobalteDropdownMenu.Content>
@@ -269,15 +270,16 @@ function DropdownSubContent(props: DropdownSubContentProps) {
>
<KobalteDropdownMenu.SubContent
class={cn(
- 'rounded-xl size-auto z-action-menu menu-open-animation glass bg-menu-glass text-sm [--color-surface:var(--color-menu)]',
+ 'menu-surface rounded-xl size-auto z-action-menu menu-open-animation text-sm',
local.class
)}
depth={local.depth ?? 2}
as={Surface}
+ hideBorder
{...rest}
ref={setContentRef}
>
- <div class="flex flex-col gap-(--app-border-width) bg-edge-muted/60 size-full">
+ <div class="flex flex-col divide-y divide-edge-divider size-full">
{local.children}
</div>
</KobalteDropdownMenu.SubContent>
diff --git a/apps/web/src/components/ui/components/HoverCard.tsx b/apps/web/src/components/ui/components/HoverCard.tsx
index 3b1e17f707..5b42e71e1a 100644
--- a/apps/web/src/components/ui/components/HoverCard.tsx
+++ b/apps/web/src/components/ui/components/HoverCard.tsx
@@ -40,10 +40,11 @@ export function HoverCard(props: HoverCardProps) {
content={
<Surface
class={cn(
- 'flex items-center justify-center p-2 text-ink-muted text-xs wrap-break-word bg-tooltip',
+ 'menu-surface rounded-xl flex items-center justify-center p-2 text-ink-muted text-xs wrap-break-word',
props.contentClass
)}
depth={3}
+ hideBorder
>
{props.content}
</Surface>
diff --git a/apps/web/src/components/ui/components/Input.tsx b/apps/web/src/components/ui/components/Input.tsx
index 5ccb4c1895..97947f8234 100644
--- a/apps/web/src/components/ui/components/Input.tsx
+++ b/apps/web/src/components/ui/components/Input.tsx
@@ -19,12 +19,12 @@ const INPUT_SIZE_VARIANTS: Record<InputSize, string> = {
/** Shared focus treatment for outlined text-entry controls. */
export const inputOutlineFocusClasses =
- 'focus-visible:border-[color-mix(in_oklch,var(--color-edge)_80%,var(--color-ink))] focus-visible:ring-2 focus-visible:ring-edge-muted';
+ 'focus-visible:ring-2 focus-visible:ring-edge-muted';
/** Canonical visual variants for standalone inputs. */
export const inputVariants = createVariants(
cn(
- 'w-full min-w-0 rounded-md border text-ink caret-current outline-none transition-[background-color,border-color,box-shadow]',
+ 'w-full min-w-0 rounded-full border text-ink caret-current outline-none transition-[background-color,border-color,box-shadow] duration-120 motion-reduce:transition-none',
'file:inline-flex file:border-0 file:bg-transparent file:text-[inherit] file:font-medium file:text-ink',
'placeholder:text-ink-placeholder',
'aria-invalid:border-failure aria-invalid:ring-2 aria-invalid:ring-failure/20',
@@ -32,7 +32,7 @@ export const inputVariants = createVariants(
),
{
variant: {
- outline: cn('border-edge-muted bg-input', inputOutlineFocusClasses),
+ outline: cn('border-edge-frame bg-control', inputOutlineFocusClasses),
bare: 'border-transparent bg-transparent',
},
size: INPUT_SIZE_VARIANTS,
diff --git a/apps/web/src/components/ui/components/InputGroup.tsx b/apps/web/src/components/ui/components/InputGroup.tsx
index db1e2b9ef1..44e7f7a503 100644
--- a/apps/web/src/components/ui/components/InputGroup.tsx
+++ b/apps/web/src/components/ui/components/InputGroup.tsx
@@ -70,15 +70,15 @@ const INPUT_GROUP_BUTTON_SIZE: Record<InputSize, ButtonSize> = {
/** Canonical variants for a framed input composition. */
export const inputGroupVariants = createVariants(
cn(
- 'group/input-group relative flex w-full min-w-0 items-center overflow-hidden rounded-md border transition-[background-color,border-color,box-shadow]',
+ 'group/input-group relative flex w-full min-w-0 items-center overflow-hidden rounded-full border transition-[background-color,border-color,box-shadow] duration-120 motion-reduce:transition-none',
'has-[[data-slot=input-group-control]:disabled]:pointer-events-none has-[[data-slot=input-group-control]:disabled]:opacity-50',
'has-[[data-slot=input-group-control][aria-invalid=true]]:border-failure has-[[data-slot=input-group-control][aria-invalid=true]]:ring-2 has-[[data-slot=input-group-control][aria-invalid=true]]:ring-failure/20'
),
{
variant: {
outline: cn(
- 'border-edge-muted bg-input',
- 'has-[[data-slot=input-group-control]:focus-visible]:border-[color-mix(in_oklch,var(--color-edge)_80%,var(--color-ink))] has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-edge-muted'
+ 'border-edge-frame bg-control',
+ 'has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-edge-muted'
),
bare: 'border-transparent bg-transparent',
},
@@ -139,7 +139,8 @@ function InputGroupRoot(props: InputGroupProps) {
};
const size = (): InputSize => local.size ?? inheritedSize() ?? 'md';
const variant = (): InputVariant =>
- local.variant ?? (buttonGroup?.variant === 'ghost' ? 'bare' : 'outline');
+ local.variant ??
+ (buttonGroup?.variant === 'navigation' ? 'bare' : 'outline');
const grouped = () => buttonGroup !== undefined;
const context: InputGroupContextValue = {
@@ -172,9 +173,12 @@ function InputGroupRoot(props: InputGroupProps) {
data-grouped={grouped() ? '' : undefined}
role="group"
class={cn(
- inputGroupVariants({ size: size(), variant: variant() }),
+ inputGroupVariants({
+ size: size(),
+ variant: grouped() ? 'bare' : variant(),
+ }),
grouped() &&
- 'flex-1 rounded-none border-0 bg-transparent has-[[data-slot=input-group-control]:focus-visible]:ring-0',
+ 'flex-1 rounded-none border-0 bg-transparent outline-none has-[[data-slot=input-group-control]:focus-visible]:ring-0',
local.class
)}
{...rest}
@@ -278,7 +282,7 @@ function InputGroupButton(props: InputGroupButtonProps) {
size={local.size ?? INPUT_GROUP_BUTTON_SIZE[group.size]}
square={local.square}
noTouchResize={local.noTouchResize ?? true}
- class={cn('rounded-sm', local.class)}
+ class={local.class}
{...rest}
/>
);
diff --git a/apps/web/src/components/ui/components/NavRow.tsx b/apps/web/src/components/ui/components/NavRow.tsx
index 2dada75429..e303832c93 100644
--- a/apps/web/src/components/ui/components/NavRow.tsx
+++ b/apps/web/src/components/ui/components/NavRow.tsx
@@ -3,7 +3,7 @@ import { cn } from '../utils/classname';
import { Button, type ButtonProps } from './Button';
/**
- * A vertical nav row rendered as a ghost {@link Button}: the shared base/active
+ * A vertical nav row rendered as a navigation {@link Button}: the shared base/active
* styling for sidebar-style rows (icon + label). Used by the settings `SideNav`
* and the app sidebar's row components so the row visuals live in one place.
*
@@ -17,15 +17,11 @@ export const NavRow = (props: NavRowProps) => {
const [local, rest] = splitProps(props, ['active', 'class']);
return (
<Button
- variant="ghost"
+ variant="navigation"
{...rest}
- // Rows paint a single background, like Home items. Suppress Button's
- // additional hover/press scrim so hover never doubles up to selection.
class={cn(
- 'flex items-center justify-start text-sm gap-2 cursor-default w-full rounded-md py-1 px-2 text-ink-extra-muted bg-none!',
- local.active
- ? 'bg-active text-ink not-disabled:hover:bg-active'
- : 'not-disabled:hover:bg-hover not-disabled:hover:text-ink',
+ 'flex items-center justify-start text-sm gap-2 cursor-default w-full rounded-md py-1 px-2 text-ink-extra-muted',
+ local.active ? 'bg-hover text-ink' : '',
local.class
)}
/>
diff --git a/apps/web/src/components/ui/components/Panel.tsx b/apps/web/src/components/ui/components/Panel.tsx
index f8c32ebf5e..2978a278ec 100644
--- a/apps/web/src/components/ui/components/Panel.tsx
+++ b/apps/web/src/components/ui/components/Panel.tsx
@@ -42,7 +42,7 @@ function PanelHeader(props: SlotProps) {
<Show when={resolved()}>
<div
class={cn(
- 'flex flex-none items-center min-h-10 px-2 border-b border-edge-muted overflow-hidden',
+ 'flex flex-none items-center min-h-10 px-2 border-b border-edge-divider overflow-hidden',
props.class
)}
style={{ 'grid-area': 'header' }}
@@ -59,7 +59,7 @@ function PanelToolbar(props: SlotProps) {
<Show when={resolved()}>
<div
class={cn(
- 'flex flex-none items-center p-2 border-b border-edge-muted overflow-hidden',
+ 'flex flex-none items-center p-2 border-b border-edge-divider overflow-hidden',
props.class
)}
style={{ 'grid-area': 'toolbar' }}
@@ -106,7 +106,7 @@ function PanelFooter(props: SlotProps) {
<Show when={resolved()}>
<div
class={cn(
- 'flex flex-none items-center min-h-10 px-2 border-t border-edge-muted overflow-hidden',
+ 'flex flex-none items-center min-h-10 px-2 border-t border-edge-divider overflow-hidden',
props.class
)}
style={{ 'grid-area': 'footer' }}
diff --git a/apps/web/src/components/ui/components/PillButton.tsx b/apps/web/src/components/ui/components/PillButton.tsx
index 75914e6adb..54d7bcc328 100644
--- a/apps/web/src/components/ui/components/PillButton.tsx
+++ b/apps/web/src/components/ui/components/PillButton.tsx
@@ -6,7 +6,7 @@ import { Button } from './Button';
export type PillButtonTone = 'cta' | 'subtle';
export interface PillButtonProps {
- /** `cta` = primary green action; `subtle` = borderless ink/5 pill. */
+ /** `cta` uses stronger ink; both tones use the shared flat action frame. */
tone?: PillButtonTone;
/** Optional leading icon, e.g. a plus for "create" actions. */
icon?: Component<{ class?: string }>;
@@ -16,7 +16,7 @@ export interface PillButtonProps {
}
/**
- * Rounded-full pill button shared across empty states and setup cards. Tight
+ * Rounded-full button shared across empty states and setup cards. Tight
* vertical padding by design; the leading icon (when present) tightens the left
* padding so the icon, not the pill edge, sets the rhythm.
*/
@@ -28,7 +28,7 @@ export function PillButton(props: PillButtonProps) {
size="md"
class={cn(
'rounded-full py-1',
- subtle() ? 'bg-ink/5 px-2.5' : props.icon ? 'pl-3 pr-4' : 'px-4',
+ subtle() ? 'px-2.5' : props.icon ? 'pl-3 pr-4' : 'px-4',
props.class
)}
onClick={props.onClick}
diff --git a/apps/web/src/components/ui/components/SegmentedControl.tsx b/apps/web/src/components/ui/components/SegmentedControl.tsx
index 5efe1fcc60..ee783b94ed 100644
--- a/apps/web/src/components/ui/components/SegmentedControl.tsx
+++ b/apps/web/src/components/ui/components/SegmentedControl.tsx
@@ -37,7 +37,8 @@ export const SegmentedControl = <T extends string | number | boolean>(
onChange={handleChange}
aria-label={props['aria-label']}
class={cn(
- 'border border-edge-muted rounded-xs inline-flex overflow-hidden',
+ 'border border-edge-frame rounded-full inline-flex overflow-hidden',
+ size() === 'sm' ? 'h-6' : 'h-8',
props.class
)}
>
@@ -47,11 +48,11 @@ export const SegmentedControl = <T extends string | number | boolean>(
value={serialize(option.value)}
disabled={option.disabled}
class={cn(
- 'relative flex items-center justify-center border-r border-edge-muted last:border-r-0 font-medium',
- size() === 'sm' ? 'px-2 py-1 text-xs' : 'px-3 py-1.5 text-sm',
+ 'relative flex h-full items-center justify-center border-r border-edge-divider last:border-r-0 font-medium outline-none has-focus-visible:ring-2 has-focus-visible:ring-inset has-focus-visible:ring-edge-focus transition-colors duration-120 motion-reduce:transition-none',
+ size() === 'sm' ? 'px-2 text-xs' : 'px-3 text-sm',
option.disabled
? 'opacity-50'
- : 'text-ink-muted hover:text-ink hover:bg-ink/15 data-checked:text-ink data-checked:bg-ink/10 data-checked:hover:bg-ink/20'
+ : 'text-ink-muted not-touch:hover:text-ink not-touch:hover:overlay-hover active:overlay-active data-checked:text-ink data-checked:overlay-active'
)}
>
<KSegmentedControl.ItemInput class="absolute inset-0 pointer-events-none" />
diff --git a/apps/web/src/components/ui/components/Select.tsx b/apps/web/src/components/ui/components/Select.tsx
index 4867621967..c05fffed0e 100644
--- a/apps/web/src/components/ui/components/Select.tsx
+++ b/apps/web/src/components/ui/components/Select.tsx
@@ -29,7 +29,7 @@ function SelectTrigger(props: SelectTriggerProps) {
return (
<KobalteSelect.Trigger
class={cn(
- 'flex w-full items-center justify-between gap-2 text-left data-expanded:bg-hover',
+ 'flex h-8 w-full items-center justify-between gap-2 rounded-full border border-edge-frame bg-control px-2 text-left text-ink-muted outline-none data-expanded:overlay-active data-expanded:text-ink focus-visible:ring-2 focus-visible:ring-edge-muted aria-invalid:border-failure data-invalid:border-failure',
local.class
)}
{...rest}
@@ -106,7 +106,7 @@ function SelectContent(props: SelectContentProps) {
<Layer depth={local.depth ?? 3}>
<KobalteSelect.Content
class={cn(
- 'z-action-menu max-h-[var(--kb-popper-content-available-height)] min-w-[var(--kb-popper-anchor-width)] overflow-y-auto rounded-xl border border-edge bg-menu-glass p-1.5 glass menu-open-animation',
+ 'menu-surface z-action-menu max-h-[var(--kb-popper-content-available-height)] min-w-[var(--kb-popper-anchor-width)] overflow-y-auto p-1.5 menu-open-animation',
local.class
)}
{...rest}
diff --git a/apps/web/src/components/ui/components/SendButton.tsx b/apps/web/src/components/ui/components/SendButton.tsx
index 4bf328703d..b943a6ad8f 100644
--- a/apps/web/src/components/ui/components/SendButton.tsx
+++ b/apps/web/src/components/ui/components/SendButton.tsx
@@ -36,7 +36,7 @@ export function SendButton(props: SendButtonProps) {
aria-label={local['aria-label'] ?? 'Send'}
tooltip={local.tooltip ?? 'Send'}
class={cn(
- 'rounded-full touch:size-7.5',
+ 'rounded-full border-0 bg-ink text-surface-4 touch:size-7.5',
local.appearance === 'composer'
? cn(
'not-touch:not-disabled:bg-composer-action not-touch:not-disabled:text-composer-action-ink not-touch:light-mode:shadow-none not-touch:light-mode:backdrop-filter-none not-touch:light-mode:after:hidden',
diff --git a/apps/web/src/components/ui/components/TabbedControl.tsx b/apps/web/src/components/ui/components/TabbedControl.tsx
index 2672e0b43f..0be0f1afec 100644
--- a/apps/web/src/components/ui/components/TabbedControl.tsx
+++ b/apps/web/src/components/ui/components/TabbedControl.tsx
@@ -13,23 +13,23 @@ export const TabbedControl: ParentComponent<
> = (props) => {
return (
<KSegmentedControl
- class="w-full text-sm rounded-xs border border-edge-muted relative overflow-hidden"
+ class="w-full text-sm rounded-full relative"
value={props.value}
defaultValue={props.defaultValue ?? props.list[0]?.value}
onChange={props.onChange}
disabled={props.disabled}
>
<div class="relative" role="presentation">
- <div class="flex" role="presentation">
+ <div class="flex h-8" role="presentation">
<For each={props.list}>
{(item) => (
<KSegmentedControl.Item
value={item.value}
disabled={props.disabled}
- class="border-r border-edge-muted last:border-r-0"
+ class="relative flex-1 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"
>
<KSegmentedControl.ItemInput class="absolute inset-0 pointer-events-none" />
- <KSegmentedControl.ItemLabel class="relative text-ink-muted/70 size-full px-2.5 py-1 text-xs font-medium data-checked:text-ink data-checked:bg-edge hover:text-ink hover:bg-ink/6 data-checked:hover:bg-edge block">
+ <KSegmentedControl.ItemLabel class="relative flex size-full items-center justify-center rounded-full border border-transparent px-4 text-xs font-medium text-ink-extra-muted data-checked:text-ink data-checked:bg-active data-checked:border-edge-frame hover:text-ink select-none transition-colors duration-120 motion-reduce:transition-none">
{item.label}
</KSegmentedControl.ItemLabel>
</KSegmentedControl.Item>
diff --git a/apps/web/src/components/ui/components/Tabs.tsx b/apps/web/src/components/ui/components/Tabs.tsx
index 651c202fc0..16fc9bdaac 100644
--- a/apps/web/src/components/ui/components/Tabs.tsx
+++ b/apps/web/src/components/ui/components/Tabs.tsx
@@ -48,14 +48,15 @@ export const Tabs = (props: TabsProps) => {
local.class
)}
>
- <KSegmentedControl.Indicator class="pointer-events-none absolute top-0 left-0 z-0 rounded-xl border border-edge-muted bg-active transition-[transform,width,height] duration-50" />
+ <KSegmentedControl.Indicator class="pointer-events-none absolute top-0 left-0 z-0 rounded-full border border-edge-frame bg-active transition-[transform,width,height] duration-50 motion-reduce:transition-none" />
<For each={local.list}>
{(item) => (
<KSegmentedControl.Item
value={item.value}
disabled={local.disabled}
class={cn(
- 'relative z-1 rounded-full has-focus-visible:ring-2 has-focus-visible:ring-accent/20',
+ 'relative z-1 inline-flex h-full 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',
local.fullWidth && 'flex-1',
local.itemClass
)}
@@ -63,8 +64,7 @@ export const Tabs = (props: TabsProps) => {
<KSegmentedControl.ItemInput class="pointer-events-none absolute inset-0" />
<KSegmentedControl.ItemLabel
class={cn(
- 'flex h-8 items-center px-4 text-xs font-medium rounded-full select-none',
- 'text-ink-extra-muted hover:text-ink data-checked:text-ink',
+ 'flex h-8 items-center px-4 text-xs font-medium rounded-full select-none text-ink-extra-muted hover:text-ink data-checked:text-ink transition-colors duration-120 motion-reduce:transition-none',
local.fullWidth && 'w-full justify-center',
local.labelClass
)}
diff --git a/apps/web/src/components/ui/components/TextField.tsx b/apps/web/src/components/ui/components/TextField.tsx
index b0ad36cb3c..2a5cba1e24 100644
--- a/apps/web/src/components/ui/components/TextField.tsx
+++ b/apps/web/src/components/ui/components/TextField.tsx
@@ -56,7 +56,7 @@ function TextFieldTextArea<T extends ValidComponent = 'textarea'>(
<KobalteTextField.TextArea
data-slot="text-field-textarea"
class={cn(
- 'flex min-h-20 w-full resize-none rounded-md border border-edge-muted bg-input px-2.5 py-2 text-base text-ink caret-current outline-none transition-[border-color,box-shadow]',
+ 'flex min-h-20 w-full resize-none rounded-[10px] border border-edge-frame bg-control px-2.5 py-2 text-base text-ink caret-current outline-none transition-[border-color,box-shadow] duration-120 motion-reduce:transition-none',
'placeholder:text-ink-placeholder',
inputOutlineFocusClasses,
'aria-invalid:border-failure aria-invalid:ring-2 aria-invalid:ring-failure/20',
diff --git a/apps/web/src/components/ui/components/Toolbar.tsx b/apps/web/src/components/ui/components/Toolbar.tsx
index 691cbfb93f..3c841c9206 100644
--- a/apps/web/src/components/ui/components/Toolbar.tsx
+++ b/apps/web/src/components/ui/components/Toolbar.tsx
@@ -32,7 +32,7 @@ export type ToolbarProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, 'style'> & {
/**
* An opinionated floating bar of controls. Owns its surface chrome
- * (`rounded-xl`, padding, border, background, shadow) and sets the default
+ * (`rounded-xl`, padding, border, background) and sets the default
* size/variant for its `Toolbar.Button` children, so callers compose controls
* without restyling them. Pair with a positioning wrapper (e.g.
* `PopupPositioner`) when it needs to float against an anchor.
@@ -74,7 +74,7 @@ export function Toolbar(props: ToolbarProps) {
role="toolbar"
aria-orientation={ctx.orientation}
class={cn(
- 'inline-flex items-center gap-1 rounded-xl border border-edge bg-surface p-1.5 shadow-lg',
+ 'inline-flex items-center gap-1 rounded-xl border border-edge-frame bg-control p-1.5',
'data-[orientation=vertical]:flex-col data-[orientation=vertical]:items-stretch',
local.class
)}
@@ -146,7 +146,7 @@ function ToolbarDivider(props: ToolbarDividerProps) {
}
data-orientation={orientation()}
class={cn(
- 'shrink-0 self-stretch bg-edge-muted',
+ 'shrink-0 self-stretch bg-edge-divider',
'data-[orientation=horizontal]:mx-0.5 data-[orientation=horizontal]:my-1 data-[orientation=horizontal]:w-px',
'data-[orientation=vertical]:my-0.5 data-[orientation=vertical]:mx-1 data-[orientation=vertical]:h-px',
props.class
diff --git a/apps/web/src/components/view-shell/ListDropdowns.tsx b/apps/web/src/components/view-shell/ListDropdowns.tsx
index f7d611e23a..03bda840b8 100644
--- a/apps/web/src/components/view-shell/ListDropdowns.tsx
+++ b/apps/web/src/components/view-shell/ListDropdowns.tsx
@@ -46,8 +46,7 @@ function SingleSelectDropdown<TId extends string>(
variant="outline"
size="md"
square
- depth={2}
- class={cn('rounded-lg bg-surface', props.class)}
+ class={props.class}
label={props.label}
>
{props.icon}
@@ -185,8 +184,7 @@ export function ListFilterDropdown<
variant="outline"
size="md"
square
- depth={2}
- class={cn('rounded-lg bg-surface', props.class)}
+ class={props.class}
label={props.label ?? 'Filter list'}
>
<FilterIcon />
diff --git a/apps/web/src/components/view-shell/SearchBar.tsx b/apps/web/src/components/view-shell/SearchBar.tsx
index 37a963ddc8..addd0eaadb 100644
--- a/apps/web/src/components/view-shell/SearchBar.tsx
+++ b/apps/web/src/components/view-shell/SearchBar.tsx
@@ -57,7 +57,11 @@ export function SearchBar(props: SearchBarProps) {
return (
<Surface
depth={2}
- class={cn('h-10 w-full min-w-0 rounded-2xl text-ink', local.class)}
+ hideBorder
+ class={cn(
+ 'h-10 w-full min-w-0 rounded-full border border-edge-button bg-control text-ink has-[input:focus-visible]:ring-2 has-[input:focus-visible]:ring-edge-muted',
+ local.class
+ )}
data-search-bar=""
>
<TextField
diff --git a/apps/web/src/components/view-shell/ViewShell.tsx b/apps/web/src/components/view-shell/ViewShell.tsx
index c512302c85..c69411bb99 100644
--- a/apps/web/src/components/view-shell/ViewShell.tsx
+++ b/apps/web/src/components/view-shell/ViewShell.tsx
@@ -604,7 +604,7 @@ function TopBar(props: JSX.HTMLAttributes<HTMLDivElement>) {
<div
{...rest}
class={cn(
- 'flex h-12 min-w-0 shrink-0 items-center gap-1 border-b border-edge-muted px-2 py-3 not-touch:pl-[13px] touch:hidden',
+ 'flex h-12 min-w-0 shrink-0 items-center gap-1 px-2 py-3 not-touch:pl-[13px] touch:hidden',
local.class
)}
data-view-shell-top-bar=""
@@ -685,7 +685,7 @@ function Detail(props: JSX.HTMLAttributes<HTMLDivElement>) {
<div
{...rest}
class={cn(
- 'absolute inset-y-0 right-0 z-10 min-h-0 border-l border-edge-muted bg-panel shadow-menu',
+ 'absolute inset-y-0 right-0 z-10 min-h-0 border-l border-edge-frame bg-panel shadow-menu',
local.class
)}
style={{ width: `${layout().width}px`, 'max-width': '100%' }}
diff --git a/apps/web/src/components/view-shell/ViewSidebar.tsx b/apps/web/src/components/view-shell/ViewSidebar.tsx
index 396ab9ed58..5ed8a4b926 100644
--- a/apps/web/src/components/view-shell/ViewSidebar.tsx
+++ b/apps/web/src/components/view-shell/ViewSidebar.tsx
@@ -28,7 +28,7 @@ function Header(props: JSX.HTMLAttributes<HTMLDivElement>) {
<div
{...rest}
class={cn(
- 'flex h-12 min-w-0 shrink-0 items-center justify-between gap-3 border-b border-edge-muted py-3 pl-(--sidebar-content-inset) pr-(--sidebar-header-action-inset) [&_[data-split-panel-close]]:ml-(--sidebar-control-overhang)',
+ 'flex h-12 min-w-0 shrink-0 items-center justify-between gap-3 py-3 pl-(--sidebar-content-inset) pr-(--sidebar-header-action-inset) [&_[data-split-panel-close]]:ml-(--sidebar-control-overhang)',
local.class
)}
data-view-sidebar-header=""
@@ -253,7 +253,7 @@ function Branch(
<div
{...rest}
class={cn(
- 'relative min-w-0 pl-(--sidebar-icon-slot) before:pointer-events-none before:absolute before:inset-y-0 before:left-(--sidebar-local-rail) before:w-px before:-translate-x-1/2 before:bg-edge-muted',
+ 'relative min-w-0 pl-(--sidebar-icon-slot) before:pointer-events-none before:absolute before:inset-y-0 before:left-(--sidebar-local-rail) before:w-px before:-translate-x-1/2 before:bg-edge-divider',
local.class
)}
data-view-sidebar-branch=""
@@ -268,16 +268,16 @@ function Branch(
function Action(props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) {
const [local, rest] = splitProps(props, ['children', 'class']);
return (
- <button
+ <Button
type="button"
{...rest}
class={cn(
- 'flex h-(--sidebar-row-height) w-full min-w-0 shrink-0 items-center gap-(--sidebar-label-gap) rounded-lg bg-hover px-(--sidebar-item-inset) text-left text-sm leading-5 font-medium text-ink hover:bg-active focus-visible:outline-2 focus-visible:outline-accent touch:h-11',
+ 'h-(--sidebar-row-height) w-full min-w-0 justify-start gap-(--sidebar-label-gap) px-(--sidebar-item-inset) text-left touch:h-11',
local.class
)}
>
{local.children}
- </button>
+ </Button>
);
}
@@ -287,7 +287,7 @@ function Footer(props: JSX.HTMLAttributes<HTMLDivElement>) {
<div
{...rest}
class={cn(
- 'shrink-0 border-t border-edge-muted px-(--sidebar-gutter) py-3',
+ 'shrink-0 border-t border-edge-frame px-(--sidebar-gutter) py-3',
local.class
)}
>
diff --git a/apps/web/src/features/agents-view/components/AgentSessionPane.tsx b/apps/web/src/features/agents-view/components/AgentSessionPane.tsx
index 83fba99650..3be4b65ef5 100644
--- a/apps/web/src/features/agents-view/components/AgentSessionPane.tsx
+++ b/apps/web/src/features/agents-view/components/AgentSessionPane.tsx
@@ -43,10 +43,10 @@ import {
import { useUserId } from '@core/context/user';
import { openExternalUrl } from '@core/util/url';
import type { AgentSessionEntity } from '@entity';
+import ShareIcon from '@icon/share.svg';
import type { NotificationSource } from '@notifications/notification-source';
import ArrowSquareOut from '@phosphor/arrow-square-out.svg';
import GitBranch from '@phosphor/git-branch.svg';
-import ShareIcon from '@phosphor/share.svg';
import { EmptyStatePanel } from '@ui';
import { createSignal, onCleanup, Show, Suspense } from 'solid-js';
import { ChatSessionInput } from './ChatComposer';
diff --git a/apps/web/src/features/agents-view/components/Topbar.tsx b/apps/web/src/features/agents-view/components/Topbar.tsx
index 27d659c311..9f247ecd02 100644
--- a/apps/web/src/features/agents-view/components/Topbar.tsx
+++ b/apps/web/src/features/agents-view/components/Topbar.tsx
@@ -18,7 +18,7 @@ export function Topbar(props: {
</h1>
)}
</div>
- <div class="ml-auto flex shrink-0 items-center gap-2">
+ <div class="header-actions ml-auto flex shrink-0 items-center gap-2">
{props.children}
</div>
</ViewShell.TopBar>
diff --git a/apps/web/src/features/agents-view/views/AgentPicker.tsx b/apps/web/src/features/agents-view/views/AgentPicker.tsx
index 03e57a5b80..f456a6e7b0 100644
--- a/apps/web/src/features/agents-view/views/AgentPicker.tsx
+++ b/apps/web/src/features/agents-view/views/AgentPicker.tsx
@@ -52,14 +52,14 @@ export function AgentPicker(props: {
return (
<Dropdown open={open()} onOpenChange={setOpen} placement="top-end">
<Dropdown.Trigger
- variant="ghost"
+ variant="plain"
aria-label="Agent"
title={
rawModel()
? label()
: `${props.selected?.name ?? 'Choose agent'} · ${label()}`
}
- class="h-[33.75px] min-w-0 max-w-full gap-[5.625px] rounded-full bg-transparent hover:bg-hover px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder"
+ class="h-[33.75px] min-w-0 max-w-full gap-[5.625px] px-[7.5px] text-base font-normal text-ink-muted light-mode:text-composer-placeholder"
>
<Show
when={rawModel()}
diff --git a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
index 117b84f439..0a0cd52a7b 100644
--- a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
+++ b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
@@ -21,9 +21,9 @@ import {
import { isMobile } from '@core/mobile/isMobile';
import { openExternalUrl } from '@core/util/url';
import type { AgentSessionEntity } from '@entity';
+import ShareIcon from '@icon/share.svg';
import ArrowSquareOut from '@phosphor/arrow-square-out.svg';
import GitBranch from '@phosphor/git-branch.svg';
-import ShareIcon from '@phosphor/share.svg';
import type { AgentSessionResponse } from '@service-agent-harness/generated/schemas';
import { createSignal, For, Show, Suspense } from 'solid-js';
import { useAgentSession } from '../context/AgentSessionContext';
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 a043ccf8f5..42bdd13eaf 100644
--- a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
+++ b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
@@ -24,8 +24,8 @@ import {
} from '@core/component/TopBar/ShareButton';
import { isMobile } from '@core/mobile/isMobile';
import { buildEntityData } from '@entity';
+import IconShared from '@icon/share.svg';
import PhoneCallIcon from '@phosphor/phone-call.svg';
-import IconShared from '@phosphor/share.svg';
import type { CallRecord } from '@service-storage/generated/schemas/callRecord';
import { Button } from '@ui';
import { type Accessor, Show } from 'solid-js';
diff --git a/apps/web/src/features/block-canvas/component/TopBar.tsx b/apps/web/src/features/block-canvas/component/TopBar.tsx
index ae253afa83..bc25fe4ac7 100644
--- a/apps/web/src/features/block-canvas/component/TopBar.tsx
+++ b/apps/web/src/features/block-canvas/component/TopBar.tsx
@@ -29,8 +29,8 @@ import {
} from '@core/util/currentBlockDocumentName';
import { buildSimpleEntityUrl } from '@core/util/url';
import { downloadFile } from '@filesystem/download';
+import IconShared from '@icon/share.svg';
import DownloadSimple from '@phosphor/download-simple.svg';
-import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import { onMount } from 'solid-js';
import { URL_PARAMS } from '../constants';
diff --git a/apps/web/src/features/block-chat/component/TopBar.tsx b/apps/web/src/features/block-chat/component/TopBar.tsx
index d247e75591..ac1fbc69c7 100644
--- a/apps/web/src/features/block-chat/component/TopBar.tsx
+++ b/apps/web/src/features/block-chat/component/TopBar.tsx
@@ -18,9 +18,9 @@ import {
} from '@core/component/TopBar/ShareButton';
import { DEV_MODE_ENV } from '@core/constant/featureFlags';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
+import IconShared from '@icon/share.svg';
import ChatDebugIcon from '@phosphor/chat-text.svg';
import Notepad from '@phosphor/notepad.svg';
-import IconShared from '@phosphor/share.svg';
import type { Accessor } from 'solid-js';
export function TopBar(props: {
diff --git a/apps/web/src/features/block-code/component/TopBar.tsx b/apps/web/src/features/block-code/component/TopBar.tsx
index d6ac76e252..da5cae03c2 100644
--- a/apps/web/src/features/block-code/component/TopBar.tsx
+++ b/apps/web/src/features/block-code/component/TopBar.tsx
@@ -21,8 +21,8 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
+import IconShared from '@icon/share.svg';
import Download from '@phosphor/download-simple.svg';
-import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import type { Component } from 'solid-js';
import { Show } from 'solid-js';
diff --git a/apps/web/src/features/block-email/component/TopBar.tsx b/apps/web/src/features/block-email/component/TopBar.tsx
index cc4720d500..707594b467 100644
--- a/apps/web/src/features/block-email/component/TopBar.tsx
+++ b/apps/web/src/features/block-email/component/TopBar.tsx
@@ -31,13 +31,13 @@ import { TOKENS } from '@core/hotkey/tokens';
import { getActiveCommandByToken, runCommand } from '@core/hotkey/utils';
import { isMobile } from '@core/mobile/isMobile';
import { buildEntityData } from '@entity';
+import IconShared from '@icon/share.svg';
import ArrowRightIcon from '@phosphor/arrow-right.svg';
import CheckIcon from '@phosphor/check.svg';
import EnvelopeSimpleIcon from '@phosphor/envelope-simple.svg';
import EnvelopeSimpleOpenIcon from '@phosphor/envelope-simple-open.svg';
import TaskIcon from '@phosphor/list-checks.svg';
import ProhibitIcon from '@phosphor/prohibit.svg';
-import IconShared from '@phosphor/share.svg';
import TrashIcon from '@phosphor/trash.svg';
import NoiseIcon from '@phosphor/waveform.svg';
import CheckBoldIcon from '@phosphor-icons/core/bold/check-bold.svg?component-solid';
@@ -306,7 +306,7 @@ export function TopBar(props: {
accent closed envelope that re-marks the thread read. */}
<Show when={isOwnThread()}>
<Button
- class="p-1 rounded-lg"
+ size="icon-md"
label={
emailCtx.isThreadMarkedUnread()
? 'Mark as read'
@@ -332,7 +332,7 @@ export function TopBar(props: {
</Show>
<Show when={isOwnThread() && showMarkDoneToggle()}>
<Button
- class="p-1 rounded-lg"
+ size="icon-md"
label={isDone() ? 'Mark as not done' : 'Mark done'}
hotkey={
isDone()
diff --git a/apps/web/src/features/block-image/component/TopBar.tsx b/apps/web/src/features/block-image/component/TopBar.tsx
index 184a96e516..8bda97a561 100644
--- a/apps/web/src/features/block-image/component/TopBar.tsx
+++ b/apps/web/src/features/block-image/component/TopBar.tsx
@@ -20,8 +20,8 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
+import IconShared from '@icon/share.svg';
import Download from '@phosphor/download.svg';
-import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
export function TopBar() {
diff --git a/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx b/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
index a38573db97..e36ef0ca4d 100644
--- a/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
+++ b/apps/web/src/features/block-md/component/DocumentAiEditBar.tsx
@@ -96,10 +96,8 @@ export function DocumentAiEditBar(props: { documentId: string }) {
onMouseLeave={() => setHovering(false)}
tooltip={editing() ? 'Stop AI edit' : 'Ask AI to edit'}
hotkey={editing() ? undefined : TOKENS.chat.input.focus}
- variant="ghost"
size="sm"
- depth={2}
- class="gap-1.5 rounded-full border border-edge-muted px-2.5"
+ class="gap-1.5 px-2.5"
>
<span
class="flex size-4 shrink-0 items-center justify-center"
diff --git a/apps/web/src/features/block-pdf/component/TopBar.tsx b/apps/web/src/features/block-pdf/component/TopBar.tsx
index f3d964a052..be23084bfe 100644
--- a/apps/web/src/features/block-pdf/component/TopBar.tsx
+++ b/apps/web/src/features/block-pdf/component/TopBar.tsx
@@ -33,9 +33,9 @@ import {
} from '@core/component/TopBar/ShareButton';
import { blockMetadataSignal } from '@core/signal/load';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
+import IconShared from '@icon/share.svg';
import DownloadIcon from '@phosphor/download-simple.svg';
import Printer from '@phosphor/printer.svg';
-import IconShared from '@phosphor/share.svg';
import { blockNameToItemType } from '@service-storage/itemType';
import { createCallback } from '@solid-primitives/rootless';
import { usePdfDocument } from '../context/pdf-document-context';
diff --git a/apps/web/src/features/block-project/component/TopBar.tsx b/apps/web/src/features/block-project/component/TopBar.tsx
index 71fa88a1c8..c6f73afe92 100644
--- a/apps/web/src/features/block-project/component/TopBar.tsx
+++ b/apps/web/src/features/block-project/component/TopBar.tsx
@@ -37,7 +37,7 @@ import { ENABLE_PROJECT_SHARING } from '@core/constant/featureFlags';
import { isMobile } from '@core/mobile/isMobile';
import { useCanEdit, useIsDocumentOwner } from '@core/signal/permissions';
import { buildSimpleEntityUrl } from '@core/util/url';
-import IconShared from '@phosphor/share.svg';
+import IconShared from '@icon/share.svg';
import { createMemo, For, Show } from 'solid-js';
import { ProjectCreateMenu, useProjectCreateTools } from './ProjectCreateMenu';
diff --git a/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx b/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx
index 200aee111c..7b18693deb 100644
--- a/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx
+++ b/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx
@@ -23,7 +23,7 @@ import { useCanEdit } from '@core/signal/permissions';
import { getDisplayName, tryMacroId } from '@core/user';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@phosphor/share.svg';
+import IconShared from '@icon/share.svg';
import { Show } from 'solid-js';
import { spreadsheetChatContext } from './core/chat-context';
import type { SpreadsheetData } from './definition';
diff --git a/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx b/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
index 649b3fc101..902b78a96f 100644
--- a/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
+++ b/apps/web/src/features/block-spreadsheet/SpreadsheetDemo.tsx
@@ -13,7 +13,7 @@ import {
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { toast } from '@core/component/Toast/Toast';
import { downloadFile } from '@filesystem/download';
-import IconShared from '@phosphor/share.svg';
+import IconShared from '@icon/share.svg';
import { Button, Dialog } from '@ui';
import { createSignal } from 'solid-js';
import { spreadsheetChatContext } from './core/chat-context';
diff --git a/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx b/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx
index c3fe2dc08d..a1690d71df 100644
--- a/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx
+++ b/apps/web/src/features/block-spreadsheet/views/SpreadsheetDraftMenu.tsx
@@ -2,9 +2,9 @@ import { MobileDrawer } from '@components/app/mobile/MobileDrawer';
import type { SplitFileMenuActionGroups } from '@components/app/split-layout/context';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
+import Share from '@icon/share.svg';
import DotsThree from '@phosphor/dots-three.svg';
import Rename from '@phosphor/pencil-line.svg';
-import Share from '@phosphor/share.svg';
import Sparkle from '@phosphor/sparkle.svg';
import { Dropdown } from '@ui';
import { createEffect, createMemo, For, on, onCleanup, Show } from 'solid-js';
diff --git a/apps/web/src/features/block-unknown/component/TopBar.tsx b/apps/web/src/features/block-unknown/component/TopBar.tsx
index 863b0ee81f..b191774e2f 100644
--- a/apps/web/src/features/block-unknown/component/TopBar.tsx
+++ b/apps/web/src/features/block-unknown/component/TopBar.tsx
@@ -20,8 +20,8 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
+import IconShared from '@icon/share.svg';
import DownloadSimple from '@phosphor/download-simple.svg';
-import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import { useGetFileBlob } from '../signal/blockData';
diff --git a/apps/web/src/features/block-unknown/component/UnknownContent.tsx b/apps/web/src/features/block-unknown/component/UnknownContent.tsx
index 77d82672f2..98c9ee2c75 100644
--- a/apps/web/src/features/block-unknown/component/UnknownContent.tsx
+++ b/apps/web/src/features/block-unknown/component/UnknownContent.tsx
@@ -1,5 +1,5 @@
+import ShareFat from '@icon/share.svg';
import DownloadSimple from '@phosphor/download-simple.svg';
-import ShareFat from '@phosphor/share.svg';
import { Button } from '@ui';
export function UnknownContent(props: {
diff --git a/apps/web/src/features/block-video/component/TopBar.tsx b/apps/web/src/features/block-video/component/TopBar.tsx
index 6a7fcb7f08..752c04011f 100644
--- a/apps/web/src/features/block-video/component/TopBar.tsx
+++ b/apps/web/src/features/block-video/component/TopBar.tsx
@@ -19,8 +19,8 @@ import {
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
+import IconShared from '@icon/share.svg';
import Download from '@phosphor/download.svg';
-import IconShared from '@phosphor/share.svg';
import Spinner from '@phosphor/spinner.svg';
import { createCallback } from '@solid-primitives/rootless';
import { createSignal } from 'solid-js';
diff --git a/apps/web/src/features/channel/Channel/ChannelDetail.tsx b/apps/web/src/features/channel/Channel/ChannelDetail.tsx
index d47aa47b06..b1b4f0f164 100644
--- a/apps/web/src/features/channel/Channel/ChannelDetail.tsx
+++ b/apps/web/src/features/channel/Channel/ChannelDetail.tsx
@@ -123,7 +123,7 @@ export function ChannelDetailActions(props: ChannelDetailHeaderProps) {
};
return (
- <div class="ml-auto flex shrink-0 items-center gap-2">
+ <div class="header-actions ml-auto flex shrink-0 items-center gap-2">
<ChannelLiveIndicators channelId={props.channelId} />
<Show when={ENABLE_CALLS && !call.isInThisChannel()}>
<ChannelCallButton channelId={props.channelId} />
diff --git a/apps/web/src/features/channel/CreateChannelModal.tsx b/apps/web/src/features/channel/CreateChannelModal.tsx
index 31f4e24013..5cd0614130 100644
--- a/apps/web/src/features/channel/CreateChannelModal.tsx
+++ b/apps/web/src/features/channel/CreateChannelModal.tsx
@@ -20,6 +20,7 @@ import { useCreateChannelMutation } from '@queries/channel/channels';
import { useCurrentTeamQuery } from '@queries/team/teams';
import type { TeamMember } from '@service-auth/generated/schemas/teamMember';
import { Button, Dialog, Panel, ToggleSwitch, Tooltip } from '@ui';
+import { inputClasses } from '@ui/components/Input';
import { createMemo, createSignal, For, Show } from 'solid-js';
const [newChannelModalOpen, setNewChannelModalOpen] = createSignal(false);
@@ -198,7 +199,7 @@ export function CreateChannelModal() {
autocomplete="off"
data-1p-ignore
aria-invalid={error() === 'Enter a channel name'}
- class="h-10 w-full border-none bg-transparent px-0 text-xl font-medium text-ink outline-none placeholder:text-ink-placeholder focus:ring-0"
+ class={inputClasses({ size: 'lg', class: 'text-sm' })}
/>
</div>
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 6102f7133d..71e80d218f 100644
--- a/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx
+++ b/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx
@@ -157,7 +157,7 @@ export function ChannelLabelRow(props: { label: ChannelLabel }) {
onSelect={() => rail.markLabelRead(props.label)}
/>
</Dropdown.Group>
- <Dropdown.Separator class="my-1 h-px border-0 bg-edge-muted" />
+ <Dropdown.Separator class="my-1 h-px border-0 bg-edge-divider" />
<Dropdown.Group>
<MenuRow
icon={TrashIcon}
diff --git a/apps/web/src/features/command/CommandMenu.tsx b/apps/web/src/features/command/CommandMenu.tsx
index 608fc9454b..c3359367dd 100644
--- a/apps/web/src/features/command/CommandMenu.tsx
+++ b/apps/web/src/features/command/CommandMenu.tsx
@@ -578,7 +578,7 @@ export function CommandMenuInner(props: {
return (
<CommandMenuShell
- class={cn('max-h-[75vh] rounded-xl', props.class)}
+ class={cn('max-h-[75vh]', props.class)}
ref={setCommandMenuRef}
depth={props.depth}
>
diff --git a/apps/web/src/features/command/Launcher.tsx b/apps/web/src/features/command/Launcher.tsx
index feec61a863..617694c482 100644
--- a/apps/web/src/features/command/Launcher.tsx
+++ b/apps/web/src/features/command/Launcher.tsx
@@ -998,7 +998,7 @@ export const LauncherInner = (props: LauncherInnerProps) => {
return (
// The shared shell stopped painting its own pane (cmd+k gets one from the
// app Dialog wrapper); this raw-Kobalte dialog carries it here.
- <div class="create-menu-pane w-200 max-w-[calc(100vw-16px)] rounded-xl touch:mobile-sheet touch:overflow-hidden touch:pb-[var(--mobile-sheet-safe-padding,0px)] glass bg-menu-glass [--color-dialog:var(--color-menu-glass)]">
+ <div class="elevated-surface create-menu-pane w-200 max-w-[calc(100vw-16px)] touch:mobile-sheet touch:overflow-hidden touch:pb-[var(--mobile-sheet-safe-padding,0px)]">
<div
aria-hidden="true"
class="hidden touch:flex h-5 shrink-0 items-center justify-center"
diff --git a/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsx b/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsx
index 20ab41ae34..c742fd583d 100644
--- a/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsx
+++ b/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsx
@@ -7,8 +7,8 @@ import type { FileOperation } from '@components/app/split-layout/components/Spli
import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';
import { Permissions } from '@core/component/SharePermissions';
import type { ProjectEntity } from '@entity';
+import ShareIcon from '@icon/share.svg';
import ArrowSquareOutIcon from '@phosphor/arrow-square-out.svg';
-import ShareIcon from '@phosphor/share.svg';
import { For, Show } from 'solid-js';
import type { DriveLocationBreadcrumb } from '../core/breadcrumbs';
import type { DriveFolder } from '../core/types';
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 740d34eb08..a838d919ee 100644
--- a/apps/web/src/features/email-message/components/message-actions.tsx
+++ b/apps/web/src/features/email-message/components/message-actions.tsx
@@ -32,6 +32,7 @@ export function MessageActions(props: {
>
<Show when={!props.hiddenActions?.includes('reply')}>
<Button
+ size="icon-sm"
class="size-6 p-0 border-0 bg-transparent rounded text-ink-muted hover:text-ink hover:bg-ink-muted/8"
noTouchResize
onClick={onChangeReplyType('reply-all')}
@@ -42,6 +43,7 @@ export function MessageActions(props: {
</Show>
<Show when={!props.hiddenActions?.includes('forward')}>
<Button
+ size="icon-sm"
class="size-6 p-0 border-0 bg-transparent rounded text-ink-muted hover:text-ink hover:bg-ink-muted/8"
noTouchResize
onClick={onChangeReplyType('forward')}
diff --git a/apps/web/src/features/email-view/components/EmailList.tsx b/apps/web/src/features/email-view/components/EmailList.tsx
index 1b9dedf939..0a0b166f33 100644
--- a/apps/web/src/features/email-view/components/EmailList.tsx
+++ b/apps/web/src/features/email-view/components/EmailList.tsx
@@ -375,7 +375,7 @@ export function EmailList(props: EmailListProps) {
aria-multiselectable="true"
aria-activedescendant={list.focus.key()}
tabIndex={0}
- class="soup-list relative flex size-full min-h-0 min-w-0 flex-col overflow-hidden outline-none"
+ class="soup-list relative flex size-full min-h-0 min-w-0 flex-col overflow-hidden outline-none [--color-list-highlighted:var(--color-active)]"
>
<PullToRefresh
scrollContainer={pullScrollContainer}
diff --git a/apps/web/src/features/entity/composed/list-entity/shared.tsx b/apps/web/src/features/entity/composed/list-entity/shared.tsx
index 8d7717179c..5e14646772 100644
--- a/apps/web/src/features/entity/composed/list-entity/shared.tsx
+++ b/apps/web/src/features/entity/composed/list-entity/shared.tsx
@@ -170,6 +170,6 @@ export function RowIndicator(props: {
export function InboxDivider() {
return (
- <div class="col-span-3 ml-(--soup-inbox-left-of-content) min-w-full min-h-px max-h-px bg-edge-muted" />
+ <div class="col-span-3 ml-(--soup-inbox-left-of-content) min-w-full min-h-px max-h-px bg-edge-divider" />
);
}
diff --git a/apps/web/src/features/inbox-view/components/home-press.test.tsx b/apps/web/src/features/inbox-view/components/home-press.test.tsx
index 5523f41b8e..cf553fe4b9 100644
--- a/apps/web/src/features/inbox-view/components/home-press.test.tsx
+++ b/apps/web/src/features/inbox-view/components/home-press.test.tsx
@@ -1,4 +1,3 @@
-import { SidebarCreateHeader } from '@app/components/view-shell/SidebarCreateButton';
import { cleanup, fireEvent, render } from '@solidjs/testing-library';
import type { JSX } from 'solid-js';
import { afterEach, describe, expect, it, vi } from 'vitest';
@@ -29,32 +28,22 @@ vi.mock('@ui', async () => ({
afterEach(cleanup);
-describe.each(['recent', 'new chat'] as const)('Home %s press', (kind) => {
+describe('Home recent press', () => {
function setup() {
const activate = vi.fn();
- const view = render(() =>
- kind === 'new chat' ? (
- <SidebarCreateHeader
- title="Home"
- label="New chat"
- onCreate={activate}
- />
- ) : (
- <HomeListEntity
- entity={{
- type: 'chat',
- id: 'recent-chat',
- name: 'Recent chat',
- ownerId: 'test-user',
- }}
- occurrenceKey="recent-chat"
- onClick={activate}
- />
- )
- );
- const item = view.container.querySelector<HTMLElement>(
- kind === 'new chat' ? 'button' : '[data-home-item]'
- )!;
+ const view = render(() => (
+ <HomeListEntity
+ entity={{
+ type: 'chat',
+ id: 'recent-chat',
+ name: 'Recent chat',
+ ownerId: 'test-user',
+ }}
+ occurrenceKey="recent-chat"
+ onClick={activate}
+ />
+ ));
+ const item = view.container.querySelector<HTMLElement>('[data-home-item]')!;
return { activate, item };
}
@@ -62,9 +51,7 @@ describe.each(['recent', 'new chat'] as const)('Home %s press', (kind) => {
const { activate, item } = setup();
fireEvent.mouseDown(item, { button: 0, detail: 1, ctrlKey: true });
expect(activate).toHaveBeenCalledTimes(1);
- if (kind === 'recent') {
- expect(activate.mock.calls[0][0].ctrlKey).toBe(true);
- }
+ expect(activate.mock.calls[0][0].ctrlKey).toBe(true);
fireEvent.mouseUp(item, { button: 0, detail: 1 });
fireEvent.click(item, { button: 0, detail: 1 });
expect(activate).toHaveBeenCalledTimes(1);
diff --git a/apps/web/src/features/next-soup/soup-view/soup-view.tsx b/apps/web/src/features/next-soup/soup-view/soup-view.tsx
index 7a864a542a..75fb059884 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
@@ -540,6 +540,7 @@ export const SoupView = (props: SoupViewProps) => {
<Show when={docsUrl()}>
{(url) => (
<Button
+ size="icon-md"
variant="ghost"
class="p-0.5 rounded-sm text-ink-extra-muted hover:text-ink-muted @max-[380px]/split-header:hidden"
label="View documentation"
@@ -640,8 +641,9 @@ export const SoupView = (props: SoupViewProps) => {
hotkey={TOKENS.soup.openSearch}
>
<Button
+ size="icon-md"
variant="outline"
- class="p-1 size-7 rounded-lg ml-2 bg-surface"
+ class="p-1 size-7 rounded-lg ml-2"
onClick={() => setNarrowSearchExpanded(true)}
depth={2}
>
diff --git a/apps/web/src/features/property/extractors/PropertyPill.test.tsx b/apps/web/src/features/property/extractors/PropertyPill.test.tsx
index 9efe3853cc..960ba380ea 100644
--- a/apps/web/src/features/property/extractors/PropertyPill.test.tsx
+++ b/apps/web/src/features/property/extractors/PropertyPill.test.tsx
@@ -2,7 +2,7 @@
* @vitest-environment jsdom
*/
-import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
+import { cleanup, render, screen } from '@solidjs/testing-library';
import { afterEach, describe, expect, it, vi } from 'vitest';
import {
PropertyRootContext,
@@ -47,28 +47,6 @@ function context(
afterEach(cleanup);
describe('PropertyPill', () => {
- it('uses the interactive ghost/sm contract when editable', async () => {
- const onEdit = vi.fn();
-
- render(() => (
- <PropertyRootContext.Provider value={context(true, property, onEdit)}>
- <PropertyPill>Status</PropertyPill>
- </PropertyRootContext.Provider>
- ));
-
- const pill = screen.getByRole('button', { name: 'Status' });
- expect(pill.classList).toContain('h-6');
- expect(pill.classList).toContain('border-transparent');
- expect(pill.classList).toContain('bg-transparent');
- expect(pill.classList).toContain('rounded-full');
- expect(pill.classList).toContain(
- 'not-touch:not-disabled:hover:overlay-hover'
- );
-
- await fireEvent.click(pill);
- expect(onEdit).toHaveBeenCalledOnce();
- });
-
it('remains passive when the property is read-only', () => {
render(() => (
<PropertyRootContext.Provider value={context(false, property)}>
diff --git a/apps/web/src/features/property/tags/TagPill.test.ts b/apps/web/src/features/property/tags/TagPill.test.ts
index 7a23155151..f6f6dd2b50 100644
--- a/apps/web/src/features/property/tags/TagPill.test.ts
+++ b/apps/web/src/features/property/tags/TagPill.test.ts
@@ -5,15 +5,6 @@ vi.mock('./TagDot', () => ({ TagDot: () => null }));
vi.mock('./TagPicker', () => ({ TagPicker: () => null }));
describe('tagPillClasses', () => {
- it('uses the outline small Badge contract', () => {
- const classes = tagPillClasses().split(' ');
-
- expect(classes).toContain('h-6');
- expect(classes).toContain('text-xs');
- expect(classes).toContain('border-edge-muted');
- expect(classes).toContain('rounded-full');
- });
-
it('merges layout constraints supplied by a tag owner', () => {
const classes = tagPillClasses('m-px max-w-[14ch] gap-1.5');
diff --git a/apps/web/src/features/tasks-view/components/task-list/TaskListHeader.tsx b/apps/web/src/features/tasks-view/components/task-list/TaskListHeader.tsx
index a36a284ce5..d94458bbb5 100644
--- a/apps/web/src/features/tasks-view/components/task-list/TaskListHeader.tsx
+++ b/apps/web/src/features/tasks-view/components/task-list/TaskListHeader.tsx
@@ -61,7 +61,7 @@ export function TaskListHeader() {
return (
<div
role="row"
- class="task-grid-row grid h-10 w-full shrink-0 items-center gap-2 bg-surface px-3 text-xs font-medium text-ink-extra-muted"
+ class="task-grid-row grid h-10 w-full shrink-0 items-center gap-2 px-3 text-xs font-medium text-ink-extra-muted"
style={{
'grid-template-columns': TASK_GRID_TEMPLATE_COLUMNS_WIDE,
'grid-template-areas': TASK_GRID_TEMPLATE_AREAS_WIDE,
diff --git a/apps/web/src/features/theme/themes/macro-dark.ts b/apps/web/src/features/theme/themes/macro-dark.ts
index 163c2200ed..eba229ad8f 100644
--- a/apps/web/src/features/theme/themes/macro-dark.ts
+++ b/apps/web/src/features/theme/themes/macro-dark.ts
@@ -1,26 +1,29 @@
-import { isTouchDevice } from '@core/mobile/isTouchDevice';
import type { ThemeV3 } from '../types/themeTypes';
-/** Neutral dark surfaces with a true-black base and amber accent. */
+/** Near-black blue-gray surfaces with a restrained depth ramp and muted blue accent. */
export const macroDarkTheme = {
id: 'Macro Dark',
name: 'Macro Dark',
version: 3,
mode: 'dark',
colorTokens: {
- 'surface-0': 'oklch(0 0 21deg)',
- 'surface-1': 'oklch(0.18 0 21deg)',
- 'surface-2': 'oklch(0.23 0 21deg)',
- 'surface-3': 'oklch(0.25 0 21deg)',
- 'surface-4': 'oklch(0.28 0 21deg)',
+ 'surface-0': 'oklch(0.17 0.002 250deg)',
+ 'surface-1':
+ 'color-mix(in oklch, var(--color-surface-0) 97%, var(--color-content-0))',
+ 'surface-2':
+ 'color-mix(in oklch, var(--color-surface-0) 95%, var(--color-content-0))',
+ 'surface-3':
+ 'color-mix(in oklch, var(--color-surface-0) 93%, var(--color-content-0))',
+ 'surface-4':
+ 'color-mix(in oklch, var(--color-surface-0) 91%, var(--color-content-0))',
'content-0': 'oklch(1 0 21deg)',
'content-1': 'oklch(0.83 0 21deg)',
'content-2': 'oklch(0.75 0 21deg)',
'content-3': 'oklch(0.63 0 21deg)',
'content-4': 'oklch(0.55 0 21deg)',
- edge: 'oklch(0.28 0 21deg)',
- 'edge-muted': 'oklch(0.25 0 21deg)',
- accent: 'oklch(0.75 0.2 59deg)',
+ edge: 'var(--color-surface-4)',
+ 'edge-muted': 'var(--color-surface-2)',
+ accent: 'oklch(0.7 0.12 250deg)',
red: 'oklch(0.75 0.2 25.331deg)',
orange: 'oklch(0.75 0.2 47.604deg)',
amber: 'oklch(0.75 0.2 70.08deg)',
@@ -44,16 +47,13 @@ export const macroDarkTheme = {
'link-hover': 'var(--color-accent)',
'link-visited': 'var(--color-accent)',
page: 'var(--color-surface-0)',
- // Full-frame mobile panels use the true-black base.
- panel: isTouchDevice()
- ? 'var(--color-surface-0)'
- : 'var(--color-surface-1)',
+ panel: 'var(--color-surface-0)',
dialog: 'var(--color-surface-2)',
menu: 'var(--color-surface-2)',
tooltip: 'var(--color-surface-2)',
toast: 'var(--color-surface-2)',
- input: 'transparent',
- 'input-focus': 'var(--color-surface-1)',
+ input: 'var(--color-control)',
+ 'input-focus': 'var(--color-control)',
message: 'var(--color-surface-1)',
hover: 'color-mix(in oklch, var(--color-content-0) 3%, transparent)',
active: 'color-mix(in oklch, var(--color-content-0) 6%, transparent)',
@@ -61,7 +61,7 @@ export const macroDarkTheme = {
success: 'var(--color-green)',
warning: 'var(--color-amber)',
failure: 'var(--color-red)',
- chrome:
- 'color-mix(in oklch, var(--color-surface-0) 80%, var(--color-content-0))',
+ // Keep mobile glass at its original lightness, independent of the page base.
+ chrome: 'oklch(0.2 0.002 250deg)',
},
} satisfies ThemeV3;
diff --git a/apps/web/src/features/ui-gallery/UiGallery.test.tsx b/apps/web/src/features/ui-gallery/UiGallery.test.tsx
index d25cb3178d..3c21e6cef8 100644
--- a/apps/web/src/features/ui-gallery/UiGallery.test.tsx
+++ b/apps/web/src/features/ui-gallery/UiGallery.test.tsx
@@ -43,23 +43,6 @@ function renderGallery() {
}
describe('UiGallery', () => {
- it('renders the sidebar with every documented component', () => {
- renderGallery();
- const search = screen.getByRole('searchbox', {
- name: 'Search components',
- });
- expect(search.dataset.slot).toBe('input-group-control');
- const inputGroup = search.closest('[data-slot="input-group"]');
- expect(inputGroup?.classList).toContain('bg-input');
- expect(search.classList).toContain('bg-transparent');
- expect(search.classList).toContain(
- '[&::-webkit-search-cancel-button]:hidden'
- );
- for (const entry of DOC_ENTRIES) {
- expect(screen.getAllByText(entry.doc.name).length).toBeGreaterThan(0);
- }
- });
-
it('shows Foundation Colors when no page is selected', () => {
renderGallery();
expect(
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 38da67f0c8..d15cf5b554 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -60,11 +60,11 @@
@property --safe-right { syntax: "<length>"; inherits: true; initial-value: 0px; }
@property --safe-left { syntax: "<length>"; inherits: true; initial-value: 0px; }
@property --safe-top { syntax: "<length>"; inherits: true; initial-value: 0px; }
-@property --app-border-width { syntax: "<length>"; inherits: true; initial-value: 0.5px; }
+@property --app-border-width { syntax: "<length>"; inherits: true; initial-value: 1px; }
@property --app-ring-width { syntax: "<length>"; inherits: true; initial-value: 0.5px; }
:root {
- --app-border-width: 0.5px;
+ --app-border-width: 1px;
--app-ring-width: 0.5px;
/* Workspace sidebar geometry. Both icon rails are 26px from the edge.
@@ -496,6 +496,11 @@ body.tauri-ios {
--color-link-visited: var(--color-accent);
--color-page: var(--color-surface-0);
--color-panel: var(--theme-panel, var(--color-surface-1));
+ --color-control: var(--color-surface-2);
+ --color-edge-frame: color-mix(in oklch, var(--color-content-0) 8%, transparent);
+ --color-edge-button: color-mix(in oklch, var(--color-content-0) 5%, transparent);
+ --color-edge-divider: color-mix(in oklch, var(--color-content-0) 4%, transparent);
+ --color-edge-focus: color-mix(in oklch, var(--color-content-0) 40%, transparent);
--color-dialog: var(--color-surface-2);
--color-menu: var(--color-surface-2);
/* Touch surfaces keep their translucent fill; desktop overrides it below
@@ -589,7 +594,7 @@ body.tauri-ios {
--color-avatar-edge: oklch(0 0 0 / 0.4);
--color-skeleton: color-mix(in oklch, var(--color-ink) 10%, transparent);
--color-list-hover: var(--color-hover);
- --color-list-highlighted: var(--color-hover);
+ --color-list-highlighted: var(--color-active);
--color-list-selected: var(--color-selected);
--color-list-selected-highlighted: color-mix(in oklch, var(--color-accent) 16%, transparent);
@@ -786,6 +791,17 @@ html[data-theme-light='false'] {
--color-composer: var(--color-surface-4);
}
+/* Right-side header actions share a quiet, hover-only background. */
+@utility header-actions {
+ & [data-button] {
+ @apply rounded-xl border-0 bg-transparent;
+
+ &:not(:hover):not(:active) {
+ background-image: none;
+ }
+ }
+}
+
/* Floating "island" chrome shared by the mobile dock buttons, header islands,
and other floating mobile controls. Consumers add their own shape classes
(e.g. `size-10 rounded-full` or `h-10 rounded-full px-3`). Defined as a
@@ -959,7 +975,21 @@ html[data-theme-light='false'] {
--glass-shadow-scale: 0.5;
}
-html[data-theme-light='true'] .glass-input {
+/* Shared flat menu appearance, on the existing menu elements. */
+@utility menu-surface {
+ @apply relative min-h-0 rounded-xl border border-edge-frame bg-menu text-ink shadow-none;
+ --color-surface: var(--color-menu);
+}
+
+/* Shared dialog appearance; composers retain their original glass. */
+@utility elevated-surface {
+ @apply glass-input;
+ border-radius: 24px;
+ background-color: var(--color-dialog);
+ color: var(--color-ink);
+}
+
+html[data-theme-light='true'] :is(.glass-input, .elevated-surface) {
--glass-shadow-y: 4px;
--glass-shadow-blur: 16px;
--glass-shadow-spread: -10px;
@@ -1466,17 +1496,17 @@ a {
/* Shared text-field styling so inputs look the same across every settings tab.
Apply to an <input>; pair with a width utility (e.g. `w-full`) as needed. */
@utility settings-input {
- @apply h-9 px-3 rounded-lg border border-edge-muted bg-transparent text-base text-ink outline-none transition-colors;
+ @apply h-9 px-3 rounded-full border border-edge-frame bg-control text-base text-ink outline-none transition-colors duration-120 motion-reduce:transition-none;
+ &:is(textarea) {
+ @apply rounded-xl;
+ }
/* Matches the composer/chat placeholder token so hint text reads the same
faintness everywhere, rather than settings sitting more prominent. */
&::placeholder {
@apply text-ink-placeholder;
}
- &:hover {
- @apply border-edge;
- }
- &:focus {
- @apply border-accent;
+ &:focus-visible {
+ @apply ring-2 ring-edge-muted;
}
/* State styling owned by the utility so call sites toggle an attribute instead
of fighting the border/text classes. `aria-invalid` after `:focus` so the
@@ -1501,7 +1531,7 @@ a {
inset-inline: calc(var(--spacing) * 6);
bottom: 0;
height: 1px;
- background-color: color-mix(in oklab, var(--color-ink-muted) 5%, transparent);
+ background-color: var(--color-edge-divider);
pointer-events: none;
}
}
@@ -1517,7 +1547,7 @@ a {
inset-inline: calc(var(--spacing) * 6);
bottom: 0;
height: 1px;
- background-color: color-mix(in oklab, var(--color-ink-muted) 5%, transparent);
+ background-color: var(--color-edge-divider);
pointer-events: none;
}
}
diff --git a/apps/web/src/lib/core/component/ContextMenu.tsx b/apps/web/src/lib/core/component/ContextMenu.tsx
index 9451e64912..1223a2b453 100644
--- a/apps/web/src/lib/core/component/ContextMenu.tsx
+++ b/apps/web/src/lib/core/component/ContextMenu.tsx
@@ -276,7 +276,7 @@ export function MenuGroup(props: { children: JSX.Element; class?: string }) {
export function MenuSeparator() {
return (
- <ContextMenu.Separator class="my-1.5 -mx-1.5 w-[calc(100%+0.75rem)] border-t border-edge" />
+ <ContextMenu.Separator class="my-1.5 -mx-1.5 w-[calc(100%+0.75rem)] border-t border-edge-divider" />
);
}
@@ -294,7 +294,7 @@ function MobileConditionalOverlay(
const MENU_SURFACE_SCOPE = '[--color-surface:var(--color-menu)]';
-export const MENU_CONTENT_CLASS = `flex flex-col justify-start items-start border border-edge bg-menu-glass ${MENU_SURFACE_SCOPE} glass rounded-xl p-1.5 cursor-default select-none max-w-full max-h-[calc(100dvh-10rem)] overflow-y-auto z-modal menu-open-animation`;
+export const MENU_CONTENT_CLASS = `menu-surface flex flex-col justify-start items-start p-1.5 cursor-default select-none max-w-full max-h-[calc(100dvh-10rem)] overflow-y-auto z-modal menu-open-animation`;
type MenuContentProps = ParentProps<{
class?: string;
diff --git a/apps/web/src/lib/core/component/OldMenu.tsx b/apps/web/src/lib/core/component/OldMenu.tsx
index 02124e6f68..2e11aef651 100644
--- a/apps/web/src/lib/core/component/OldMenu.tsx
+++ b/apps/web/src/lib/core/component/OldMenu.tsx
@@ -34,11 +34,11 @@ function OldBaseItem(props: ParentProps<OldBaseItemProps>) {
return (
<div class="flex flex-col justify-start items-start w-full">
<Show when={props.spacerTop}>
- <h4 class="my-1 border-edge border-t w-full" />
+ <h4 class="my-1 border-edge-divider border-t w-full" />
</Show>
<div class="px-1 w-full">{props.children}</div>
<Show when={props.spacerBottom}>
- <h4 class="my-1 border-edge border-t w-full" />
+ <h4 class="my-1 border-edge-divider border-t w-full" />
</Show>
</div>
);
@@ -242,7 +242,7 @@ export function OldMenu(props: ParentProps<OldMenuProps>) {
return (
<div
class={cn(
- 'flex flex-col py-1 justify-start items-start border border-edge bg-menu-glass [--color-surface:var(--color-menu)] glass rounded-md cursor-default select-none',
+ 'menu-surface flex flex-col py-1 justify-start items-start cursor-default select-none',
props.width && (oldMenuWidths[props.width] ?? props.width),
isTouchDevice() && 'relative',
props.hide && 'hidden',
diff --git a/apps/web/src/lib/core/component/TabsInset.tsx b/apps/web/src/lib/core/component/TabsInset.tsx
index 88ff29b1bd..6f7cb84d62 100644
--- a/apps/web/src/lib/core/component/TabsInset.tsx
+++ b/apps/web/src/lib/core/component/TabsInset.tsx
@@ -58,7 +58,7 @@ export const TabsInset = (props: TabsInsetProps) => {
<Layer depth={trackDepth()}>
<div
class={cn(
- 'relative flex items-center border border-edge-muted bg-surface rounded-lg p-0.5 has-focus-visible:ring-2 has-focus-visible:ring-accent/20',
+ 'relative flex items-center border border-edge-muted bg-surface rounded-full p-0.5 has-focus-visible:ring-2 has-focus-visible:ring-accent/20',
local.fullWidth && 'w-full',
local.trackClass
)}
@@ -74,7 +74,7 @@ export const TabsInset = (props: TabsInsetProps) => {
<KSegmentedControl.ItemInput class="absolute inset-0 pointer-events-none" />
<KSegmentedControl.ItemLabel
class={cn(
- 'flex items-center px-2.5 py-1 text-xs font-medium data-checked:ring data-checked:ring-edge-muted ring-inset rounded-md text-ink-extra-muted hover:text-ink data-checked:bg-surface data-checked:text-ink data-checked:shadow-[0_1px_2px_rgba(0,0,0,0.06)]',
+ 'flex items-center px-3 py-1 text-xs font-medium data-checked:ring data-checked:ring-edge-muted ring-inset rounded-full text-ink-extra-muted hover:text-ink data-checked:bg-surface data-checked:text-ink data-checked:shadow-[0_1px_2px_rgba(0,0,0,0.06)]',
local.fullWidth && 'w-full justify-center',
local.labelClass
)}
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
index 6bcfb6918b..db4f252bfb 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
@@ -36,6 +36,7 @@ import { idToEmail } from '@core/user';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import type { ResultError } from '@core/util/result';
import { buildSimpleEntityUrl } from '@core/util/url';
+import IconShared from '@icon/share.svg';
import { Dialog } from '@kobalte/core/dialog';
import ChevronDownIcon from '@phosphor/caret-down.svg';
import IconComment from '@phosphor/chat-teardrop.svg';
@@ -44,7 +45,6 @@ import CopyIcon from '@phosphor/copy.svg';
import IconEye from '@phosphor/eye.svg';
import IconLink from '@phosphor/link.svg';
import IconEdit from '@phosphor/pencil.svg';
-import IconShared from '@phosphor/share.svg';
import UserCircle from '@phosphor/user-circle.svg';
import UsersIcon from '@phosphor/users.svg';
import IconX from '@phosphor/x.svg';
@@ -70,15 +70,7 @@ import type { LinkShare } from '@service-storage/generated/schemas/linkShare';
import type { SharePermissionV2ChannelSharePermissions } from '@service-storage/generated/schemas/sharePermissionV2ChannelSharePermissions';
import { createCallback } from '@solid-primitives/rootless';
import { useNavigate } from '@solidjs/router';
-import {
- Button,
- ButtonGroup,
- cn,
- Dropdown,
- Panel,
- SegmentedControl,
- Tooltip,
-} from '@ui';
+import { Button, cn, Dropdown, Panel, SegmentedControl, Tooltip } from '@ui';
import type { Result } from 'neverthrow';
import {
type Accessor,
@@ -1588,7 +1580,7 @@ export function ShareTrigger(props: {
});
return (
- <ButtonGroup variant="outline" size="sm" class="bg-surface" depth={2}>
+ <div class="flex items-center gap-1">
<Tooltip
label={
shareStatus()?.tooltip ??
@@ -1600,6 +1592,9 @@ export function ShareTrigger(props: {
}
>
<Button
+ variant="plain"
+ size="md"
+ class="rounded-xl"
onClick={() => {
if (!isAuthenticated()) {
openLoginModal();
@@ -1614,16 +1609,16 @@ export function ShareTrigger(props: {
</Button>
</Tooltip>
- <ButtonGroup.Divider />
-
<Button
+ variant="plain"
tooltip="Copy Share Link"
- size="icon-sm"
+ size="icon-md"
+ class="rounded-xl"
onClick={ShareLinkAction().action}
>
<Dynamic component={ShareLinkAction().icon} class="size-3.5!" />
</Button>
- </ButtonGroup>
+ </div>
);
}
diff --git a/docs/AGENT_GUIDE/documents.md b/docs/AGENT_GUIDE/documents.md
index 0bce56ab4b..288db32a3d 100644
--- a/docs/AGENT_GUIDE/documents.md
+++ b/docs/AGENT_GUIDE/documents.md
@@ -1,5 +1,9 @@
# Documents
+The document header has separate Share, Copy Share Link, and Side Panel buttons.
+They are borderless with a soft rounded background on hover. Share opens the
+sharing dialog; copying a link is a separate action.
+
## Spreadsheets
Spreadsheets are an internal pilot controlled by the `enable-spreadsheets` PostHog
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index c16a6b4f26..e57b5bf4ca 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -1,5 +1,11 @@
# Other Surfaces
+## Top bars
+
+Right-aligned split-header actions (including Calendar's New event and Channel's
+Call and Ask Macro) are borderless with a rounded-xl background on hover. Channel
+header tabs use fully rounded tracks and selected pills.
+
## User cards
Avatar and user-mention cards open on hover on pointer devices and as a bottom