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: make active split more emphasized (#4807)
Peter Chinman749a1a073d7c
diff --git a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx b/apps/web/src/components/app/split-layout/components/SplitPanel.tsxindex 6308aa7c2f..10f3a4bd0f 100644--- a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx+++ b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx@@ -148,7 +148,7 @@ export function SplitPanel(props: SplitPanelProps) {isSoloSettings());- const hasFocusedSplitBorder = createMemo(+ const showsSplitFocus = createMemo(() =>!isMobile() &&props.active &&@@ -224,15 +224,16 @@ export function SplitPanel(props: SplitPanelProps) {><PaneledgeColor={- hasFocusedSplitBorder()+ showsSplitFocus()? 'color-mix(in oklch, var(--color-edge) 80%, var(--color-ink))': undefined}class={cn(- 'rounded-xl mobile:rounded-none mobile:after:hidden mobile:border-0!',+ 'rounded-xl mobile:rounded-none mobile:after:hidden mobile:border-0! bg-panel',{- 'shadow-sm shadow-drop-shadow/50': !hasFocusedSplitBorder(),- 'shadow-lg shadow-drop-shadow/70': hasFocusedSplitBorder(),+ 'shadow-sm shadow-drop-shadow/50 bg-panel/80 dark-mode:bg-panel/30':+ !showsSplitFocus(),+ 'shadow-2xl shadow-drop-shadow': showsSplitFocus(),})}depth={isMobile() ? 0 : 1}diff --git a/apps/web/src/components/ui/components/Dropdown.tsx b/apps/web/src/components/ui/components/Dropdown.tsxindex f0250cd710..ce2e49690d 100644--- a/apps/web/src/components/ui/components/Dropdown.tsx+++ b/apps/web/src/components/ui/components/Dropdown.tsx@@ -188,12 +188,11 @@ function DropdownContent(props: DropdownContentProps) {><KobalteDropdownMenu.Contentclass={cn(- 'rounded-xl size-auto z-action-menu menu-open-animation shadow-menu',+ 'rounded-xl size-auto z-action-menu menu-open-animation shadow-menu bg-menu',local.class)}depth={local.depth ?? 2}as={Surface}- bgToken="menu"{...rest}ref={setContentRef}>@@ -230,12 +229,11 @@ function DropdownSubContent(props: DropdownSubContentProps) {><KobalteDropdownMenu.SubContentclass={cn(- 'rounded-xl size-auto z-action-menu menu-open-animation',+ 'rounded-xl size-auto z-action-menu menu-open-animation bg-menu',local.class)}depth={local.depth ?? 2}as={Surface}- bgToken="menu"{...rest}ref={setContentRef}>diff --git a/apps/web/src/components/ui/components/Surface.tsx b/apps/web/src/components/ui/components/Surface.tsxindex f0eff8cdf2..ff72502bdb 100644--- a/apps/web/src/components/ui/components/Surface.tsx+++ b/apps/web/src/components/ui/components/Surface.tsx@@ -1,4 +1,3 @@-import type { SemanticToken } from '@theme/types/themeTypes';import { type JSX, splitProps } from 'solid-js';import { cn } from '../utils/classname';import { Layer } from './Layer';@@ -10,8 +9,6 @@ export type SurfaceProps = Omit<JSX.HTMLAttributes<HTMLDivElement>, 'style'> & {highlightColor?: string;active?: boolean;solid?: boolean;- // Surface handles the bg color styling. It defaults to the value of our `surface` token (`var(--b0)`). You can use this if you want to instead feed it a different token (e.g. if your surface is an input, you can give it the 'input' token).- bgToken?: SemanticToken;hideBorder?: boolean;};@@ -25,17 +22,11 @@ export function Surface(props: SurfaceProps) {'depth','class','style',- 'bgToken','hideBorder',]);- const bgVariable = () =>- local.bgToken ? `--color-${local.bgToken}` : '--b0';-const style = (): JSX.CSSProperties => {- const base: JSX.CSSProperties = {- 'background-color': `var(${bgVariable()})`,- };+ const base: JSX.CSSProperties = {};if (!local.hideBorder) {base.border = `0.5px solid ${local.edgeColor ?? 'var(--b4)'}`;@@ -55,7 +46,7 @@ export function Surface(props: SurfaceProps) {<divstyle={style()}class={cn(- 'relative rounded-md overflow-clip min-h-0 size-full',+ 'relative rounded-md overflow-clip min-h-0 size-full bg-(--b0)',local.class)}{...rest}diff --git a/apps/web/src/features/block-canvas/component/Block.tsx b/apps/web/src/features/block-canvas/component/Block.tsxindex 6b007211b8..643956167c 100644--- a/apps/web/src/features/block-canvas/component/Block.tsx+++ b/apps/web/src/features/block-canvas/component/Block.tsx@@ -297,7 +297,7 @@ export default function BlockCanvas(props: BlockCanvasProps) {return (<DocumentBlockContainer><div- class="size-full select-none flex flex-col bg-surface"+ class="size-full select-none flex flex-col"// TODO: we need a more robust solution for preventing parent blocks from stealing clicks// This is a temporary fix for canvas in markdown but it doesn't necessarily generalize wellon:click={(e) => {diff --git a/apps/web/src/features/block-canvas/component/CanvasController.tsx b/apps/web/src/features/block-canvas/component/CanvasController.tsxindex 8f2f58a382..06a2da6ac4 100644--- a/apps/web/src/features/block-canvas/component/CanvasController.tsx+++ b/apps/web/src/features/block-canvas/component/CanvasController.tsx@@ -992,10 +992,7 @@ export function CanvasController(props: ParentProps) {use:droppable={!isDisabled()}use:observedSize={{ setSize: setDomRect }}// SCUFFED THEMING? The color-mix below is a little rough, not necessarily ideal- class={cn(- 'relative size-full overflow-hidden z-0 bg-[oklch(from_color-mix(in_oklch,var(--color-surface)_75%,var(--color-ink)_25%)_l_0_var(--surface-h))]',- cursor()- )}+ class={cn('relative size-full overflow-hidden z-0', cursor())}use:fileDrop={{disabled: isDisabled(),acceptedMimeTypes: acceptedMimeTypes,diff --git a/apps/web/src/features/block-chat/component/Chat.tsx b/apps/web/src/features/block-chat/component/Chat.tsxindex 8d5106f044..8af9d353c6 100644--- a/apps/web/src/features/block-chat/component/Chat.tsx+++ b/apps/web/src/features/block-chat/component/Chat.tsx@@ -318,7 +318,7 @@ function ChatInner(props: {return (<DragDropWrapper- class="size-full bg-surface overscroll-none overflow-hidden flex flex-col"+ class="size-full overscroll-none overflow-hidden flex flex-col"isEntityDraggingOver={isDraggingOver}><Show when={!isNestedBlock}>diff --git a/apps/web/src/features/block-code/component/Block.tsx b/apps/web/src/features/block-code/component/Block.tsxindex e80b8e8ef2..5469317077 100644--- a/apps/web/src/features/block-code/component/Block.tsx+++ b/apps/web/src/features/block-code/component/Block.tsx@@ -42,7 +42,7 @@ export default function BlockCode() {return (<DocumentBlockContainer usesCenterBar><Show when={!isNestedBlock} fallback={<CodeMarkdown />}>- <div class="size-full bg-surface select-none overscroll-none overflow-hidden flex flex-col items-end relative">+ <div class="size-full select-none overscroll-none overflow-hidden flex flex-col items-end relative"><ModalsProvider><SidePanel.Layout defaultOpen={false}><FileSidePanelSections />diff --git a/apps/web/src/features/block-email/component/Email.tsx b/apps/web/src/features/block-email/component/Email.tsxindex e08ab22d0e..7b1847f7a1 100644--- a/apps/web/src/features/block-email/component/Email.tsx+++ b/apps/web/src/features/block-email/component/Email.tsx@@ -696,7 +696,7 @@ function EmailContent(props: EmailViewProps) {>{/* Edge-to-edge on mobile: the message list carries its owninsets in-scroll and under-scrolls the floating chrome. */}- <div class="size-full bg-surface select-none overscroll-none overflow-hidden flex flex-col">+ <div class="size-full select-none overscroll-none overflow-hidden flex flex-col"><TopBarid={props.threadId()}title={props.title}diff --git a/apps/web/src/features/block-email/component/date-selector.tsx b/apps/web/src/features/block-email/component/date-selector.tsxindex 71be316040..7bee15376d 100644--- a/apps/web/src/features/block-email/component/date-selector.tsx+++ b/apps/web/src/features/block-email/component/date-selector.tsx@@ -304,10 +304,9 @@ export const DateSelector = (props: DateSelectorProps) => {<DateSelectorPortalWrapper disabled={props.disablePortal}><Combobox.Content- class="rounded-xl size-auto z-action-menu menu-open-animation shadow-menu w-full max-w-70 text-ink"+ class="rounded-xl size-auto z-action-menu menu-open-animation shadow-menu w-full max-w-70 text-ink bg-menu"as={Surface}depth={3}- bgToken="menu"on:keydown={handleKeyDown}><WithCustomDateModediff --git a/apps/web/src/features/block-image/component/Block.tsx b/apps/web/src/features/block-image/component/Block.tsxindex ab1841415b..9b573d009f 100644--- a/apps/web/src/features/block-image/component/Block.tsx+++ b/apps/web/src/features/block-image/component/Block.tsx@@ -60,7 +60,7 @@ export default function BlockImage() {return (<DocumentBlockContainer>- <div class="size-full bg-surface select-none overscroll-none overflow-hidden flex flex-col">+ <div class="size-full select-none overscroll-none overflow-hidden flex flex-col"><ModalsProvider><SidePanel.Layout defaultOpen={false}><FileSidePanelSections />diff --git a/apps/web/src/features/block-pdf/component/Block.tsx b/apps/web/src/features/block-pdf/component/Block.tsxindex 8491bd7ce8..87f29bfaf6 100644--- a/apps/web/src/features/block-pdf/component/Block.tsx+++ b/apps/web/src/features/block-pdf/component/Block.tsx@@ -186,7 +186,7 @@ export default function BlockPdf() {return (<DocumentBlockContainer><div- class="size-full bg-surface select-none overscroll-none overflow-hidden flex flex-col"+ class="size-full select-none overscroll-none overflow-hidden flex flex-col"onContextMenu={(e) => e.preventDefault()}data-tut="App">diff --git a/apps/web/src/features/block-unknown/component/Block.tsx b/apps/web/src/features/block-unknown/component/Block.tsxindex f08d5ce7fd..e59514980b 100644--- a/apps/web/src/features/block-unknown/component/Block.tsx+++ b/apps/web/src/features/block-unknown/component/Block.tsx@@ -18,7 +18,7 @@ import { TopBar } from './TopBar';export default function BlockUnknown() {return (<DocumentBlockContainer>- <div class="size-full bg-surface select-none overscroll-none overflow-hidden flex flex-col relative">+ <div class="size-full select-none overscroll-none overflow-hidden flex flex-col relative"><ModalsProvider><SidePanel.Layout><FileSidePanelSections />diff --git a/apps/web/src/features/block-video/component/Block.tsx b/apps/web/src/features/block-video/component/Block.tsxindex 59f7e5d642..1aa264d43a 100644--- a/apps/web/src/features/block-video/component/Block.tsx+++ b/apps/web/src/features/block-video/component/Block.tsx@@ -11,7 +11,7 @@ export default function BlockVideo() {useBlockEntityCommands();return (<DocumentBlockContainer>- <div class="size-full bg-surface select-none overscroll-none overflow-hidden flex flex-col relative">+ <div class="size-full select-none overscroll-none overflow-hidden flex flex-col relative"><ModalsProvider><SidePanel.Layout defaultOpen={false}><FileSidePanelSections />diff --git a/apps/web/src/features/channel/Bots/BotInviteSelect.tsx b/apps/web/src/features/channel/Bots/BotInviteSelect.tsxindex 9ae0f8b20c..019b333e55 100644--- a/apps/web/src/features/channel/Bots/BotInviteSelect.tsx+++ b/apps/web/src/features/channel/Bots/BotInviteSelect.tsx@@ -133,8 +133,7 @@ export function BotInviteSelect(props: {<Combobox.Contentas={Surface}depth={3}- bgToken="menu"- class="z-action-menu mt-1 w-[var(--kb-popper-anchor-width)] min-w-72 rounded-xl p-1.5 shadow-menu"+ class="z-action-menu mt-1 w-[var(--kb-popper-anchor-width)] min-w-72 rounded-xl p-1.5 shadow-menu bg-menu"><Showwhen={availableBots().length > 0}diff --git a/apps/web/src/features/channel/Bots/ChannelMultiSelect.tsx b/apps/web/src/features/channel/Bots/ChannelMultiSelect.tsxindex 96e72b18cd..33aedcea24 100644--- a/apps/web/src/features/channel/Bots/ChannelMultiSelect.tsx+++ b/apps/web/src/features/channel/Bots/ChannelMultiSelect.tsx@@ -103,8 +103,7 @@ export function ChannelMultiSelect(props: {<Combobox.Contentas={Surface}depth={3}- bgToken="menu"- class="z-action-menu mt-1 w-[var(--kb-popper-anchor-width)] min-w-64 rounded-xl p-1.5 shadow-menu"+ class="z-action-menu mt-1 w-[var(--kb-popper-anchor-width)] min-w-64 rounded-xl p-1.5 shadow-menu bg-menu"><Showwhen={options().length > 0}diff --git a/apps/web/src/features/channel/Input/ChannelInput.tsx b/apps/web/src/features/channel/Input/ChannelInput.tsxindex d57a356f4c..bb6bbed85b 100644--- a/apps/web/src/features/channel/Input/ChannelInput.tsx+++ b/apps/web/src/features/channel/Input/ChannelInput.tsx@@ -424,9 +424,9 @@ export function ChannelInput(props: ChannelInputProps) {}}class={cn('rounded-xl mobile:rounded-3xl mobile:island',- isCollapsed() && 'hidden'+ isCollapsed() && 'hidden',+ isMobile() && 'bg-chrome')}- bgToken={isMobile() ? 'chrome' : undefined}hideBorder={isMobile()}depth={isMobile() ? 3 : 2}soliddiff --git a/apps/web/src/features/next-soup/soup-view/soup-view-file-dropzone.tsx b/apps/web/src/features/next-soup/soup-view/soup-view-file-dropzone.tsxindex a3fb796721..0fc933436d 100644--- a/apps/web/src/features/next-soup/soup-view/soup-view-file-dropzone.tsx+++ b/apps/web/src/features/next-soup/soup-view/soup-view-file-dropzone.tsx@@ -14,7 +14,7 @@ export const SoupViewFileDropzone: FlowComponent = (props) => {return (<div- class="relative flex flex-col bg-panel size-full"+ class="relative flex flex-col size-full"use:fileFolderDrop={{onDrop: (fileEntries, folderEntries) => {handleFileFolderDrop(fileEntries, folderEntries, handleFileUpload);