Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(settings): use the split panel background for settings pages (#7678)
teo0884423e7e1e
diff --git a/apps/web/src/features/channel/Bots/BotCreatePage.tsx b/apps/web/src/features/channel/Bots/BotCreatePage.tsxindex 0330f127b6..fae96487a6 100644--- a/apps/web/src/features/channel/Bots/BotCreatePage.tsx+++ b/apps/web/src/features/channel/Bots/BotCreatePage.tsx@@ -172,7 +172,7 @@ export function BotCreate(props: { channelId?: string; onBack: () => void }) {};return (- <div class="size-full overflow-y-auto bg-[color-mix(in_srgb,var(--color-panel)_99%,var(--color-ink))] text-ink">+ <div class="size-full overflow-y-auto bg-panel text-ink">{/* Mobile chrome insets live inside the scroll content so the page isfull-frame, matching SettingsPage (this create view only rendersinside the settings panel). */}diff --git a/apps/web/src/features/channel/Bots/BotDetailPage.tsx b/apps/web/src/features/channel/Bots/BotDetailPage.tsxindex 3284559bce..8a10ea257a 100644--- a/apps/web/src/features/channel/Bots/BotDetailPage.tsx+++ b/apps/web/src/features/channel/Bots/BotDetailPage.tsx@@ -189,7 +189,7 @@ export function BotDetail(props: { botId: string; onBack: () => void }) {return (<>- <div class="size-full overflow-y-auto bg-[color-mix(in_srgb,var(--color-panel)_99%,var(--color-ink))] text-ink">+ <div class="size-full overflow-y-auto bg-panel text-ink">{/* Mobile chrome insets live inside the scroll content so the page isfull-frame, matching SettingsPage (this detail view only rendersinside the settings panel). */}diff --git a/apps/web/src/features/settings/components/settings-sidebar.tsx b/apps/web/src/features/settings/components/settings-sidebar.tsxindex 8154d978de..4c22da5c1c 100644--- a/apps/web/src/features/settings/components/settings-sidebar.tsx+++ b/apps/web/src/features/settings/components/settings-sidebar.tsx@@ -26,11 +26,7 @@ export function SettingsSidebar(props: {}) {let root: HTMLDivElement | undefined;return (- <ViewSidebar.Root- ref={root}- aria-label="Settings navigation"- class="bg-[color-mix(in_srgb,var(--color-panel)_99%,var(--color-ink))]"- >+ <ViewSidebar.Root ref={root} aria-label="Settings navigation"><ViewSidebar.Header><div class="flex min-w-0 items-center gap-1"><ViewSidebar.CloseButton class="shrink-0" />diff --git a/apps/web/src/features/settings/primitives.tsx b/apps/web/src/features/settings/primitives.tsxindex 1dd645878a..3aed5535e5 100644--- a/apps/web/src/features/settings/primitives.tsx+++ b/apps/web/src/features/settings/primitives.tsx@@ -48,7 +48,7 @@ export function SettingsPage(props: {<divdata-settings-pagedata-drawer-scroll-body={inSheet ? true : undefined}- class="@container/settings-page h-full min-h-0 overflow-y-auto [overflow-anchor:none] select-children bg-[color-mix(in_srgb,var(--color-panel)_99%,var(--color-ink))] [&_[data-variant=cta]]:bg-ink [&_[data-variant=cta]]:text-panel [&_[data-variant=cta]]:focus-visible:ring-panel/70 [&_:has(>input[type=checkbox])]:[--color-accent:var(--color-ink)] [&_input[type=checkbox]]:accent-ink"+ class="@container/settings-page h-full min-h-0 overflow-y-auto [overflow-anchor:none] select-children bg-panel [&_[data-variant=cta]]:bg-ink [&_[data-variant=cta]]:text-panel [&_[data-variant=cta]]:focus-visible:ring-panel/70 [&_:has(>input[type=checkbox])]:[--color-accent:var(--color-ink)] [&_input[type=checkbox]]:accent-ink">{/* On mobile/tablet the page is full-frame: the chrome insets live inside thescroll content (plus the usual breathing room) so pages scroll under