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
chg(theme/ui): remove --lift token use layer context + offset prop (#6178)
Seamus7c92fd11160b
diff --git a/apps/web/src/components/ui/components/Layer.tsx b/apps/web/src/components/ui/components/Layer.tsxindex 05d3068b8e..98525960b5 100644--- a/apps/web/src/components/ui/components/Layer.tsx+++ b/apps/web/src/components/ui/components/Layer.tsx@@ -1,19 +1,30 @@-import type { JSX } from 'solid-js';+import { type Accessor, createContext, type JSX, useContext } from 'solid-js';++type LayerDepth = 0 | 1 | 2 | 3 | 4;type LayerProps = {children?: JSX.Element;- depth?: 0 | 1 | 2 | 3 | 4;+ depth?: LayerDepth;+ offset?: number;};-/** Marks a subtree with its surface depth. CSS owns all layer semantics. */+const LayerContext = createContext<Accessor<LayerDepth>>((): LayerDepth => 0);++function clampDepth(depth: number): LayerDepth {+ return Math.min(4, Math.max(0, depth)) as LayerDepth;+}++/** Marks a subtree with an absolute or parent-relative surface depth. */export function Layer(props: LayerProps) {+ const parentDepth = useContext(LayerContext);+ const depth = () =>+ clampDepth((props.depth ?? parentDepth()) + (props.offset ?? 0));+return (- <div- data-layer- data-depth={props.depth ?? 0}- style={{ display: 'contents' }}- >- {props.children}- </div>+ <LayerContext.Provider value={depth}>+ <div data-layer data-depth={depth()} style={{ display: 'contents' }}>+ {props.children}+ </div>+ </LayerContext.Provider>);}diff --git a/apps/web/src/features/channels-view/components/ChannelRailItems.tsx b/apps/web/src/features/channels-view/components/ChannelRailItems.tsxindex 8194215818..d77c9a06a9 100644--- a/apps/web/src/features/channels-view/components/ChannelRailItems.tsx+++ b/apps/web/src/features/channels-view/components/ChannelRailItems.tsx@@ -33,7 +33,7 @@ function ChannelAvatar(props: { channel: ChannelEntity; size?: 'sm' | 'md' }) {><spanclass={cn(- 'relative flex shrink-0 items-center justify-center overflow-hidden rounded-full border border-edge bg-lift [&_img]:size-full [&_svg]:shrink-0',+ 'relative flex shrink-0 items-center justify-center overflow-hidden rounded-full border border-edge bg-surface-2 [&_img]:size-full [&_svg]:shrink-0',sizeClass())}>@@ -48,12 +48,12 @@ function SlimChannelAvatar(props: { channel: ChannelEntity }) {<Showwhen={props.channel.channelType === 'direct_message'}fallback={- <span class="flex size-6 shrink-0 items-center justify-center rounded-full border border-edge bg-lift text-xxs font-semibold tracking-wide text-ink">+ <span class="flex size-6 shrink-0 items-center justify-center rounded-full border border-edge bg-surface-2 text-xxs font-semibold tracking-wide text-ink">{channelInitials(props.channel.name)}</span>}>- <span class="relative flex size-6 shrink-0 items-center justify-center overflow-hidden rounded-full border border-edge bg-lift [&_img]:size-full [&_svg]:size-3.5 [&_svg]:shrink-0">+ <span class="relative flex size-6 shrink-0 items-center justify-center overflow-hidden rounded-full border border-edge bg-surface-2 [&_img]:size-full [&_svg]:size-3.5 [&_svg]:shrink-0"><Entity.Icon entity={props.channel} suppressClick showTooltip={false} /></span></Show>diff --git a/apps/web/src/features/theme/components/ThemeTokenEditor.tsx b/apps/web/src/features/theme/components/ThemeTokenEditor.tsxindex 203970dc34..54c609d32c 100644--- a/apps/web/src/features/theme/components/ThemeTokenEditor.tsx+++ b/apps/web/src/features/theme/components/ThemeTokenEditor.tsx@@ -57,7 +57,6 @@ const tokenSections = [tokens: ['surface','inset',- 'lift','page','panel','dialog',diff --git a/apps/web/src/features/theme/signals/themeSignals.ts b/apps/web/src/features/theme/signals/themeSignals.tsindex 313d969b17..97c49ae2df 100644--- a/apps/web/src/features/theme/signals/themeSignals.ts+++ b/apps/web/src/features/theme/signals/themeSignals.ts@@ -11,13 +11,13 @@ import type {ThemeV1,ThemeV3,} from '../types/themeTypes';+import { normalizeThemeColorTokens } from '../utils/themeColorTokens';import {convertThemev0v1,convertThemev1v2,convertThemev2v3,} from '../utils/themeMigrations';import { isThemeV2, isThemeV3 } from '../utils/themeValidation';-import { normalizeThemeColorTokens } from '../utils/themeVNext';export const [isThemeSaved, setIsThemeSaved] = createSignal<boolean>(true);diff --git a/apps/web/src/features/theme/themes/defineLegacyDefaultTheme.ts b/apps/web/src/features/theme/themes/defineLegacyDefaultTheme.tsindex 2833dc2242..fa71bb1154 100644--- a/apps/web/src/features/theme/themes/defineLegacyDefaultTheme.ts+++ b/apps/web/src/features/theme/themes/defineLegacyDefaultTheme.ts@@ -2,7 +2,7 @@ import type { ThemeV2, ThemeV2Tokens, ThemeV3 } from '../types/themeTypes';import {getThemeColorMode,legacyThemeToVNextTokens,-} from '../utils/themeVNext';+} from '../utils/themeColorTokens';type LegacyDefaultThemeDefinition<TId extends string> = {id: TId;diff --git a/apps/web/src/features/theme/themes/flora.ts b/apps/web/src/features/theme/themes/flora.tsindex 53d63d4428..c2074b2690 100644--- a/apps/web/src/features/theme/themes/flora.ts+++ b/apps/web/src/features/theme/themes/flora.ts@@ -39,7 +39,6 @@ export const floraTheme: ThemeV3 = {pink: 'oklch(86.77% 0.2673 354.3)',surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: 'var(--color-content-0)','ink-muted': 'var(--color-content-1)','ink-subtle': 'var(--color-content-2)',@@ -55,8 +54,8 @@ export const floraTheme: ThemeV3 = {tooltip: 'var(--color-surface-2)',toast: 'var(--color-surface-2)',input: 'oklch(82.4% 0.1172 0 / 0.07)',- 'input-focus': 'var(--color-lift)',- message: 'var(--color-lift)',+ 'input-focus': 'var(--color-surface-1)',+ 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)',selected: 'color-mix(in oklch, var(--color-accent) 8%, transparent)',diff --git a/apps/web/src/features/theme/themes/lapis.ts b/apps/web/src/features/theme/themes/lapis.tsindex e399daca2b..a394e8582b 100644--- a/apps/web/src/features/theme/themes/lapis.ts+++ b/apps/web/src/features/theme/themes/lapis.ts@@ -37,7 +37,6 @@ export const lapisTheme: ThemeV3 = {pink: 'oklch(0.55 0.17 354.308deg)',surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: 'var(--color-content-0)','ink-muted': 'var(--color-content-1)','ink-subtle': 'var(--color-content-2)',@@ -53,8 +52,8 @@ export const lapisTheme: ThemeV3 = {tooltip: 'var(--color-surface-2)',toast: 'var(--color-surface-2)',input: 'transparent',- 'input-focus': 'var(--color-lift)',- message: 'var(--color-lift)',+ 'input-focus': 'var(--color-surface-1)',+ message: 'var(--color-surface-1)',hover:'color-mix(in oklch, color-mix(in oklch, var(--color-content-0) 50%, var(--color-accent)) 3%, transparent)',active:diff --git a/apps/web/src/features/theme/themes/macro-gruvbox.ts b/apps/web/src/features/theme/themes/macro-gruvbox.tsindex 3c192a57ef..eb34b0b945 100644--- a/apps/web/src/features/theme/themes/macro-gruvbox.ts+++ b/apps/web/src/features/theme/themes/macro-gruvbox.ts@@ -34,7 +34,6 @@ export const macroGruvboxTheme = {pink: '#d3869b',surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: 'var(--color-content-0)','ink-muted': 'var(--color-content-1)','ink-subtle': 'var(--color-content-2)',@@ -50,8 +49,8 @@ export const macroGruvboxTheme = {tooltip: 'var(--color-surface-2)',toast: 'var(--color-surface-2)',input: 'transparent',- 'input-focus': 'var(--color-lift)',- message: 'var(--color-lift)',+ 'input-focus': 'var(--color-surface-1)',+ 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)',selected: 'color-mix(in oklch, var(--color-accent) 8%, transparent)',diff --git a/apps/web/src/features/theme/themes/macro-light.ts b/apps/web/src/features/theme/themes/macro-light.tsindex ccc8a8a4e1..d917e48124 100644--- a/apps/web/src/features/theme/themes/macro-light.ts+++ b/apps/web/src/features/theme/themes/macro-light.ts@@ -36,7 +36,6 @@ export const macroLightTheme = {pink: 'oklch(65.6% 0.241 354.308)',surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: 'var(--color-content-0)','ink-muted': 'var(--color-content-1)','ink-subtle': 'var(--color-content-2)',@@ -52,8 +51,8 @@ export const macroLightTheme = {tooltip: 'var(--color-surface-2)',toast: 'var(--color-surface-2)',input: 'transparent',- 'input-focus': 'var(--color-lift)',- message: 'var(--color-lift)',+ 'input-focus': 'var(--color-surface-1)',+ 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)',selected: 'color-mix(in oklch, var(--color-accent) 8%, transparent)',diff --git a/apps/web/src/features/theme/themes/paper.ts b/apps/web/src/features/theme/themes/paper.tsindex 8e9768bcee..73f058a7cb 100644--- a/apps/web/src/features/theme/themes/paper.ts+++ b/apps/web/src/features/theme/themes/paper.ts@@ -33,7 +33,6 @@ export const paperTheme: ThemeV3 = {pink: 'oklch(64.14% 0.1929 354.3)',surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: 'var(--color-content-0)','ink-muted': 'var(--color-content-1)','ink-subtle': 'var(--color-content-2)',@@ -49,8 +48,8 @@ export const paperTheme: ThemeV3 = {tooltip: 'var(--color-surface-2)',toast: 'var(--color-surface-2)',input: 'transparent',- 'input-focus': 'var(--color-lift)',- message: 'var(--color-lift)',+ 'input-focus': 'var(--color-surface-1)',+ 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)',selected: 'color-mix(in oklch, var(--color-accent) 8%, transparent)',diff --git a/apps/web/src/features/theme/themes/rain.ts b/apps/web/src/features/theme/themes/rain.tsindex f01cf3a3b2..956114ec33 100644--- a/apps/web/src/features/theme/themes/rain.ts+++ b/apps/web/src/features/theme/themes/rain.ts@@ -38,7 +38,6 @@ export const rainTheme: ThemeV3 = {pink: 'oklch(0.72 0.13 354.308deg)',surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: 'var(--color-content-0)','ink-muted': 'var(--color-content-1)','ink-subtle': 'var(--color-content-2)',@@ -54,8 +53,8 @@ export const rainTheme: ThemeV3 = {tooltip: 'var(--color-surface-2)',toast: 'var(--color-surface-2)',input: 'transparent',- 'input-focus': 'var(--color-lift)',- message: 'var(--color-lift)',+ 'input-focus': 'var(--color-surface-1)',+ 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)',selected: 'color-mix(in oklch, var(--color-accent) 8%, transparent)',diff --git a/apps/web/src/features/theme/themes/satsuma.ts b/apps/web/src/features/theme/themes/satsuma.tsindex fb03a2a272..bac2261eed 100644--- a/apps/web/src/features/theme/themes/satsuma.ts+++ b/apps/web/src/features/theme/themes/satsuma.ts@@ -39,7 +39,6 @@ export const satsumaTheme = {pink: 'oklch(63.59% 0.1549 341.8)',surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: 'var(--color-content-0)','ink-muted': 'var(--color-content-1)','ink-subtle': 'var(--color-content-2)',@@ -55,8 +54,8 @@ export const satsumaTheme = {tooltip: 'var(--color-surface-2)',toast: 'var(--color-surface-2)',input: 'transparent',- 'input-focus': 'var(--color-lift)',- message: 'var(--color-lift)',+ 'input-focus': 'var(--color-surface-1)',+ 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)',selected: 'color-mix(in oklch, var(--color-accent) 8%, transparent)',diff --git a/apps/web/src/features/theme/types/themeTypes.ts b/apps/web/src/features/theme/types/themeTypes.tsindex 0463be92a4..d4b1453bf9 100644--- a/apps/web/src/features/theme/types/themeTypes.ts+++ b/apps/web/src/features/theme/types/themeTypes.ts@@ -91,7 +91,6 @@ export type InputColorToken = (typeof inputColorTokens)[number];export const semanticTokens = ['surface','inset',- 'lift','ink','ink-muted','ink-subtle',diff --git a/apps/web/src/features/theme/utils/__tests__/themeVNext.test.ts b/apps/web/src/features/theme/utils/__tests__/themeColorTokens.test.tssimilarity index 97%rename from apps/web/src/features/theme/utils/__tests__/themeVNext.test.tsrename to apps/web/src/features/theme/utils/__tests__/themeColorTokens.test.tsindex 761ef931ee..d5a84baf8c 100644--- a/apps/web/src/features/theme/utils/__tests__/themeVNext.test.ts+++ b/apps/web/src/features/theme/utils/__tests__/themeColorTokens.test.ts@@ -4,12 +4,12 @@ import {parseThemeAssignment,serializeThemeAssignment,} from '../themeAssignments';-import { convertThemev2v3 } from '../themeMigrations';import {getDefaultSemanticColorTokens,legacyThemeToVNextTokens,normalizeThemeColorTokens,-} from '../themeVNext';+} from '../themeColorTokens';+import { convertThemev2v3 } from '../themeMigrations';const legacyTokens: ThemeV2Tokens = {a0: { l: 0.7, c: 0.2, h: 40 },@@ -36,6 +36,7 @@ describe('legacyThemeToVNextTokens', () => {'surface-4': '#fff','surface-5': '#eee','edge-subtle': '#ddd',+ lift: '#ccc',extension: '#000',},'dark'@@ -52,6 +53,7 @@ describe('legacyThemeToVNextTokens', () => {});expect(result['surface-5']).toBeUndefined();expect(result['edge-subtle']).toBeUndefined();+ expect(result.lift).toBeUndefined();});it('centralizes a default for every semantic token', () => {@@ -61,7 +63,7 @@ describe('legacyThemeToVNextTokens', () => {surface: 'var(--layer-surface)',panel: 'var(--color-surface-1)',warning: 'var(--color-amber)',- message: 'var(--color-lift)',+ message: 'var(--color-surface-1)',});expect(getDefaultSemanticColorTokens('light').warning).toBe('var(--color-yellow)'@@ -79,7 +81,7 @@ describe('legacyThemeToVNextTokens', () => {expect(result.chrome).toBe('var(--color-surface-4)');expect(result.surface).toBe('var(--layer-surface)');expect(result.inset).toBe('var(--layer-inset)');- expect(result.lift).toBe('var(--layer-lift)');+ expect(result.lift).toBeUndefined();expect(result.panel).toBe('var(--color-surface-1)');expect(result.tooltip).toBe('var(--color-surface-2)');expect(result.toast).toBe('var(--color-surface-2)');diff --git a/apps/web/src/features/theme/utils/themeAssignments.ts b/apps/web/src/features/theme/utils/themeAssignments.tsindex d7a17e2f56..c9ff84c29d 100644--- a/apps/web/src/features/theme/utils/themeAssignments.ts+++ b/apps/web/src/features/theme/utils/themeAssignments.ts@@ -1,4 +1,4 @@-import { alphaToken, mixTokens, tokenReference } from './themeVNext';+import { alphaToken, mixTokens, tokenReference } from './themeColorTokens';export type ThemeAssignment =| { kind: 'custom'; value: string }diff --git a/apps/web/src/features/theme/utils/themeVNext.ts b/apps/web/src/features/theme/utils/themeColorTokens.tssimilarity index 98%rename from apps/web/src/features/theme/utils/themeVNext.tsrename to apps/web/src/features/theme/utils/themeColorTokens.tsindex c72fc67bb6..405755044a 100644--- a/apps/web/src/features/theme/utils/themeVNext.ts+++ b/apps/web/src/features/theme/utils/themeColorTokens.ts@@ -84,7 +84,6 @@ export function getDefaultSemanticColorTokens(return {surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',ink: tokenReference('content-0'),'ink-muted': tokenReference('content-1'),'ink-subtle': tokenReference('content-2'),@@ -100,8 +99,8 @@ export function getDefaultSemanticColorTokens(tooltip: tokenReference('surface-2'),toast: tokenReference('surface-2'),input: 'transparent',- 'input-focus': tokenReference('lift'),- message: tokenReference('lift'),+ 'input-focus': tokenReference('surface-1'),+ message: tokenReference('surface-1'),hover: alphaToken('content-0', 0.03),active: alphaToken('content-0', 0.06),selected: alphaToken('accent', 0.08),@@ -124,6 +123,7 @@ export function normalizeThemeColorTokens(};delete next['surface-5'];delete next['edge-subtle'];+ delete next.lift;return next;}diff --git a/apps/web/src/features/theme/utils/themeMigrations.ts b/apps/web/src/features/theme/utils/themeMigrations.tsindex d29228170a..958be7234e 100644--- a/apps/web/src/features/theme/utils/themeMigrations.ts+++ b/apps/web/src/features/theme/utils/themeMigrations.ts@@ -1,5 +1,5 @@import type { ThemeV0, ThemeV1, ThemeV2, ThemeV3 } from '../types/themeTypes';-import { getThemeColorMode, getThemeColorTokens } from './themeVNext';+import { getThemeColorMode, getThemeColorTokens } from './themeColorTokens';export function convertThemev0v1(theme: ThemeV0): ThemeV1 {return {diff --git a/apps/web/src/features/theme/utils/themeUtils.ts b/apps/web/src/features/theme/utils/themeUtils.tsindex 4fdba25314..ce6e13c866 100644--- a/apps/web/src/features/theme/utils/themeUtils.ts+++ b/apps/web/src/features/theme/utils/themeUtils.ts@@ -28,9 +28,9 @@ import type {ThemeV3,} from '../types/themeTypes';import { getOklch } from './colorUtil';+import { normalizeThemeColorTokens } from './themeColorTokens';import { convertThemev2v3 } from './themeMigrations';import { isThemeV2, isThemeV3 } from './themeValidation';-import { normalizeThemeColorTokens } from './themeVNext';export function exportTheme(themeId?: string) {const id = themeId ?? currentThemeId();@@ -135,7 +135,6 @@ function syncLegacyCompatibilityTokens(): void {const LAYER_RELATIVE_TOKENS = {surface: 'var(--layer-surface)',inset: 'var(--layer-inset)',- lift: 'var(--layer-lift)',} as const;function renderThemeColorToken(token: string, value: string): void {diff --git a/apps/web/src/index.css b/apps/web/src/index.cssindex 5f957594d9..88c214d680 100644--- a/apps/web/src/index.css+++ b/apps/web/src/index.css@@ -129,7 +129,6 @@/* Depth-0 defaults for content rendered outside a Layer marker. */--layer-surface: var(--color-surface-0);--layer-inset: var(--color-surface-0);- --layer-lift: var(--color-surface-1);::selection {background-color: oklch(from var(--color-accent) l c h / 0.5);@@ -155,38 +154,31 @@ body.tauri-ios {[data-layer] {--color-surface: var(--theme-surface, var(--layer-surface));--color-inset: var(--theme-inset, var(--layer-inset));- --color-lift: var(--theme-lift, var(--layer-lift));- --color-message: var(--color-lift);}[data-layer][data-depth='0'] {--layer-surface: var(--color-surface-0);--layer-inset: var(--color-surface-0);- --layer-lift: var(--color-surface-1);}[data-layer][data-depth='1'] {--layer-surface: var(--color-surface-1);--layer-inset: var(--color-surface-0);- --layer-lift: var(--color-surface-2);}[data-layer][data-depth='2'] {--layer-surface: var(--color-surface-2);--layer-inset: var(--color-surface-1);- --layer-lift: var(--color-surface-3);}[data-layer][data-depth='3'] {--layer-surface: var(--color-surface-3);--layer-inset: var(--color-surface-2);- --layer-lift: var(--color-surface-4);}[data-layer][data-depth='4'] {--layer-surface: var(--color-surface-4);--layer-inset: var(--color-surface-3);- --layer-lift: var(--color-surface-4);}/* Scope the panel semantic itself so nested bg-panel consumers share the same@@ -236,11 +228,10 @@ body.tauri-ios {--color-purple: oklch(62.7% 0.265 303.9);--color-pink: oklch(65.6% 0.241 354.308);- /* Component-facing semantic assignments. A theme may override the three+ /* Component-facing semantic assignments. A theme may override the twolayer-relative colors; otherwise they resolve through the nearest Layer. */--color-surface: var(--theme-surface, var(--layer-surface));--color-inset: var(--theme-inset, var(--layer-inset));- --color-lift: var(--theme-lift, var(--layer-lift));--color-ink: var(--color-content-0);--color-ink-muted: var(--color-content-1);--color-ink-subtle: var(--color-content-2);@@ -256,8 +247,8 @@ body.tauri-ios {--color-tooltip: var(--color-surface-2);--color-toast: var(--color-surface-2);--color-input: transparent;- --color-input-focus: var(--color-lift);- --color-message: var(--color-lift);+ --color-input-focus: var(--color-surface-1);+ --color-message: var(--color-surface-1);--color-code-buffer: color-mix(in srgb, var(--color-surface-0) 60%, var(--color-surface-1));--color-hover: color-mix(in oklch, var(--color-content-0) 3%, transparent);--color-active: color-mix(in oklch, var(--color-content-0) 6%, transparent);diff --git a/apps/web/src/lib/core/component/Toast/Toast.tsx b/apps/web/src/lib/core/component/Toast/Toast.tsxindex fc4989ab06..0248d8a272 100644--- a/apps/web/src/lib/core/component/Toast/Toast.tsx+++ b/apps/web/src/lib/core/component/Toast/Toast.tsx@@ -275,8 +275,8 @@ function ActionButtons(props: { actions: ToastAction[]; mobile?: boolean }) {size={props.mobile ? 'sm' : 'md'}onClick={action.onClick}variant="outline"- class="px-2 py-1 bg-lift"- depth={3}+ class="px-2 py-1 bg-surface"+ depth={4}><Show when={action.icon}>{(icon) => (diff --git a/apps/web/src/lib/core/component/VerticalScrollIndicators.tsx b/apps/web/src/lib/core/component/VerticalScrollIndicators.tsxindex 0bf921b503..8e89cf2eae 100644--- a/apps/web/src/lib/core/component/VerticalScrollIndicators.tsx+++ b/apps/web/src/lib/core/component/VerticalScrollIndicators.tsx@@ -8,7 +8,6 @@ const GRADIENT_COLOR = {panel: 'var(--color-panel)',page: 'var(--color-page)',inset: 'var(--color-inset)',- lift: 'var(--color-lift)',dialog: 'var(--color-dialog)',menu: 'var(--color-menu)',} as const;diff --git a/apps/web/src/lib/core/internal/DataDebug.tsx b/apps/web/src/lib/core/internal/DataDebug.tsxindex e7f1ac682f..2512123630 100644--- a/apps/web/src/lib/core/internal/DataDebug.tsx+++ b/apps/web/src/lib/core/internal/DataDebug.tsx@@ -3,7 +3,7 @@ import { useContacts } from '@core/user';import Refresh from '@phosphor-icons/core/regular/arrow-clockwise.svg?component-solid';import Copy from '@phosphor-icons/core/regular/copy.svg?component-solid';import { useHistoryQuery } from '@queries/history/history';-import { Button } from '@ui';+import { Button, Layer } from '@ui';import { type Component, createSignal, For, type JSX, Show } from 'solid-js';interface SignalDebugCardProps {@@ -52,13 +52,15 @@ function SignalDebugCard(props: SignalDebugCardProps) {<details><summary class="text-accent text-sm">Raw JSON</summary><div class="mt-2 relative">- <button- onClick={copyToClipboard}- class="absolute top-2 right-2 p-1 rounded bg-panel hover:bg-lift text-ink-muted hover:text-ink transition-colors z-10"- title="Copy to clipboard"- >- <Copy class="size-4" />- </button>+ <Layer offset={1}>+ <button+ onClick={copyToClipboard}+ class="absolute top-2 right-2 p-1 rounded bg-panel hover:bg-surface text-ink-muted hover:text-ink transition-colors z-10"+ title="Copy to clipboard"+ >+ <Copy class="size-4" />+ </button>+ </Layer><pre class="text-xs bg-message p-3 rounded overflow-auto max-h-80 border border-edge">{formatJson(props.data)}</pre>