Skip to content

armgit / macro

Public Imported from GitHub
0

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

fix(web): refine split colors and dialog spacing (#6958)

teo2e4ac7a56fd1
diff --git a/apps/web/src/components/app/Layout.tsx b/apps/web/src/components/app/Layout.tsx
index 8a1ab709c9..8a48f15e97 100644
--- a/apps/web/src/components/app/Layout.tsx
+++ b/apps/web/src/components/app/Layout.tsx
@@ -442,7 +442,7 @@ function LayoutInner(props: RouteSectionProps) {
return (
<div
class={cn(
- 'relative flex flex-col justify-between w-dvw h-[calc(var(--dvh,1dvh)*100)] pl-(--safe-left) pr-(--safe-right)'
+ 'relative flex flex-col justify-between not-touch:bg-panel w-dvw h-[calc(var(--dvh,1dvh)*100)] pl-(--safe-left) pr-(--safe-right)'
)}
>
<ImperativeDialogHost />
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 6b6ee0b271..4d496ea322 100644
--- a/apps/web/src/components/app/sidebar-next/list-nav.tsx
+++ b/apps/web/src/components/app/sidebar-next/list-nav.tsx
@@ -210,7 +210,7 @@ export const ListNav = (props: ListNavProps) => {
icon={props.item.icon}
iconActive={props.item.iconActive}
filled={isActive()}
- class="size-5.5"
+ class="size-5"
/>
<Show
when={props.activeCall}
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 6bbd731569..ecad69a1ce 100644
--- a/apps/web/src/components/app/sidebar-next/sidebar-rail.tsx
+++ b/apps/web/src/components/app/sidebar-next/sidebar-rail.tsx
@@ -16,7 +16,7 @@ import { useNavItemGates } from './use-nav-item-gates';
/**
* The rebuilt app sidebar, behind `enable-new-app-views`: a single always-narrow
- * column of 36px icon buttons, labels in tooltips.
+ * column of 40px icon buttons, labels in tooltips.
*
* Always narrow by design — there is no slim mode or hover-peek overlay.
* `cmd+.` toggles navigation in the active workspace. The `g`-prefixed
@@ -54,15 +54,15 @@ export const SidebarRail = () => {
{...hotkeyScopeNeutralAttribute}
data-ui="sidebar-rail"
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',
+ 'relative flex h-full w-14 shrink-0 flex-col items-center gap-1 overflow-hidden border-edge-frame bg-panel px-2 pb-3 pt-2',
(globalSplitManager()?.splits().length ?? 1) <= 1 && 'border-r'
)}
>
<SidebarRailCreateButton />
<SearchRailButton />
- <nav class="shrink-0 pt-5">
- <ul class="flex flex-col items-center gap-2">
+ <nav class="shrink-0 pt-4">
+ <ul class="flex flex-col items-center gap-1">
<For each={visibleNavItems(gates())}>
{(item) => (
<li class="flex">
diff --git a/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx b/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx
index 225d6ed121..346bbff349 100644
--- a/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx
+++ b/apps/web/src/components/ui/components/CommandMenuPrimitives.tsx
@@ -130,7 +130,7 @@ function CommandMenuShellRoot(props: SurfaceProps) {
function CommandMenuHeader(props: ParentProps<{ class?: string }>) {
return (
- <Panel.Header class={cn('gap-2 px-4 py-2', props.class)}>
+ <Panel.Header class={cn('gap-3 px-5 py-3', props.class)}>
{props.children}
</Panel.Header>
);
@@ -153,7 +153,7 @@ function CommandMenuBody(
function CommandMenuFooter(props: ParentProps<{ class?: string }>) {
return (
<Panel.Footer
- class={cn('gap-4 px-4 text-xs text-ink-extra-muted/80', props.class)}
+ class={cn('gap-4 px-5 py-2 text-xs text-ink-extra-muted/80', props.class)}
>
{props.children}
</Panel.Footer>
@@ -221,7 +221,7 @@ export function CommandMenuList<T>(props: {
ref={listRef}
role="listbox"
class={cn(
- 'max-h-54 overflow-y-auto overflow-x-hidden scrollbar-hidden p-2',
+ 'max-h-54 overflow-y-auto overflow-x-hidden scrollbar-hidden p-2.5',
props.class
)}
onScroll={() => {
@@ -258,7 +258,7 @@ export function CommandMenuSearchInput(
return (
<input
class={cn(
- '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',
+ 'min-w-0 flex-1 py-0.5 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/features/calendar/components/composer/EventDateTimeInputs.tsx b/apps/web/src/features/calendar/components/composer/EventDateTimeInputs.tsx
index a4e7584b8b..c91c04476b 100644
--- a/apps/web/src/features/calendar/components/composer/EventDateTimeInputs.tsx
+++ b/apps/web/src/features/calendar/components/composer/EventDateTimeInputs.tsx
@@ -114,7 +114,7 @@ export function EventTimeInput(props: EventTimeInputProps) {
disabled={props.disabled}
aria-expanded={open()}
aria-haspopup="listbox"
- class="w-full appearance-none rounded-md border border-edge-muted bg-surface py-1.5 pr-7 pl-2 text-xs text-ink outline-none focus:border-accent disabled:opacity-50 [&::-webkit-calendar-picker-indicator]:hidden"
+ class="w-full appearance-none rounded-md border border-edge-muted bg-control py-1.5 pr-7 pl-2 text-xs text-ink outline-none focus:border-accent disabled:opacity-50 [&::-webkit-calendar-picker-indicator]:hidden"
onFocus={() => {
props.onFocus?.();
setDropdownOpen(true);
diff --git a/apps/web/src/features/calendar/components/composer/EventDateTimeRangeFields.tsx b/apps/web/src/features/calendar/components/composer/EventDateTimeRangeFields.tsx
index 0ff5132724..9fb5f91252 100644
--- a/apps/web/src/features/calendar/components/composer/EventDateTimeRangeFields.tsx
+++ b/apps/web/src/features/calendar/components/composer/EventDateTimeRangeFields.tsx
@@ -96,7 +96,7 @@ function EventDateTimeDropdown(props: EventDateTimeDropdownProps) {
aria-invalid={props.invalid || undefined}
aria-describedby={props.describedBy}
class={cn(
- 'group inline-flex h-7 w-fit max-w-48 min-w-0 items-center justify-between gap-1.5 rounded-lg border border-edge-muted bg-surface px-2 py-1 text-left text-xs leading-tight text-ink-muted hover:bg-hover hover:text-ink focus-visible:bg-active focus-visible:text-ink focus-visible:ring-accent/10 data-expanded:bg-hover data-expanded:text-ink',
+ 'group inline-flex h-7 w-fit max-w-48 min-w-0 items-center justify-between gap-1.5 rounded-lg border border-edge-muted bg-control px-2 py-1 text-left text-xs leading-tight text-ink-muted hover:bg-hover hover:text-ink focus-visible:bg-active focus-visible:text-ink focus-visible:ring-accent/10 data-expanded:bg-hover data-expanded:text-ink',
open() && 'bg-hover text-ink',
props.invalid &&
'border-failure text-failure hover:text-failure focus-visible:text-failure data-expanded:text-failure'
diff --git a/apps/web/src/features/calendar/components/composer/EventPropertyPills.tsx b/apps/web/src/features/calendar/components/composer/EventPropertyPills.tsx
index 0411af83f9..dd7544eeae 100644
--- a/apps/web/src/features/calendar/components/composer/EventPropertyPills.tsx
+++ b/apps/web/src/features/calendar/components/composer/EventPropertyPills.tsx
@@ -42,7 +42,7 @@ import {
} from './out-of-office';
const PROPERTY_TRIGGER_CLASS =
- 'group flex h-7 items-center justify-between gap-1.5 rounded-full border border-edge-muted bg-surface px-2 py-1 text-left text-xs leading-tight text-ink-muted hover:bg-hover hover:text-ink focus-visible:bg-active focus-visible:text-ink focus-visible:ring-accent/10 data-expanded:bg-hover data-expanded:text-ink';
+ 'group flex h-7 items-center justify-between gap-1.5 rounded-full border border-edge-muted bg-control px-2 py-1 text-left text-xs leading-tight text-ink-muted hover:bg-hover hover:text-ink focus-visible:bg-active focus-visible:text-ink focus-visible:ring-accent/10 data-expanded:bg-hover data-expanded:text-ink';
const PROPERTY_VALUE_CLASS =
'group-hover:text-ink group-focus-visible:text-ink group-data-expanded:text-ink';
@@ -353,7 +353,7 @@ export function EventComposerLocationPill(
placeholder="Add location..."
aria-label="Location"
disabled={props.disabled}
- class="h-8 w-full rounded-md border border-edge-muted bg-surface px-2 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
+ class="h-8 w-full rounded-md border border-edge-muted bg-control px-2 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
/>
</Popover.Content>
</Layer>
@@ -844,7 +844,7 @@ export function EventComposerDeclineMessagePill(
placeholder="Add decline message..."
aria-label="Decline message"
disabled={props.disabled}
- class="h-8 w-full rounded-md border border-edge-muted bg-surface px-2 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
+ class="h-8 w-full rounded-md border border-edge-muted bg-control px-2 text-sm text-ink outline-none placeholder:text-ink-placeholder focus:border-accent"
/>
</Popover.Content>
</Layer>
diff --git a/apps/web/src/features/channel/CreateChannelModal.tsx b/apps/web/src/features/channel/CreateChannelModal.tsx
index 5cd0614130..04cbfd98cd 100644
--- a/apps/web/src/features/channel/CreateChannelModal.tsx
+++ b/apps/web/src/features/channel/CreateChannelModal.tsx
@@ -151,7 +151,7 @@ export function CreateChannelModal() {
>
<Panel depth={2} class="rounded-xl *:max-h-[75vh]">
<Panel.Body>
- <form class="flex flex-col gap-4 p-4" onSubmit={handleSubmit}>
+ <form class="flex flex-col gap-4 p-5" onSubmit={handleSubmit}>
<div class="flex items-center gap-1">
<Show when={team()}>
<TabsInset
diff --git a/apps/web/src/features/command/Launcher.tsx b/apps/web/src/features/command/Launcher.tsx
index 617694c482..ce8eefba04 100644
--- a/apps/web/src/features/command/Launcher.tsx
+++ b/apps/web/src/features/command/Launcher.tsx
@@ -1012,7 +1012,7 @@ export const LauncherInner = (props: LauncherInnerProps) => {
ref={ref}
tabindex={-1}
>
- <CommandMenuShell.Header class="gap-2 px-4 my-1 border-b-0">
+ <CommandMenuShell.Header class="border-b-0">
<Show
when={searchMode()}
fallback={
diff --git a/apps/web/src/features/companies/CreateCompanyModal.tsx b/apps/web/src/features/companies/CreateCompanyModal.tsx
index c753d3ac9c..5c59c2d024 100644
--- a/apps/web/src/features/companies/CreateCompanyModal.tsx
+++ b/apps/web/src/features/companies/CreateCompanyModal.tsx
@@ -101,7 +101,7 @@ export function CreateCompanyModal() {
class="rounded-xl touch:h-auto *:max-h-[75vh]"
>
<Panel.Body>
- <form class="flex flex-col gap-4 p-4" onSubmit={handleSubmit}>
+ <form class="flex flex-col gap-4 p-5" onSubmit={handleSubmit}>
<Dialog.CloseButton
as={Button}
size="icon-sm"
diff --git a/apps/web/src/features/companies/CreateContactModal.tsx b/apps/web/src/features/companies/CreateContactModal.tsx
index 2b498f8421..deeaacc6bd 100644
--- a/apps/web/src/features/companies/CreateContactModal.tsx
+++ b/apps/web/src/features/companies/CreateContactModal.tsx
@@ -120,7 +120,7 @@ export function CreateContactModal() {
>
<Panel depth={2} class="rounded-xl *:max-h-[75vh]">
<Panel.Body>
- <form class="flex flex-col gap-4 p-4" onSubmit={handleSubmit}>
+ <form class="flex flex-col gap-4 p-5" onSubmit={handleSubmit}>
<div class="flex items-center gap-1">
<div class="flex-1" />
<Dialog.CloseButton
diff --git a/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx b/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx
index 1380a2a7bf..2cb135f0bd 100644
--- a/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx
+++ b/apps/web/src/features/property/component/modal/CreatePropertyModal.tsx
@@ -543,7 +543,7 @@ export const CreatePropertyModal: Component<CreatePropertyModalProps> = (
}}
>
<CommandMenuShell depth={2} class="text-sm" onKeyDown={handleKeyDown}>
- <CommandMenuShell.Header class="my-0 h-13 gap-3 border-b-0 px-4">
+ <CommandMenuShell.Header class="my-0 gap-3 border-b-0">
<span class="text-ink-muted">
<SlidersIcon class="size-3.5" />
</span>
diff --git a/apps/web/src/features/property/tags/TagEditorDialog.tsx b/apps/web/src/features/property/tags/TagEditorDialog.tsx
index cb3d7b944b..68804303d4 100644
--- a/apps/web/src/features/property/tags/TagEditorDialog.tsx
+++ b/apps/web/src/features/property/tags/TagEditorDialog.tsx
@@ -185,7 +185,7 @@ export function TagEditorDialog(props: {
onCloseAutoFocus={props.onCloseAutoFocus}
>
<CommandMenuShell depth={2} class="text-sm" onKeyDown={handleKeyDown}>
- <CommandMenuShell.Header class="my-0 h-13 gap-3 border-b-0 px-4">
+ <CommandMenuShell.Header class="my-0 gap-3 border-b-0">
<span class="text-ink-muted">
<TagIcon class="size-3.5" />
</span>
diff --git a/apps/web/src/features/theme/themes/macro-light.ts b/apps/web/src/features/theme/themes/macro-light.ts
index 8a4621d448..5e43e8860d 100644
--- a/apps/web/src/features/theme/themes/macro-light.ts
+++ b/apps/web/src/features/theme/themes/macro-light.ts
@@ -1,4 +1,3 @@
-import { isTouchDevice } from '@core/mobile/isTouchDevice';
import type { ThemeV3 } from '../types/themeTypes';
export const macroLightTheme = {
@@ -46,10 +45,7 @@ export const macroLightTheme = {
'link-hover': 'var(--color-accent)',
'link-visited': 'var(--color-accent)',
page: 'var(--color-surface-0)',
- // Use pure white on mobile without reversing the surface ramp.
- panel: isTouchDevice()
- ? 'var(--color-surface-4)'
- : 'var(--color-surface-1)',
+ panel: 'var(--color-surface-4)',
dialog: 'var(--color-surface-3)',
menu: 'var(--color-surface-3)',
tooltip: 'var(--color-surface-2)',
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index d15cf5b554..61b69f2cc7 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -430,12 +430,11 @@ body.tauri-ios {
}
/* Scope the panel semantic itself so nested bg-panel consumers share the same
- inactive split chrome instead of only tinting the outer panel element. */
+ inactive split chrome instead of only tinting the outer panel element.
+ Lower lightness directly: mixing with ink reverses the effect in dark themes. */
.split-panel-inactive {
- --color-panel: color-mix(
- in oklch,
- var(--theme-panel, var(--color-surface-1)) 80%,
- var(--color-page)
+ --color-panel: oklch(
+ from var(--theme-panel, var(--color-surface-1)) calc(l - 0.025) c h
);
}
diff --git a/docs/AGENT_GUIDE/navigation.md b/docs/AGENT_GUIDE/navigation.md
index aa1174f91b..679acd4697 100644
--- a/docs/AGENT_GUIDE/navigation.md
+++ b/docs/AGENT_GUIDE/navigation.md
@@ -69,7 +69,12 @@ fall back to legacy document routes. This uses touch detection, not the native-a
check: in DevTools, enable touch emulation rather than only narrowing the viewport.
Legacy document URLs upgrade to Drive only when desktop detail rendering is enabled.
-Splits: the app is a tiling window manager. Public variable-length routes use
+The outer navigation rail uses 20px icons in 40px buttons with 4px gaps.
+Command and create-menu headers have 20px horizontal and 12px vertical padding.
+
+Splits: the app is a tiling window manager. Active light-theme panes are white;
+inactive desktop panes are slightly darker than the active pane across themes,
+while retaining the theme hue. Public variable-length routes use
`~` as the boundary between panes
(`/app/drive/folder/<uuid>/~/mail`). Legacy fixed `type/id`
pane routes remain accepted. Known app-view URLs under `/app/component/` redirect
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index e57b5bf4ca..b66fad0c98 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -693,6 +693,9 @@ returning from an opened file.
## Calendar — `/app/calendar/<month-or-week-or-day>`
+Event composer dropdown triggers and date/time inputs use the theme control
+surface, so they blend with the dialog instead of using the darker page fill.
+
The path selects the Month, Week, or Day period, and choosing another period updates
that path. Calendar navigation defaults to Day on phones and Week on desktop; the most
recent choice is remembered locally for navigation that does not specify a period. An