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.

chore(ui): clean up, remove palette rotations and malformed tw, another round of cursor-pointer (#6025)

Seamuse32aa7e7a5b1
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 ae2fc7454c..c6786ba5b0 100644
--- a/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitDrawer.tsx
@@ -132,7 +132,7 @@ export function SplitDrawer(
<div class={getGradientMaskClasses()} />
<div class="flex items-center justify-start gap-2 shrink-0 px-2">
<Show when={props.title}>
- <h3 class="text-md font-medium text-content-secondary shrink truncate my-3">
+ <h3 class="text-base font-medium text-ink-muted shrink truncate my-3">
{props.title}
</h3>
</Show>
diff --git a/apps/web/src/components/app/split-layout/components/SplitLabel.tsx b/apps/web/src/components/app/split-layout/components/SplitLabel.tsx
index 922fecf52f..d73c452837 100644
--- a/apps/web/src/components/app/split-layout/components/SplitLabel.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitLabel.tsx
@@ -67,10 +67,7 @@ export function StaticSplitLabel(props: {
};
return (
<SplitLabelContextMenu>
- <HeaderIsland
- class={cn('shrink', panel.titleFileMenuTrigger() && 'cursor-pointer')}
- onClick={openTitleFileMenu}
- >
+ <HeaderIsland class="shrink" onClick={openTitleFileMenu}>
<div
class={cn(
'z-split-header-content relative flex items-center gap-2 max-w-full h-full shrink',
@@ -243,10 +240,7 @@ export function BlockItemSplitLabel(props: {
return (
<SplitLabelContextMenu>
- <HeaderIsland
- class={cn('shrink', panel.titleFileMenuTrigger() && 'cursor-pointer')}
- onClick={openTitleFileMenu}
- >
+ <HeaderIsland class="shrink" onClick={openTitleFileMenu}>
<div class="ph-no-capture z-split-header-content relative flex items-center gap-2 min-w-0 max-w-full h-full shrink">
<EntityIcon class="shrink-0" targetType={targetType()} size="xs" />
<Show when={props.badges}>{props.badges}</Show>
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 57d8a7187c..24d82109d0 100644
--- a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
@@ -407,7 +407,7 @@ export function SplitPanel(props: SplitPanelProps) {
{(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">
- <h3 class="min-w-0 flex-1 truncate text-sm font-medium text-content-secondary">
+ <h3 class="min-w-0 flex-1 truncate text-sm font-medium text-ink-muted">
{panel().title}
</h3>
<Button
diff --git a/apps/web/src/components/ui/components/Hotkey.tsx b/apps/web/src/components/ui/components/Hotkey.tsx
index 4bfbec5bea..aa4b8c222c 100644
--- a/apps/web/src/components/ui/components/Hotkey.tsx
+++ b/apps/web/src/components/ui/components/Hotkey.tsx
@@ -56,7 +56,7 @@ const hotkeyStyles: Record<Theme, { label: string; hotkey: string }> = {
},
reverse: {
hotkey: 'bg-ink border border-surface text-surface',
- label: 'bg-surface border border dialog text-ink',
+ label: 'bg-surface border border-dialog text-ink',
},
base: {
diff --git a/apps/web/src/components/ui/components/Panel.tsx b/apps/web/src/components/ui/components/Panel.tsx
index 03ce2c547f..154d2fb135 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 h-full min-h-10 px-2 overflow-x-hidden border-b border-edge-muted overflow-hidden',
+ 'flex flex-none items-center h-full min-h-10 px-2 border-b border-edge-muted 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 overflow-x-hidden border-b border-edge-muted overflow-hidden',
+ 'flex flex-none items-center p-2 border-b border-edge-muted overflow-hidden',
props.class
)}
style={{ 'grid-area': 'toolbar' }}
@@ -99,7 +99,7 @@ function PanelFooter(props: SlotProps) {
<Show when={resolved()}>
<div
class={cn(
- 'flex flex-none items-center min-h-10 px-2 overflow-x-hidden border-t border-edge-muted overflow-hidden',
+ 'flex flex-none items-center min-h-10 px-2 border-t border-edge-muted overflow-hidden',
props.class
)}
style={{ 'grid-area': 'footer' }}
diff --git a/apps/web/src/components/ui/components/SendButton.tsx b/apps/web/src/components/ui/components/SendButton.tsx
index 689c21f806..1f5ae48b35 100644
--- a/apps/web/src/components/ui/components/SendButton.tsx
+++ b/apps/web/src/components/ui/components/SendButton.tsx
@@ -32,7 +32,7 @@ export function SendButton(props: SendButtonProps) {
tooltip={local.tooltip ?? 'Send'}
class={cn(
'rounded-[11px] size-7.5 [&_svg]:stroke-[4px]',
- 'transition-transform ease duration-150',
+ 'transition-transform ease-in-out duration-150',
'data-disabled:opacity-100 data-disabled:text-ink-extra-muted! data-disabled:bg-ink-muted/5',
'active:not-disabled:scale-95',
local.hidden && 'opacity-0!',
diff --git a/apps/web/src/components/ui/index.ts b/apps/web/src/components/ui/index.ts
index 3a92c33fa9..aeea05caae 100644
--- a/apps/web/src/components/ui/index.ts
+++ b/apps/web/src/components/ui/index.ts
@@ -119,7 +119,6 @@ export { TabbedControl } from './components/TabbedControl';
export type { ToggleSwitchProps } from './components/ToggleSwitch';
export { ToggleSwitch } from './components/ToggleSwitch';
export { Tooltip } from './components/Tooltip';
-
export { cn } from './utils/classname';
export type { CtrlJKMenuNavigationOptions } from './utils/menuKeyboardNavigation';
export {
@@ -129,5 +128,12 @@ export {
highlightFirstMenuItemOnOpen,
wrapIndex,
} from './utils/menuKeyboardNavigation';
+export {
+ type GetHashedPaletteColorOptions,
+ getHashedPaletteColor,
+ type NonEmptyPalette,
+ PALETTE_COLORS,
+ type PaletteColor,
+} from './utils/palette';
export type { VariantProps } from './utils/variants';
export { createVariants } from './utils/variants';
diff --git a/apps/web/src/components/ui/utils/palette.test.ts b/apps/web/src/components/ui/utils/palette.test.ts
new file mode 100644
index 0000000000..9e3286b15d
--- /dev/null
+++ b/apps/web/src/components/ui/utils/palette.test.ts
@@ -0,0 +1,21 @@
+import { describe, expect, it } from 'vitest';
+import { getHashedPaletteColor, PALETTE_COLORS } from './palette';
+
+describe('getHashedPaletteColor', () => {
+ it('keeps the default palette mapping stable', () => {
+ expect(getHashedPaletteColor('document-author-id')).toBe('purple');
+ expect(getHashedPaletteColor('another-author-id')).toBe('teal');
+ });
+
+ it('supports a typed palette for a specific use case', () => {
+ const palette = ['text-success', 'text-failure'] as const;
+
+ expect(getHashedPaletteColor('custom-stage', { palette })).toBe(
+ 'text-failure'
+ );
+ });
+
+ it('always returns an authored palette color by default', () => {
+ expect(PALETTE_COLORS).toContain(getHashedPaletteColor(''));
+ });
+});
diff --git a/apps/web/src/components/ui/utils/palette.ts b/apps/web/src/components/ui/utils/palette.ts
new file mode 100644
index 0000000000..a8e0412b2f
--- /dev/null
+++ b/apps/web/src/components/ui/utils/palette.ts
@@ -0,0 +1,52 @@
+/** Macro's authored color palette, in stable hashing order. */
+export const PALETTE_COLORS = [
+ 'red',
+ 'orange',
+ 'amber',
+ 'yellow',
+ 'lime',
+ 'green',
+ 'teal',
+ 'cyan',
+ 'blue',
+ 'violet',
+ 'purple',
+ 'pink',
+] as const;
+
+/** A color from Macro's authored palette. */
+export type PaletteColor = (typeof PALETTE_COLORS)[number];
+
+/** A palette that always contains at least one color. */
+export type NonEmptyPalette<Color extends string = string> = readonly [
+ Color,
+ ...Color[],
+];
+
+/** Options for selecting a stable color for a string. */
+export interface GetHashedPaletteColorOptions<Color extends string> {
+ /** Override the authored palette for a specific use case. */
+ palette: NonEmptyPalette<Color>;
+}
+
+export function getHashedPaletteColor(value: string): PaletteColor;
+export function getHashedPaletteColor<const Color extends string>(
+ value: string,
+ options: GetHashedPaletteColorOptions<Color>
+): Color;
+
+/** Select a deterministic palette entry for a string. */
+export function getHashedPaletteColor(
+ value: string,
+ options?: GetHashedPaletteColorOptions<string>
+): string {
+ const palette = options?.palette ?? PALETTE_COLORS;
+ let hash = 0x811c9dc5;
+
+ for (let index = 0; index < value.length; index++) {
+ hash ^= value.charCodeAt(index);
+ hash = Math.imul(hash, 0x01000193);
+ }
+
+ return palette[(hash >>> 0) % palette.length];
+}
diff --git a/apps/web/src/features/block-agent/component/sidepanel/AgentSidePanelSections.tsx b/apps/web/src/features/block-agent/component/sidepanel/AgentSidePanelSections.tsx
index e5ec4d8755..9a5e711a67 100644
--- a/apps/web/src/features/block-agent/component/sidepanel/AgentSidePanelSections.tsx
+++ b/apps/web/src/features/block-agent/component/sidepanel/AgentSidePanelSections.tsx
@@ -98,7 +98,7 @@ export function AgentSidePanelSections() {
<SidePanel.Row label="Repository">
<button
type="button"
- class={`${SidePanel.pillClass} hover:bg-hover cursor-pointer`}
+ class={`${SidePanel.pillClass} hover:bg-hover`}
onClick={() => openExternalUrl(url())}
>
<GitBranch class="size-3 shrink-0" />
diff --git a/apps/web/src/features/block-agent/debug/replay/Replay.tsx b/apps/web/src/features/block-agent/debug/replay/Replay.tsx
index 4d3d32e867..549b2497ab 100644
--- a/apps/web/src/features/block-agent/debug/replay/Replay.tsx
+++ b/apps/web/src/features/block-agent/debug/replay/Replay.tsx
@@ -210,7 +210,7 @@ export default function AgentReplay() {
</Knob>
<button
type="button"
- class="rounded border border-edge-muted px-2 py-0.5 text-xs text-ink-muted hover:bg-surface-muted"
+ class="rounded border border-edge-muted px-2 py-0.5 text-xs text-ink-muted hover:bg-hover"
disabled={!recording()}
onClick={mount}
>
@@ -223,7 +223,7 @@ export default function AgentReplay() {
<div class="flex items-center gap-3">
<button
type="button"
- class="rounded border border-edge-muted px-2 py-0.5 text-xs text-ink-muted hover:bg-surface-muted"
+ class="rounded border border-edge-muted px-2 py-0.5 text-xs text-ink-muted hover:bg-hover"
onClick={() =>
playing() ? session().driver.pause() : session().driver.play()
}
@@ -232,7 +232,7 @@ export default function AgentReplay() {
</button>
<button
type="button"
- class="rounded border border-edge-muted px-2 py-0.5 text-xs text-ink-muted hover:bg-surface-muted"
+ class="rounded border border-edge-muted px-2 py-0.5 text-xs text-ink-muted hover:bg-hover"
onClick={() => session().driver.step()}
>
step
diff --git a/apps/web/src/features/block-agent/ui/Thought.tsx b/apps/web/src/features/block-agent/ui/Thought.tsx
index 4d2201112a..0c85be7094 100644
--- a/apps/web/src/features/block-agent/ui/Thought.tsx
+++ b/apps/web/src/features/block-agent/ui/Thought.tsx
@@ -23,7 +23,7 @@ export function Thought(props: ThoughtProps) {
<div class="relative text-xs leading-5 text-ink-extra-muted">
<button
type="button"
- class="flex min-h-7 cursor-pointer items-center gap-1 py-1 text-left text-ink-extra-muted hover:text-ink-muted"
+ class="flex min-h-7 items-center gap-1 py-1 text-left text-ink-extra-muted hover:text-ink-muted"
onClick={() => setExpanded((prev) => !prev)}
>
<CaretRight
diff --git a/apps/web/src/features/block-agent/ui/ToolCard.tsx b/apps/web/src/features/block-agent/ui/ToolCard.tsx
index c71d9f7d81..9133fadc73 100644
--- a/apps/web/src/features/block-agent/ui/ToolCard.tsx
+++ b/apps/web/src/features/block-agent/ui/ToolCard.tsx
@@ -106,9 +106,7 @@ export function ToolCard(props: ToolCardProps) {
defaultOpen={props.defaultOpen}
onOpenChange={props.onOpenChange}
>
- <Collapsible.Trigger
- class={`group cursor-pointer hover:bg-hover ${ROW_CLASS}`}
- >
+ <Collapsible.Trigger class={`group hover:bg-hover ${ROW_CLASS}`}>
{row(true)}
</Collapsible.Trigger>
<Collapsible.Content class="data-closed:hidden">
diff --git a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSummary.tsx b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSummary.tsx
index 8ea7cfa6c0..e22a2cf96a 100644
--- a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSummary.tsx
+++ b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSummary.tsx
@@ -35,7 +35,7 @@ export function CallRecordingSummarySection(props: {
fallback={
<div class="flex items-center gap-2 animate-pulse">
<div class="size-3.5 shrink-0 animate-spin rounded-full border-2 border-ink-extra-muted border-t-ink-muted" />
- <span class="text-sm text-ink-faint">Generating summary…</span>
+ <span class="text-sm text-ink-subtle">Generating summary…</span>
</div>
}
>
diff --git a/apps/web/src/features/block-canvas/component/nodes/BaseCanvasRectangle.tsx b/apps/web/src/features/block-canvas/component/nodes/BaseCanvasRectangle.tsx
index 2fce287a2b..f9681c6a0e 100644
--- a/apps/web/src/features/block-canvas/component/nodes/BaseCanvasRectangle.tsx
+++ b/apps/web/src/features/block-canvas/component/nodes/BaseCanvasRectangle.tsx
@@ -227,7 +227,7 @@ export function BaseCanvasRectangle(props: BaseCanvasRectangleProps) {
<Portal mount={layerContext().selection}>
<div
- class="absolute pointer-events-none top-0 left-0 opacity-90 border-opacity-100 outline-accent outline-1"
+ class="absolute pointer-events-none top-0 left-0 opacity-90 outline-accent outline-1"
style={{
// TODO
...rect(),
diff --git a/apps/web/src/features/block-canvas/component/nodes/Shape.tsx b/apps/web/src/features/block-canvas/component/nodes/Shape.tsx
index 6283230d74..e4b10b953e 100644
--- a/apps/web/src/features/block-canvas/component/nodes/Shape.tsx
+++ b/apps/web/src/features/block-canvas/component/nodes/Shape.tsx
@@ -91,13 +91,13 @@ function Label(props: {
<div
class="absolute top-0 left-0 size-full flex items-center justify-center overflow-clip"
classList={{
- 'user-select-none': !hasFocus(),
+ 'select-none': !hasFocus(),
'pointer-events-auto': hasFocus(),
}}
>
<span
ref={labelRef}
- class="text-center font-semibold word-break-break-all min-w-0 max-w-[calc(100%-2rem)]"
+ class="text-center font-semibold break-all min-w-0 max-w-[calc(100%-2rem)]"
style={labelStyle()}
contentEditable={canEdit()}
on:focus={handleFocus}
diff --git a/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx b/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
index d13ca2a881..23c8c1b4e4 100644
--- a/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
+++ b/apps/web/src/features/block-code/component/CodeFileTypeChip.tsx
@@ -85,7 +85,7 @@ export function CodeFileTypeChip() {
}}
gutter={4}
>
- <Popover.Trigger class="shrink-0 rounded px-1 py-0.5 text-xxs font-mono font-medium uppercase leading-none bg-code-bg text-code hover:brightness-90 transition-[filter]">
+ <Popover.Trigger class="shrink-0 rounded px-1 py-0.5 text-xxs font-mono font-medium uppercase leading-none bg-code/20 text-code hover:brightness-90 transition-[filter]">
{fileType()}
</Popover.Trigger>
<Popover.Portal>
diff --git a/apps/web/src/features/block-email/component/AttachmentPill.tsx b/apps/web/src/features/block-email/component/AttachmentPill.tsx
index 5bd0577037..b1b9a7849e 100644
--- a/apps/web/src/features/block-email/component/AttachmentPill.tsx
+++ b/apps/web/src/features/block-email/component/AttachmentPill.tsx
@@ -26,7 +26,7 @@ export function EmailAttachmentPill(props: EmailAttachmentPillProps) {
return (
<div
ref={parentDiv}
- class="items-center text-xs flex flex-row p-2 w-36 rounded-lg border border-ink-muted/8 bg-ink-muted/2.5 hover:bg-ink-muted/6 cursor-pointer"
+ class="items-center text-xs flex flex-row p-2 w-36 rounded-lg border border-ink-muted/8 bg-ink-muted/2.5 hover:bg-ink-muted/6"
classList={{
'pl-2': props.removable,
}}
diff --git a/apps/web/src/features/block-email/component/MacroSignatureButton.tsx b/apps/web/src/features/block-email/component/MacroSignatureButton.tsx
index 5b3d56db8b..c80a49aabb 100644
--- a/apps/web/src/features/block-email/component/MacroSignatureButton.tsx
+++ b/apps/web/src/features/block-email/component/MacroSignatureButton.tsx
@@ -18,7 +18,7 @@ export const MacroSignatureButton = (props: MacroSignatureButtonProps) => {
<Tooltip label="Subscribe to remove watermark">
<button
type="button"
- class="hover:bg-hover pointer-events-all"
+ class="hover:bg-hover pointer-events-auto"
tabindex={-1}
// The text area uses non delegated events to capture on click and restore focus
// to the editor. We want to capture the click here so we can open the paywall.
diff --git a/apps/web/src/features/block-md/component/ComposeSkill.tsx b/apps/web/src/features/block-md/component/ComposeSkill.tsx
index 0d6b668ce1..8246ac69f4 100644
--- a/apps/web/src/features/block-md/component/ComposeSkill.tsx
+++ b/apps/web/src/features/block-md/component/ComposeSkill.tsx
@@ -169,7 +169,7 @@ function ComposeSkillTitleEditor(props: {
<div class="relative w-full">
<div
contentEditable={!props.disabled()}
- class="ph-no-capture w-full text-xl font-medium outline-none whitespace-pre-wrap wrap-break-words"
+ class="ph-no-capture w-full text-xl font-medium outline-none whitespace-pre-wrap wrap-break-word"
ref={(el) => {
props.ref?.(el);
onElementConnect(el, () => onConnect(el));
diff --git a/apps/web/src/features/block-md/component/ComposeTask.tsx b/apps/web/src/features/block-md/component/ComposeTask.tsx
index e175822c87..202290b1f8 100644
--- a/apps/web/src/features/block-md/component/ComposeTask.tsx
+++ b/apps/web/src/features/block-md/component/ComposeTask.tsx
@@ -283,7 +283,7 @@ export function ComposeTaskTitleEditor(props: {
<div class="relative w-full">
<div
contentEditable={!props.disabled()}
- class="ph-no-capture w-full text-xl font-medium outline-none whitespace-pre-wrap wrap-break-words"
+ class="ph-no-capture w-full text-xl font-medium outline-none whitespace-pre-wrap wrap-break-word"
ref={(el) => {
props.ref?.(el);
onElementConnect(el, () => onConnect(el));
diff --git a/apps/web/src/features/block-md/component/MarkdownPopup.tsx b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
index 240c25420b..fb497e85df 100644
--- a/apps/web/src/features/block-md/component/MarkdownPopup.tsx
+++ b/apps/web/src/features/block-md/component/MarkdownPopup.tsx
@@ -637,7 +637,7 @@ export function MarkdownPopup(props: {
</p>
<div class="flex flex-row items-center space-x-2 w-full px-2">
<textarea
- class="resize-none rounded-xs w-full p-2 my-3 text-sm h-max-[800px] overflow-hidden border border-edge bg-hover"
+ class="resize-none rounded-xs w-full p-2 my-3 text-sm max-h-[800px] overflow-hidden border border-edge bg-hover"
ref={setRewriteInputRef}
rows={1}
onSubmit={(e) => e.preventDefault()}
diff --git a/apps/web/src/features/block-md/component/MediaSelector.tsx b/apps/web/src/features/block-md/component/MediaSelector.tsx
index 1c0db5a060..e93430ffa8 100644
--- a/apps/web/src/features/block-md/component/MediaSelector.tsx
+++ b/apps/web/src/features/block-md/component/MediaSelector.tsx
@@ -144,7 +144,7 @@ export function MediaSelector(props: MediaSelectorProps) {
}}
>
<div
- class="w-full mt-0 p-2 m-1 bg-surface text-ink flex justify-center items-center gap-2 rounded hover:bg-hover hover-transition-bg hover:text-accent @container"
+ class="w-full mt-0 mx-1 mb-1 p-2 bg-surface text-ink flex justify-center items-center gap-2 rounded hover:bg-hover hover-transition-bg hover:text-accent @container"
use:fileSelector={{
acceptedFileExtensions: acceptedFileExtensions(),
acceptedMimeTypes: acceptedMimeTypes(),
diff --git a/apps/web/src/features/block-md/history/HistoryOverlay.tsx b/apps/web/src/features/block-md/history/HistoryOverlay.tsx
index 88ff3953fd..ebc90ea5c1 100644
--- a/apps/web/src/features/block-md/history/HistoryOverlay.tsx
+++ b/apps/web/src/features/block-md/history/HistoryOverlay.tsx
@@ -3,6 +3,7 @@ import { MarkdownShell } from '@core/component/LexicalMarkdown/builder/MarkdownS
import type { DiffStatus } from '@macro-inc/lexical-core';
import type { SerializedEditorState } from 'lexical';
import { createMemo, createSignal, onCleanup, onMount, Show } from 'solid-js';
+import { diffAuthorColorPlugin } from './diffAuthorColorPlugin';
import { useHistory } from './HistoryContext';
import { UserHoverTag } from './UserHoverTag';
import { userColor } from './utils';
@@ -93,7 +94,7 @@ export function HistoryOverlay(props: {
class="absolute inset-0 z-20"
style={{
display: props.visible ? undefined : 'none',
- '--diff-author': diffAuthorColor(),
+ '--diff-author-color': diffAuthorColor(),
}}
onPointerMove={onDiffPointerMove}
onPointerLeave={() => setHoverAuthor(null)}
@@ -105,7 +106,8 @@ export function HistoryOverlay(props: {
.withMentions()
.withMedia()
.withLinks()
- .withCode();
+ .withCode()
+ .use(diffAuthorColorPlugin);
return (
<MarkdownShell
config={config}
diff --git a/apps/web/src/features/block-md/history/HistoryScrubber.tsx b/apps/web/src/features/block-md/history/HistoryScrubber.tsx
index 1d5dd6cbdd..a41907f2be 100644
--- a/apps/web/src/features/block-md/history/HistoryScrubber.tsx
+++ b/apps/web/src/features/block-md/history/HistoryScrubber.tsx
@@ -389,7 +389,7 @@ export function HistoryScrubber(props: { compact?: boolean }) {
timestampToContainerPosition(session.endMs);
return (
<div
- class="absolute inset-y-0 cursor-pointer rounded-full"
+ class="absolute inset-y-0 rounded-full"
// Stop the rail's scrub/marquee drag from starting so a
// bar click cleanly opens that session's diff.
onPointerDown={(e) => e.stopPropagation()}
diff --git a/apps/web/src/features/block-md/history/diffAuthorColorPlugin.test.ts b/apps/web/src/features/block-md/history/diffAuthorColorPlugin.test.ts
new file mode 100644
index 0000000000..812d9076cf
--- /dev/null
+++ b/apps/web/src/features/block-md/history/diffAuthorColorPlugin.test.ts
@@ -0,0 +1,51 @@
+/**
+ * @vitest-environment jsdom
+ */
+
+import { $createDiffTextNode, DiffTextNode } from '@macro-inc/lexical-core';
+import { $createParagraphNode, $getRoot, createEditor } from 'lexical';
+import { describe, expect, it } from 'vitest';
+import { diffAuthorColorPlugin } from './diffAuthorColorPlugin';
+
+describe('diffAuthorColorPlugin', () => {
+ it('applies the app palette color to rendered diff text', () => {
+ const editor = createEditor({
+ namespace: 'diff-author-color-test',
+ nodes: [DiffTextNode],
+ onError: (error) => {
+ throw error;
+ },
+ });
+ const root = document.createElement('div');
+ document.body.appendChild(root);
+ editor.setRootElement(root);
+ const dispose = diffAuthorColorPlugin(editor);
+
+ editor.update(
+ () => {
+ $getRoot()
+ .clear()
+ .append(
+ $createParagraphNode().append(
+ $createDiffTextNode(
+ 'Changed text',
+ 'insert',
+ 'document-author-id'
+ )
+ )
+ );
+ },
+ { discrete: true }
+ );
+
+ const diff = root.querySelector<HTMLElement>('[data-diff-author]');
+ expect(diff?.dataset.diffAuthor).toBe('document-author-id');
+ expect(diff?.style.getPropertyValue('--diff-author-color')).toBe(
+ 'var(--color-purple, var(--color-pink))'
+ );
+
+ dispose();
+ editor.setRootElement(null);
+ root.remove();
+ });
+});
diff --git a/apps/web/src/features/block-md/history/diffAuthorColorPlugin.ts b/apps/web/src/features/block-md/history/diffAuthorColorPlugin.ts
new file mode 100644
index 0000000000..54d57bb9a4
--- /dev/null
+++ b/apps/web/src/features/block-md/history/diffAuthorColorPlugin.ts
@@ -0,0 +1,22 @@
+import { DiffTextNode } from '@macro-inc/lexical-core';
+import type { LexicalEditor } from 'lexical';
+import { userColor } from './utils';
+
+/** Apply app theme colors to rendered document-history diff runs. */
+export function diffAuthorColorPlugin(editor: LexicalEditor): () => void {
+ return editor.registerMutationListener(
+ DiffTextNode,
+ (mutations) => {
+ for (const [nodeKey, mutation] of mutations) {
+ if (mutation === 'destroyed') continue;
+
+ const element = editor.getElementByKey(nodeKey);
+ const author = element?.dataset.diffAuthor;
+ if (!element || !author) continue;
+
+ element.style.setProperty('--diff-author-color', userColor(author));
+ }
+ },
+ { skipInitialization: false }
+ );
+}
diff --git a/apps/web/src/features/block-md/history/utils.ts b/apps/web/src/features/block-md/history/utils.ts
index c8ff0560b8..9848d92975 100644
--- a/apps/web/src/features/block-md/history/utils.ts
+++ b/apps/web/src/features/block-md/history/utils.ts
@@ -1,7 +1,11 @@
import { isMacroAgentId, MACRO_AGENT_NAME } from '@core/constant/macroAgent';
import { macroIdToEmail, tryMacroId } from '@core/user';
+import { getHashedPaletteColor } from '@ui/utils/palette';
-export { diffAuthorColor as userColor } from '@macro-inc/lexical-core';
+export function userColor(userId: string): string {
+ const color = getHashedPaletteColor(userId);
+ return `var(--color-${color}, var(--color-pink))`;
+}
export function userLabel(userId: string): string {
if (userId === 'unknown') return 'Unknown';
diff --git a/apps/web/src/features/block-pdf/component/placeables/Signature.tsx b/apps/web/src/features/block-pdf/component/placeables/Signature.tsx
index 0389185c44..2934699578 100644
--- a/apps/web/src/features/block-pdf/component/placeables/Signature.tsx
+++ b/apps/web/src/features/block-pdf/component/placeables/Signature.tsx
@@ -124,7 +124,7 @@ function SignatureEditor(props: SignatureEditorProps) {
>
<Portal mount={document.getElementById('modal') ?? undefined}>
<Dialog.Overlay
- class="flex sm:max-h-full items-center justify-content z-modal-overlay fixed inset-0 bg-modal-overlay"
+ class="dialog-overlay-open-animation flex sm:max-h-full items-center justify-center z-modal-overlay fixed inset-0 bg-modal-overlay"
style={{
'max-height': `calc(100dvh - env(safe-area-inset-top, 0px))`,
}}
@@ -136,11 +136,7 @@ function SignatureEditor(props: SignatureEditorProps) {
'bg-surface shadow',
'rounded-lg border border-edge',
'flex-col justify-start inline-flex gap-3',
- 'duration-100',
- 'data-open:animate-in',
- 'data-open:fade-in-0 data-open:zoom-in-95',
- 'data-closed:animate-out',
- 'data-closed:fade-out-0 data-closed:zoom-out-95'
+ 'dialog-content-open-animation'
)}
style={positionStyle()}
>
diff --git a/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx b/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx
index 1611fdc8a1..7c842ed835 100644
--- a/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx
+++ b/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx
@@ -222,7 +222,7 @@ function ProjectCreateDialog(props: {
<Surface depth={2} class="rounded-xl">
<div class="*:max-h-[75vh]">
<div class="p-2">
- <Dialog.Title class="text-md font-semibold text-ink pb-3">
+ <Dialog.Title class="text-base font-semibold text-ink pb-3">
Create in {props.name}
</Dialog.Title>
<For each={BLOCK_CREATE_SPECS}>
diff --git a/apps/web/src/features/channel/Attachments/AttachmentEntityList.tsx b/apps/web/src/features/channel/Attachments/AttachmentEntityList.tsx
index ef8f638bc8..fd003b83ec 100644
--- a/apps/web/src/features/channel/Attachments/AttachmentEntityList.tsx
+++ b/apps/web/src/features/channel/Attachments/AttachmentEntityList.tsx
@@ -23,7 +23,7 @@ export function AttachmentEntityList(props: {
<AttachmentSection label="Documents">
<div class="grid grid-cols-1">
<Show when={!hasDocuments()}>
- <div class="py-3 text-sm text-ink-faint">
+ <div class="py-3 text-sm text-ink-subtle">
No documents in this channel yet.
</div>
</Show>
diff --git a/apps/web/src/features/channel/Attachments/MediaGallery.tsx b/apps/web/src/features/channel/Attachments/MediaGallery.tsx
index 43d5a21eae..846782b99e 100644
--- a/apps/web/src/features/channel/Attachments/MediaGallery.tsx
+++ b/apps/web/src/features/channel/Attachments/MediaGallery.tsx
@@ -61,7 +61,7 @@ export function MediaGallery(props: {
<Show
when={hasMedia()}
fallback={
- <div class="px-6 py-3 text-sm text-ink-faint">
+ <div class="px-6 py-3 text-sm text-ink-subtle">
No photos or videos in this channel yet.
</div>
}
diff --git a/apps/web/src/features/channel/Call/CallOverlay.tsx b/apps/web/src/features/channel/Call/CallOverlay.tsx
index cd7027fe6b..de80c9fa41 100644
--- a/apps/web/src/features/channel/Call/CallOverlay.tsx
+++ b/apps/web/src/features/channel/Call/CallOverlay.tsx
@@ -45,7 +45,7 @@ function ParticipantTileWrapper(props: {
<div
class={cn(
'relative flex items-center justify-center rounded-lg overflow-hidden bg-message min-h-30 border border-edge-muted',
- props.isSpeaking && 'ring-inset ring-2 ring-accent-2',
+ props.isSpeaking && 'ring-inset ring-2 ring-accent',
props.isConnecting && 'animate-pulse',
props.class
)}
diff --git a/apps/web/src/features/channel/Message/ActionMenu.tsx b/apps/web/src/features/channel/Message/ActionMenu.tsx
index c02692b970..6b917690cd 100644
--- a/apps/web/src/features/channel/Message/ActionMenu.tsx
+++ b/apps/web/src/features/channel/Message/ActionMenu.tsx
@@ -194,7 +194,7 @@ function ActionMenuContent(props: ActionMenuProps) {
data-message-action="react-quick"
data-emoji={emoji}
>
- <span class="text-md my-0">{emoji}</span>
+ <span class="text-base my-0">{emoji}</span>
</Button>
)}
</For>
diff --git a/apps/web/src/features/channel/Message/ReactionChip.tsx b/apps/web/src/features/channel/Message/ReactionChip.tsx
index 780a753116..03dca7ca0c 100644
--- a/apps/web/src/features/channel/Message/ReactionChip.tsx
+++ b/apps/web/src/features/channel/Message/ReactionChip.tsx
@@ -50,7 +50,7 @@ function ReactionTooltipContent(props: {
return (
<span>
{formatReactorNames(props.users, props.currentUserId)} reacted with{' '}
- <span class="text-md">{props.emoji}</span>
+ <span class="text-base">{props.emoji}</span>
</span>
);
}
diff --git a/apps/web/src/features/channel/Thread/ThreadReplyButton.tsx b/apps/web/src/features/channel/Thread/ThreadReplyButton.tsx
index 27cd11e5dd..d372bfd201 100644
--- a/apps/web/src/features/channel/Thread/ThreadReplyButton.tsx
+++ b/apps/web/src/features/channel/Thread/ThreadReplyButton.tsx
@@ -14,7 +14,7 @@ export function ThreadReplyButton(props: ThreadReplyButtonProps) {
<button
type="button"
class={cn(
- 'w-min rounded-full icon-plus mb-2 border border-thread-rail bg-surface hover:bg-hover flex flex-row justify-center items-center size-8 touch:min-h-(--user-icon-width) touch:min-w-(--user-icon-width) text-ink-muted hover:text-ink',
+ 'rounded-full icon-plus mb-2 border border-thread-rail bg-surface hover:bg-hover flex flex-row justify-center items-center size-8 touch:min-h-(--user-icon-width) touch:min-w-(--user-icon-width) text-ink-muted hover:text-ink',
local.class
)}
ref={(el) => {
diff --git a/apps/web/src/features/command/CommandMenu.tsx b/apps/web/src/features/command/CommandMenu.tsx
index cffd2693cb..06762121d4 100644
--- a/apps/web/src/features/command/CommandMenu.tsx
+++ b/apps/web/src/features/command/CommandMenu.tsx
@@ -727,7 +727,7 @@ function EntityActionPreview(props: { entities: EntityData[] }) {
}}
</For>
<Show when={remainingCount() > 0}>
- <div class="text-muted-foreground text-xs px-2 py-1">
+ <div class="text-ink-muted text-xs px-2 py-1">
+{remainingCount()} more
</div>
</Show>
diff --git a/apps/web/src/features/companies/crm/StageIcon.tsx b/apps/web/src/features/companies/crm/StageIcon.tsx
index 7e9c4c9358..1af6d6d056 100644
--- a/apps/web/src/features/companies/crm/StageIcon.tsx
+++ b/apps/web/src/features/companies/crm/StageIcon.tsx
@@ -9,6 +9,7 @@
import { PropertyValueIcon } from '@property/component/propertyValue/PropertyValueIcon';
import { PROPERTY_OPTION_IDS } from '@property/constants';
+import { getHashedPaletteColor } from '@ui/utils/palette';
import { Show } from 'solid-js';
import { twMerge } from 'tailwind-merge';
@@ -26,24 +27,17 @@ const STAGE_TINT_PALETTE = [
'text-failure-ink',
] as const;
-/** Stable non-negative hash so untinted custom stages keep their color. */
-function hashOptionId(optionId: string): number {
- let hash = 0;
- for (let i = 0; i < optionId.length; i++) {
- hash = (hash * 31 + optionId.charCodeAt(i)) | 0;
- }
- return Math.abs(hash);
-}
-
export function CrmStageIcon(props: {
optionId: string;
index?: number;
class?: string;
}) {
const tint = () =>
- STAGE_TINT_PALETTE[
- (props.index ?? hashOptionId(props.optionId)) % STAGE_TINT_PALETTE.length
- ];
+ props.index === undefined
+ ? getHashedPaletteColor(props.optionId, {
+ palette: STAGE_TINT_PALETTE,
+ })
+ : STAGE_TINT_PALETTE[props.index % STAGE_TINT_PALETTE.length];
return (
<Show
diff --git a/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx b/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx
index 258e2a3484..7f545357c8 100644
--- a/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx
+++ b/apps/web/src/features/devtools/debug/ProjectionPlayground.tsx
@@ -102,7 +102,7 @@ export default function ProjectionPlayground() {
};
return (
- <div class="flex h-full flex-col bg-bg text-ink">
+ <div class="flex h-full flex-col bg-surface text-ink">
<header class="flex h-10 shrink-0 items-center border-edge-muted border-b px-4">
<div class="text-sm font-medium">AI Projection Playground</div>
<div class="ml-auto text-ink-muted text-xs">
@@ -267,7 +267,7 @@ export default function ProjectionPlayground() {
</section>
<Show when={projection.error()}>
- <section class="rounded-sm border border-edge-muted bg-surface p-3 text-danger text-sm">
+ <section class="rounded-sm border border-edge-muted bg-surface p-3 text-failure text-sm">
{projection.error()}
</section>
</Show>
diff --git a/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx b/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx
index 6a02664492..99343d6bec 100644
--- a/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx
+++ b/apps/web/src/features/entity/EntitySelectionToolbarModal.tsx
@@ -26,7 +26,7 @@ export const EntitySelectionToolbarModal = (
>
<CloseIcon />
</Button>
- <span class="text-ink font-regular w-full whitespace-nowrap">
+ <span class="text-ink font-normal w-full whitespace-nowrap">
{props.multiSelectEntities.length} selected
</span>
<Button
diff --git a/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx b/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx
index bee8b813d2..3cb0f3b70a 100644
--- a/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx
+++ b/apps/web/src/features/entity/bulk-edit/BulkDeleteView.tsx
@@ -70,7 +70,7 @@ export const BulkDeleteView = (props: {
)}
</For>
<Show when={props.entities.length > 2}>
- <div class="text-muted-foreground text-xs px-2 py-1">
+ <div class="text-ink-muted text-xs px-2 py-1">
+{props.entities.length - 2} more
</div>
</Show>
diff --git a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx
index 462a26a7d0..89c61ddded 100644
--- a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx
+++ b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx
@@ -465,7 +465,7 @@ export const BulkMoveToProjectView = (props: {
)}
</For>
<Show when={props.entities.length > 2}>
- <div class="text-muted-foreground text-xs px-2 py-1">
+ <div class="text-ink-muted text-xs px-2 py-1">
+{props.entities.length - 2} more
</div>
</Show>
diff --git a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
index 06e15d52f4..4868e4891d 100644
--- a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
+++ b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
@@ -129,7 +129,7 @@ export const BulkRenameEntitiesView = (props: {
)}
</For>
<Show when={props.entities.length > 2}>
- <div class="text-muted-foreground text-xs px-2 py-1">
+ <div class="text-ink-muted text-xs px-2 py-1">
+{props.entities.length - 2} more
</div>
</Show>
diff --git a/apps/web/src/features/entity/components/Badges.tsx b/apps/web/src/features/entity/components/Badges.tsx
index 14d93cbb49..1715fcc27f 100644
--- a/apps/web/src/features/entity/components/Badges.tsx
+++ b/apps/web/src/features/entity/components/Badges.tsx
@@ -10,7 +10,7 @@ function Badge(props: ParentProps<{ class?: string; title?: string }>) {
return (
<div
class={cn(
- 'font-mono font-medium user-select-none uppercase flex items-center p-0.5 gap-1 text-xxs rounded-full border',
+ 'font-mono font-medium select-none uppercase flex items-center p-0.5 gap-1 text-xxs rounded-full border',
props.class
)}
title={props.title}
@@ -81,7 +81,7 @@ export function CreatedByBadgeSmall(props: { ownerId: string }) {
}
export function DraftBadge() {
- return <Badge class="text-yellow border-edge-muted px-2">draft</Badge>;
+ return <Badge class="text-warning border-edge-muted px-2">draft</Badge>;
}
function _ImportantBadge() {
@@ -106,7 +106,7 @@ function getCallStatusBadgeConfig(status: CallStatus): CallStatusBadgeConfig {
};
case 'MISSED':
return {
- class: 'text-yellow border-edge-muted px-2',
+ class: 'text-warning border-edge-muted px-2',
label: 'missed',
};
case 'UNATTENDED':
diff --git a/apps/web/src/features/entity/entity-modal/EntityModal.tsx b/apps/web/src/features/entity/entity-modal/EntityModal.tsx
index 5d0d5ae9bb..099c8dae14 100644
--- a/apps/web/src/features/entity/entity-modal/EntityModal.tsx
+++ b/apps/web/src/features/entity/entity-modal/EntityModal.tsx
@@ -29,7 +29,7 @@ export const EntityModalActionFooter = (props: {
isDisabled?: boolean;
}) => {
return (
- <div class="flex justify-end mt-2 tex-sm pt-2">
+ <div class="flex justify-end mt-2 text-sm pt-2">
<button class="py-1 px-3 font-mono text-sm" onClick={props.onCancel}>
Cancel
</button>
diff --git a/apps/web/src/features/entity/extractors-notification/notification-row.tsx b/apps/web/src/features/entity/extractors-notification/notification-row.tsx
index 47a855f66f..9e1ece4e6b 100644
--- a/apps/web/src/features/entity/extractors-notification/notification-row.tsx
+++ b/apps/web/src/features/entity/extractors-notification/notification-row.tsx
@@ -212,7 +212,7 @@ function CompactBody(props: BodyProps) {
return (
<Layout
class={cn(
- 'group/notif @container/notif-row flex items-center gap-2.5 px-3 py-2 hover:bg-ink-muted/6 min-w-0 overflow-hidden cursor-pointer',
+ 'group/notif @container/notif-row flex items-center gap-2.5 px-3 py-2 hover:bg-ink-muted/6 min-w-0 overflow-hidden',
props.class
)}
>
@@ -244,7 +244,7 @@ function ExpandedBody(props: BodyProps) {
return (
<Layout
class={cn(
- 'group/notif flex flex-col px-4 py-3 hover:bg-ink-muted/6 min-w-0 overflow-hidden cursor-pointer',
+ 'group/notif flex flex-col px-4 py-3 hover:bg-ink-muted/6 min-w-0 overflow-hidden',
props.class
)}
>
@@ -262,7 +262,7 @@ function ExpandedBody(props: BodyProps) {
</div>
<div
class={cn(
- 'ph-no-capture min-w-0 text-xs text-ink-muted/80 pt-2 wrap-break-words',
+ 'ph-no-capture min-w-0 text-xs text-ink-muted/80 pt-2 wrap-break-word',
CONTENT_INDENT
)}
>
diff --git a/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx b/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx
index b5a04b0c8e..512b49da64 100644
--- a/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx
+++ b/apps/web/src/features/entity/extractors-notification/notification-stacks.tsx
@@ -96,7 +96,7 @@ export function NotificationStackRow(props: {
<ContextMenu>
<ContextMenu.Trigger class="size-full">
<div
- class="group/notif flex items-center gap-2.5 px-3 py-2 hover:bg-ink-muted/6 min-w-0 overflow-hidden cursor-pointer"
+ class="group/notif flex items-center gap-2.5 px-3 py-2 hover:bg-ink-muted/6 min-w-0 overflow-hidden"
onClick={handleClick}
role="button"
tabIndex={0}
diff --git a/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx b/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx
index b88aeed19b..d652c711d7 100644
--- a/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx
+++ b/apps/web/src/features/next-soup/debug/DocumentWherePlayground.tsx
@@ -457,7 +457,7 @@ export default function DocumentWherePlayground() {
};
return (
- <div class="flex h-full flex-col bg-bg text-ink">
+ <div class="flex h-full flex-col bg-surface text-ink">
<header class="flex h-10 shrink-0 items-center border-edge-muted border-b px-4">
<div class="text-sm font-medium">Document AST Playground</div>
</header>
@@ -531,7 +531,7 @@ export default function DocumentWherePlayground() {
<InlineCheckbox checked={selected().has(token.id)} />
<span class="min-w-0">
<span class="block">{token.label}</span>
- <span class="block text-ink-secondary text-xs">
+ <span class="block text-ink-muted text-xs">
{token.detail}
</span>
</span>
@@ -632,7 +632,7 @@ export default function DocumentWherePlayground() {
{JSON.stringify(activeRequestBody(), null, 2)}
</pre>
<Show when={mode() === 'simple' && selected().has('plain-md')}>
- <div class="mt-3 rounded-sm border border-edge-muted bg-surface p-2 text-ink-secondary text-sm">
+ <div class="mt-3 rounded-sm border border-edge-muted bg-surface p-2 text-ink-muted text-sm">
Simple soup cannot express the plain-markdown exclusion for
snippet/task. It requests markdown documents and shows the old
flat-filter behavior.
@@ -663,11 +663,11 @@ export default function DocumentWherePlayground() {
</div>
<Show when={loading()}>
- <div class="mb-3 text-ink-secondary text-sm">Loading...</div>
+ <div class="mb-3 text-ink-muted text-sm">Loading...</div>
</Show>
<Show when={items().length !== entities().length}>
- <div class="mb-3 rounded-sm border border-edge-muted bg-surface p-2 text-ink-secondary text-sm">
+ <div class="mb-3 rounded-sm border border-edge-muted bg-surface p-2 text-ink-muted text-sm">
{items().length - entities().length} returned soup items were
not displayable entity rows.
</div>
diff --git a/apps/web/src/features/next-soup/soup-view/FolderDropZone.tsx b/apps/web/src/features/next-soup/soup-view/FolderDropZone.tsx
index 97d303ad1f..4aa629b1f0 100644
--- a/apps/web/src/features/next-soup/soup-view/FolderDropZone.tsx
+++ b/apps/web/src/features/next-soup/soup-view/FolderDropZone.tsx
@@ -35,7 +35,7 @@ export function FolderDropZone() {
handleFileUpload(files);
},
}}
- class="cursor-pointer border-0 bg-transparent p-0 font-inherit text-inherit underline"
+ class="border-0 bg-transparent p-0 font-[inherit] text-inherit underline"
>
Upload files
</button>{' '}
@@ -47,7 +47,7 @@ export function FolderDropZone() {
await handleFolderSelect(files, handleFileUpload);
},
}}
- class="cursor-pointer border-0 bg-transparent p-0 font-inherit text-inherit underline"
+ class="border-0 bg-transparent p-0 font-[inherit] text-inherit underline"
>
Upload folders
</button>
diff --git a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx
index dd0b2d776e..e968eee507 100644
--- a/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx
+++ b/apps/web/src/features/next-soup/soup-view/views/tasks/TaskListHeader.tsx
@@ -175,7 +175,7 @@ function HeaderCell(props: {
onClick={() => props.onSort?.(sortKey())}
class={cn(
'flex items-center gap-1 min-w-0 w-full h-full',
- 'hover:text-ink transition-colors cursor-pointer',
+ 'hover:text-ink transition-colors',
props.active && 'text-ink',
justify(),
narrowJustify()
diff --git a/apps/web/src/features/onboarding/components-lib.tsx b/apps/web/src/features/onboarding/components-lib.tsx
index 7261b55620..cc8868fd68 100644
--- a/apps/web/src/features/onboarding/components-lib.tsx
+++ b/apps/web/src/features/onboarding/components-lib.tsx
@@ -22,9 +22,9 @@ function CalloutShell(props: CalloutShellProps) {
return (
<Layer depth={2}>
<div class="flex items-center gap-3 rounded-md bg-surface px-4 py-3 border border-edge-muted">
- <span class="text-sm text-muted">{props.leader}</span>
+ <span class="text-sm text-ink-muted">{props.leader}</span>
<div class="flex items-center gap-2.5">{props.children}</div>
- <span class="text-sm text-muted">{props.label}</span>
+ <span class="text-sm text-ink-muted">{props.label}</span>
<Show when={props.completed}>
<div class="bg-accent text-surface size-5 rounded-xs flex items-center justify-center ml-auto">
<CheckIcon class="size-4" />
@@ -151,7 +151,7 @@ export function HotkeyCallout(props: HotkeyCalloutProps) {
return (
<>
{i() > 0 && props.separator && (
- <span class="text-sm text-muted">{props.separator}</span>
+ <span class="text-sm text-ink-muted">{props.separator}</span>
)}
<span
ref={keyRef}
diff --git a/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx b/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx
index 599c998f56..10fb3d061d 100644
--- a/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx
+++ b/apps/web/src/features/property/component/propertyValue/PropertyValueIcon.tsx
@@ -80,7 +80,7 @@ export const PropertyValueIcon: Component<PropertyValueIconProps> = (props) => {
</Match>
<Match when={props.optionId === PROPERTY_OPTION_IDS.STATUS.IN_PROGRESS}>
<StatusInProgress
- class={twMerge('size-3', props.class, 'text-yellow')}
+ class={twMerge('size-3', props.class, 'text-warning')}
/>
</Match>
<Match when={props.optionId === PROPERTY_OPTION_IDS.STATUS.IN_REVIEW}>
diff --git a/apps/web/src/features/property/editor/PropertyEditorModal.tsx b/apps/web/src/features/property/editor/PropertyEditorModal.tsx
index 6f94b48069..c28ca1e3c3 100644
--- a/apps/web/src/features/property/editor/PropertyEditorModal.tsx
+++ b/apps/web/src/features/property/editor/PropertyEditorModal.tsx
@@ -631,7 +631,7 @@ function EditingEntityPreview(props: { entities: PropertyEditorEntity[] }) {
}}
</For>
<Show when={remainingCount() > 0}>
- <div class="text-muted-foreground text-xs px-2 py-1">
+ <div class="text-ink-muted text-xs px-2 py-1">
+{remainingCount()} more
</div>
</Show>
@@ -1355,7 +1355,7 @@ function PropertyValueEditor(props: {
/>
</Match>
<Match when={propertyType() === 'LINK'}>
- <div class="p-4 text-center text-muted-foreground">
+ <div class="p-4 text-center text-ink-muted">
Link editing not yet implemented
</div>
</Match>
diff --git a/apps/web/src/features/settings/Account.tsx b/apps/web/src/features/settings/Account.tsx
index dd89d1a33e..d9f7450a0b 100644
--- a/apps/web/src/features/settings/Account.tsx
+++ b/apps/web/src/features/settings/Account.tsx
@@ -221,7 +221,7 @@ function ProfilePictureRow(props: { userId: string }) {
role="button"
aria-label="Upload profile picture"
onClick={pickProfilePicture}
- class="flex size-full cursor-pointer items-center justify-center rounded-full bg-edge text-ink-muted transition-colors hover:text-ink focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent"
+ class="flex size-full items-center justify-center rounded-full bg-edge text-ink-muted transition-colors hover:text-ink focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent"
>
<IconUpload class="size-5" />
</span>
@@ -234,7 +234,7 @@ function ProfilePictureRow(props: { userId: string }) {
as="div"
tabindex="0"
aria-label="Edit profile picture"
- class="group block size-full cursor-pointer rounded-full outline-none focus-visible:ring-2 focus-visible:ring-accent"
+ class="group block size-full rounded-full outline-none focus-visible:ring-2 focus-visible:ring-accent"
>
<div class="size-full overflow-hidden rounded-full">
<UserIcon
diff --git a/apps/web/src/features/setup/SetupGraphic.tsx b/apps/web/src/features/setup/SetupGraphic.tsx
index f23ae88447..f99035104b 100644
--- a/apps/web/src/features/setup/SetupGraphic.tsx
+++ b/apps/web/src/features/setup/SetupGraphic.tsx
@@ -554,7 +554,7 @@ export function SetupGraphic(props: {
// modules near the top edge and the blocks near the bottom.
viewBox={SCENE.viewBox}
fill="currentColor"
- class={`setup-graphic text-ink cursor-pointer ${props.poweredUp ? 'powered ' : ''}${props.class ?? ''}`}
+ class={`setup-graphic text-ink ${props.poweredUp ? 'powered ' : ''}${props.class ?? ''}`}
onClick={playSlide}
aria-hidden="true"
>
diff --git a/apps/web/src/features/theme/components/ColorPickerPopover.tsx b/apps/web/src/features/theme/components/ColorPickerPopover.tsx
index 2f58eddbad..f65046b469 100644
--- a/apps/web/src/features/theme/components/ColorPickerPopover.tsx
+++ b/apps/web/src/features/theme/components/ColorPickerPopover.tsx
@@ -371,7 +371,7 @@ export function ColorPickerPopover(props: {
return (
<Popover placement="bottom-end" gutter={8}>
<Popover.Trigger
- class="block cursor-pointer appearance-none border-none bg-transparent p-0"
+ class="block appearance-none border-none bg-transparent p-0"
aria-label={props.ariaLabel}
>
<Show
diff --git a/apps/web/src/features/theme/components/ThemeTokenEditor.tsx b/apps/web/src/features/theme/components/ThemeTokenEditor.tsx
index 4f56efa50e..11182e5e06 100644
--- a/apps/web/src/features/theme/components/ThemeTokenEditor.tsx
+++ b/apps/web/src/features/theme/components/ThemeTokenEditor.tsx
@@ -311,7 +311,7 @@ function TokenSlider(props: {
step="0.01"
value={draft()}
aria-label={props.label}
- class="theme-token-slider h-1 min-w-16 flex-1 cursor-pointer appearance-none rounded-full"
+ class="theme-token-slider h-1 min-w-16 flex-1 appearance-none rounded-full"
style={{
'--slider-color': props.color,
'accent-color': props.color,
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 62c4d6faa1..3cc27a8582 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -361,19 +361,6 @@ body.tauri-ios {
--color-default: var(--color-content-1);
--color-email: var(--color-default);
- /* Compatibility aliases for existing syntax-highlight classes. */
- --color-accent-30: var(--color-red);
- --color-accent-60: var(--color-orange);
- --color-accent-90: var(--color-yellow);
- --color-accent-120: var(--color-lime);
- --color-accent-150: var(--color-green);
- --color-accent-180: var(--color-teal);
- --color-accent-210: var(--color-cyan);
- --color-accent-240: var(--color-blue);
- --color-accent-270: var(--color-violet);
- --color-accent-300: var(--color-purple);
- --color-accent-330: var(--color-pink);
-
/* Font families */
--font-sans: "Inter Variable", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-serif: "Playfair Display Variable", ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
@@ -391,6 +378,8 @@ body.tauri-ios {
--animate-swipe-out-left: swipeOutLeft 100ms ease-out;
--animate-indeterminate-bar: indeterminate-bar 1.1s ease-in-out infinite;
--animate-todo-pulse: todo-pulse 1.6s ease-in-out infinite;
+ --animate-accordion-down: accordion-down 150ms ease-out;
+ --animate-accordion-up: accordion-up 150ms ease-out;
/* Z-index scale — the single source of truth for stacking. Classes come
from these tokens (`--z-index-foo` -> `z-foo`).
@@ -673,6 +662,16 @@ html[data-theme-light='false'] {
}
}
+@keyframes accordion-down {
+ from { height: 0; }
+ to { height: var(--kb-accordion-content-height); }
+}
+
+@keyframes accordion-up {
+ from { height: var(--kb-accordion-content-height); }
+ to { height: 0; }
+}
+
@keyframes typing-dot {
0% { transform: scale(1) translateY(0 ); }
50% { transform: scale(1.5) translateY(-2px); }
diff --git a/apps/web/src/lib/core/comments/Comment.tsx b/apps/web/src/lib/core/comments/Comment.tsx
index 5469fea0da..8325ace781 100644
--- a/apps/web/src/lib/core/comments/Comment.tsx
+++ b/apps/web/src/lib/core/comments/Comment.tsx
@@ -40,13 +40,13 @@ function CommentContainer(
<div
class="relative isolate group"
classList={{
- 'outline-1 outline-yellow/20 -outline-offset-1': props.isHighlighted,
+ 'outline-1 outline-comment/20 -outline-offset-1': props.isHighlighted,
}}
>
<div
class="absolute top-0 left-0 size-[calc(100%)] rounded-lg -z-1"
classList={{
- 'bg-yellow/5 opacity-100': props.isHighlighted,
+ 'bg-comment/5 opacity-100': props.isHighlighted,
'bg-hover/50 opacity-0 group-hover:opacity-100': !props.isHighlighted,
}}
/>
diff --git a/apps/web/src/lib/core/comments/MeasureContainer.tsx b/apps/web/src/lib/core/comments/MeasureContainer.tsx
index 76ff123f0b..510f3d65fb 100644
--- a/apps/web/src/lib/core/comments/MeasureContainer.tsx
+++ b/apps/web/src/lib/core/comments/MeasureContainer.tsx
@@ -85,7 +85,7 @@ export const MeasureContainer = (props: ParentProps<MeasureContainerProps>) => {
innerRef = el;
}}
classList={{
- 'transition-position duration-50': props.transition,
+ 'transition-[left,right,top,bottom] duration-50': props.transition,
}}
>
{props.children}
diff --git a/apps/web/src/lib/core/comments/MinimizedThreads.tsx b/apps/web/src/lib/core/comments/MinimizedThreads.tsx
index 4554d1d13a..9217274c08 100644
--- a/apps/web/src/lib/core/comments/MinimizedThreads.tsx
+++ b/apps/web/src/lib/core/comments/MinimizedThreads.tsx
@@ -105,7 +105,7 @@ export function MinimizedThread(props: {
<div
class={cn('inline-flex items-center gap-1 px-1 rounded-lg', {
'group-hover:bg-hover': !props.isActive,
- 'bg-yellow/10 group-hover:bg-yellow/20': props.isActive,
+ 'bg-comment/10 group-hover:bg-comment/20': props.isActive,
})}
>
<ChatTeardrop class="size-4" onClick={clickHandler} />
diff --git a/apps/web/src/lib/core/component/AI/component/InlineAi.tsx b/apps/web/src/lib/core/component/AI/component/InlineAi.tsx
index a7d9b42c35..5def1578de 100644
--- a/apps/web/src/lib/core/component/AI/component/InlineAi.tsx
+++ b/apps/web/src/lib/core/component/AI/component/InlineAi.tsx
@@ -51,7 +51,7 @@ export function InlineInputReady(props: InlineInputReadyProps) {
return (
<div class="relative flex items-end justify-between p-2 border border-edge rounded-xs w-full bg-hover">
<textarea
- class="flex resize-none w-full p-1 text-sm h-max-[800px] overflow-hidden"
+ class="flex resize-none w-full p-1 text-sm max-h-[800px] overflow-hidden"
ref={inputRef}
rows={props?.options?.defaultLines ?? 1}
onSubmit={(e) => e.preventDefault()}
@@ -109,7 +109,7 @@ export function InlineInputLoading(props: InlineInputLoadingProps) {
return (
<div class="relative flex items-end justify-between p-2 border border-edge rounded-xs w-full bg-hover">
<textarea
- class="flex resize-none rounded-md w-full p-1 text-sm h-max-[800px] overflow-hidden select-none"
+ class="flex resize-none rounded-md w-full p-1 text-sm max-h-[800px] overflow-hidden select-none"
disabled
rows={props?.options?.defaultLines ?? 1}
placeholder={props?.options?.placeholderText ?? defaultPlaceholder}
@@ -128,7 +128,7 @@ export function InlineInputDisabled(props: InlineInputLoadingProps) {
return (
<div class="relative flex items-end justify-between p-2 border border-edge rounded-xs w-full bg-hover">
<textarea
- class="flex resize-none rounded-md w-full p-1 text-sm h-max-[800px] overflow-hidden select-none"
+ class="flex resize-none rounded-md w-full p-1 text-sm max-h-[800px] overflow-hidden select-none"
disabled
rows={props?.options?.defaultLines ?? 1}
placeholder={props?.options?.placeholderText ?? defaultPlaceholder}
diff --git a/apps/web/src/lib/core/component/AI/component/tool/BashCodeExecution.tsx b/apps/web/src/lib/core/component/AI/component/tool/BashCodeExecution.tsx
index b4ac3b67a6..c4530ec481 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/BashCodeExecution.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/BashCodeExecution.tsx
@@ -51,7 +51,7 @@ function CodeFence(props: {
</button>
</Show>
<pre
- class="text-ink-muted bg-background-secondary overflow-x-auto rounded p-2 pr-8 font-mono text-xs whitespace-pre-wrap"
+ class="text-ink-muted bg-code-buffer overflow-x-auto rounded p-2 pr-8 font-mono text-xs whitespace-pre-wrap"
classList={{
'max-h-24 overflow-hidden':
isCollapsible() && !expanded() && needsTruncation(),
@@ -80,7 +80,7 @@ function BashResult(props: { result: BashCodeExecutionResult }) {
return (
<div class="flex flex-col gap-1">
<Show when={props.result.return_code !== 0}>
- <span class="text-ink-error">Exit code {props.result.return_code}</span>
+ <span class="text-failure">Exit code {props.result.return_code}</span>
</Show>
<Show when={hasOutput()}>
<CodeFence content={output()} collapsible={false} />
@@ -115,7 +115,7 @@ const handler = createToolRenderer({
return (
<Switch>
<Match when={isError}>
- <span class="text-ink-error">Execution failed</span>
+ <span class="text-failure">Execution failed</span>
</Match>
<Match when={!isError}>
<BashResult
diff --git a/apps/web/src/lib/core/component/AI/component/tool/Bots.tsx b/apps/web/src/lib/core/component/AI/component/tool/Bots.tsx
index 8b168efd18..85ea5f17fb 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/Bots.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/Bots.tsx
@@ -78,7 +78,7 @@ function BotList(props: { bots: ListedBot[] }) {
<div class="flex min-w-0 items-center justify-between gap-3">
<div class="min-w-0">
<div class="truncate text-ink">{bot.name}</div>
- <div class="truncate text-2xs text-ink-extra-muted">
+ <div class="truncate text-xxs text-ink-extra-muted">
@{bot.handle}
</div>
</div>
diff --git a/apps/web/src/lib/core/component/AI/component/tool/ListTags.tsx b/apps/web/src/lib/core/component/AI/component/tool/ListTags.tsx
index 9a9ad8d3a1..5175c888ae 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/ListTags.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/ListTags.tsx
@@ -17,7 +17,7 @@ const ListTagsToolResponse = (props: { tagSets: ListTagsSet[] }) => (
<Tool.ListItem icon={<TagDot color={tag.color ?? undefined} />}>
<div class="flex min-w-0 flex-1 items-center justify-between gap-2">
<span class="truncate text-xs text-ink">{tag.label}</span>
- <span class="shrink-0 text-2xs text-ink-muted">
+ <span class="shrink-0 text-xxs text-ink-muted">
{set.scope}
</span>
</div>
diff --git a/apps/web/src/lib/core/component/AI/component/tool/Properties.tsx b/apps/web/src/lib/core/component/AI/component/tool/Properties.tsx
index 99a544dcae..dac29db793 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/Properties.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/Properties.tsx
@@ -139,7 +139,7 @@ function OptionChips(props: { options: ResolvedOption[]; removed?: boolean }) {
)}
</For>
<Show when={overflow() > 0}>
- <span class="shrink-0 text-2xs text-ink-muted">+{overflow()}</span>
+ <span class="shrink-0 text-xxs text-ink-muted">+{overflow()}</span>
</Show>
</>
);
diff --git a/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsx b/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsx
index b7af9c5f36..68deab3d86 100644
--- a/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsx
+++ b/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsx
@@ -132,7 +132,7 @@ function InlineTextEditorResult(props: {
props.content.type === 'text_editor_code_execution_tool_result_error'
}
>
- <span class="text-ink-error">Failed</span>
+ <span class="text-failure">Failed</span>
</Match>
<Match
when={props.content.type === 'text_editor_code_execution_view_result'}
diff --git a/apps/web/src/lib/core/component/DocumentPreview.tsx b/apps/web/src/lib/core/component/DocumentPreview.tsx
index 23fbab54f6..c7a9fa62b8 100644
--- a/apps/web/src/lib/core/component/DocumentPreview.tsx
+++ b/apps/web/src/lib/core/component/DocumentPreview.tsx
@@ -241,7 +241,7 @@ function PopupIconButton(props: {
}}
class="rounded-md py-1 hover:bg-hover transition flex items-center gap-1.5"
>
- <div class="w-fit flex justify-right items-center m-0.5 text-xs font-normal text-current/90">
+ <div class="w-fit flex justify-end items-center m-0.5 text-xs font-normal text-current/90">
<PopupIcon icon={props.icon} />
</div>
</button>
@@ -260,7 +260,8 @@ function MetadataInfo(props: {
return (
<div
class={cn(
- props.align === 'right' ? 'justify-right' : 'justify-left',
+ 'flex',
+ props.align === 'right' ? 'justify-end' : 'justify-start',
'mt-2',
props.align === 'left' && 'w-fit max-w-[66%]',
'text-ink-muted',
@@ -281,7 +282,7 @@ function MetadataInfo(props: {
function UserInfo(props: { userId: string }) {
const displayName = () => getDisplayName(tryMacroId(props.userId));
return (
- <div class="justify-left mt-2 w-fit max-w-[66%] text-ink-muted truncate flex items-center gap-1.5">
+ <div class="justify-start mt-2 w-fit max-w-[66%] text-ink-muted truncate flex items-center gap-1.5">
<UserIconComponent
id={props.userId}
size="sm"
diff --git a/apps/web/src/lib/core/component/FileList/ExplorerSpacer.tsx b/apps/web/src/lib/core/component/FileList/ExplorerSpacer.tsx
index 61f42da9df..dadddc33dc 100644
--- a/apps/web/src/lib/core/component/FileList/ExplorerSpacer.tsx
+++ b/apps/web/src/lib/core/component/FileList/ExplorerSpacer.tsx
@@ -22,11 +22,7 @@ function FileLevelSpacer(props: { size: FileListSize }) {
}
function _CaretSpacer(props: { size: FileListSize }) {
- return (
- <div
- class={cn('caret-spacer min-h-full', FILE_LIST_CARET_WIDTH[props.size])}
- />
- );
+ return <div class={cn('min-h-full', FILE_LIST_CARET_WIDTH[props.size])} />;
}
function _Caret(props: { isExpanded: boolean; size: FileListSize }) {
diff --git a/apps/web/src/lib/core/component/FileList/constants.tsx b/apps/web/src/lib/core/component/FileList/constants.tsx
index 858b8c26f2..05064a4190 100644
--- a/apps/web/src/lib/core/component/FileList/constants.tsx
+++ b/apps/web/src/lib/core/component/FileList/constants.tsx
@@ -33,7 +33,7 @@ export const FILE_LIST_SPACER_WIDTH = {
const _FILE_LIST_TEXT_SIZE = {
[FILE_LIST_SIZE.sm]: 'text-sm',
- [FILE_LIST_SIZE.md]: 'text-md',
+ [FILE_LIST_SIZE.md]: 'text-base',
[FILE_LIST_SIZE.lg]: 'text-lg',
} as const;
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/collaboration/remote-cursor.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/collaboration/remote-cursor.tsx
index 7846ae71d9..6b4ed1dce6 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/collaboration/remote-cursor.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/collaboration/remote-cursor.tsx
@@ -293,8 +293,8 @@ function RemoteCursorsOverlay(props: RemoteCursorsOverlayProps) {
const startStyle = cursor.style[0];
- const overlayColor = `var(--color-${startStyle.color})`;
- const tagName = `var(--color-${startStyle.color})`;
+ const overlayColor = `var(--color-${startStyle.color}, var(--color-pink))`;
+ const tagName = `var(--color-${startStyle.color}, var(--color-pink))`;
const textColor = `var(--color-surface)`;
const userTagHeight = 20;
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/FocusClickTarget.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/FocusClickTarget.tsx
index 686c6b0867..998d21db9b 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/FocusClickTarget.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/FocusClickTarget.tsx
@@ -28,9 +28,6 @@ export function FocusClickTarget(
e.preventDefault();
}
}}
- classList={{
- 'invisible-focus-target': true,
- }}
onClick={(e: MouseEvent) => {
e.preventDefault();
if (!local.editor.isEditable()) return;
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/debug/LexicalStateDebugger.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/debug/LexicalStateDebugger.tsx
index 943b0757a7..c271c81d44 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/debug/LexicalStateDebugger.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/debug/LexicalStateDebugger.tsx
@@ -70,24 +70,23 @@ function textNodeToFormats(node: TextNode): string[] {
const colors: Record<DebugNodeType, string> = {
root: 'text-accent bg-accent/15 border border-accent/30',
- text: 'text-accent-30 bg-accent-30/15 border border-accent-30/30',
- heading1: 'text-accent-60 bg-accent-60/15 border border-accent-60/30',
- heading2: 'text-accent-90 bg-accent-90/15 border border-accent-90/30',
- heading3: 'text-accent-120 bg-accent-120/15 border border-accent-120/30',
- paragraph: 'text-accent-150 bg-accent-150/15 border border-accent-150/30',
- 'list-bullet': 'text-accent-180 bg-accent-180/15 border border-accent-180/30',
- 'list-check': 'text-accent-210 bg-accent-210/15 border border-accent-210/30',
- 'list-number': 'text-accent-240 bg-accent-240/15 border border-accent-240/30',
- code: 'text-accent-270 bg-accent-270/15 border border-accent-270/30',
- 'custom-code': 'text-accent-300 bg-accent-300/15 border border-accent-300/30',
- quote: 'text-accent-330 bg-accent-330/15 border border-accent-330/30',
- listitem: 'text-accent-30 bg-accent-30/15 border border-accent-30/30',
- link: 'text-accent-90 bg-accent-90/15 border border-accent-90/30',
- autolink: 'text-accent-120 bg-accent-120/15 border border-accent-120/30',
- image: 'text-accent-150 bg-accent-150/15 border border-accent-150/30',
- mark: 'text-accent-270 bg-accent-270/15 border border-accent-270/30',
- 'comment-mark':
- 'text-accent-300 bg-accent-300/15 border border-accent-300/30',
+ text: 'text-red bg-red/15 border border-red/30',
+ heading1: 'text-orange bg-orange/15 border border-orange/30',
+ heading2: 'text-yellow bg-yellow/15 border border-yellow/30',
+ heading3: 'text-lime bg-lime/15 border border-lime/30',
+ paragraph: 'text-green bg-green/15 border border-green/30',
+ 'list-bullet': 'text-teal bg-teal/15 border border-teal/30',
+ 'list-check': 'text-cyan bg-cyan/15 border border-cyan/30',
+ 'list-number': 'text-blue bg-blue/15 border border-blue/30',
+ code: 'text-violet bg-violet/15 border border-violet/30',
+ 'custom-code': 'text-purple bg-purple/15 border border-purple/30',
+ quote: 'text-pink bg-pink/15 border border-pink/30',
+ listitem: 'text-red bg-red/15 border border-red/30',
+ link: 'text-yellow bg-yellow/15 border border-yellow/30',
+ autolink: 'text-lime bg-lime/15 border border-lime/30',
+ image: 'text-green bg-green/15 border border-green/30',
+ mark: 'text-violet bg-violet/15 border border-violet/30',
+ 'comment-mark': 'text-purple bg-purple/15 border border-purple/30',
};
const selectionColors = {
@@ -346,14 +345,14 @@ export function LexicalStateDebugger(props: {
<span class="px-1 text-ink-extra-muted">{node.id}</span>
</Show>
<Show when={node.peerId}>
- <span class="bg-accent-30/15 border border-accent-30/30 text-accent-30 mx-0.5">
+ <span class="bg-red/15 border border-red/30 text-red mx-0.5">
Peer ID: {node.peerId}
</span>
</Show>
<Show
when={node.sharedPeers && node.sharedPeers.length > 0}
>
- <span class="bg-accent-30/15 border border-accent-30/30 text-accent-30 mx-0.5">
+ <span class="bg-red/15 border border-red/30 text-red mx-0.5">
<For each={node.sharedPeers}>
{(id) => <span>{id}</span>}
</For>
@@ -366,7 +365,7 @@ export function LexicalStateDebugger(props: {
</span>
<For each={node.styles}>
{(style) => (
- <span class="bg-accent-60/15 border border-accent-60/30 text-accent-60 mx-0.5">
+ <span class="bg-orange/15 border border-orange/30 text-orange mx-0.5">
{style}
</span>
)}
@@ -383,7 +382,7 @@ export function LexicalStateDebugger(props: {
node.type === 'mark' || node.type === 'comment-mark'
}
>
- <span class="bg-accent-90/15 border border-accent-90/30 text-accent-90 mx-0.5">
+ <span class="bg-yellow/15 border border-yellow/30 text-yellow mx-0.5">
{markNodeKeysToIDs.get(node.key)?.join(', ') ?? ''}
</span>
<Show when={node.type === 'comment-mark'}>
@@ -397,12 +396,10 @@ export function LexicalStateDebugger(props: {
<Show when={commentNode()}>
{(commentNode) => (
<span
- class="bg-accent-90/15 border border-accent-90/30 text-accent-90 mx-0.5"
+ class="bg-yellow/15 border border-yellow/30 text-yellow mx-0.5"
classList={{
- 'bg-accent-30/30':
- commentNode().getIsDraft(),
- 'bg-accent-30/5':
- !commentNode().getIsDraft(),
+ 'bg-red/30': commentNode().getIsDraft(),
+ 'bg-red/5': !commentNode().getIsDraft(),
}}
>
{commentNode().getThreadId() ?? 'NO # ID'}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PasteNode.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PasteNode.tsx
index 431cc44607..17a4490fc8 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PasteNode.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/PasteNode.tsx
@@ -96,7 +96,7 @@ export function PasteNode(props: PasteNodeDecoratorProps) {
<div
contentEditable={false}
class={cn(
- 'relative my-2 w-full rounded border border-edge bg-surface no-select-children select-none overflow-hidden cursor-pointer',
+ 'relative my-2 w-full rounded border border-edge bg-surface no-select-children select-none overflow-hidden',
isSelectedAsNode() && 'bg-active outline-edge outline-4'
)}
on:click={(e) => {
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx
index add7e42a2b..78b508f69c 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/blame-tooltip/BlameTooltip.tsx
@@ -82,7 +82,7 @@ export function BlameTooltip(props: {
<Show when={visible() && query.data?.userId ? query.data : undefined}>
{(b) => (
<div
- class="fixed z-tool-tip rounded-md bg-surface px-2 py-1 text-xs text-ink-secondary/70 pointer-events-none"
+ class="fixed z-tool-tip rounded-md bg-surface px-2 py-1 text-xs text-ink-muted/70 pointer-events-none"
style={{
left: `${props.state.x + 12}px`,
top: `${props.state.y + 12}px`,
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/styles.css b/apps/web/src/lib/core/component/LexicalMarkdown/styles.css
index 9450047895..646da0e379 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/styles.css
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/styles.css
@@ -586,11 +586,11 @@ mark {
}
.highlighted {
- background-color: rgb(from var(--color-accent-270) r g b / 0.3);
+ background-color: rgb(from var(--color-accent) r g b / 0.3);
}
.md-highlight-selected-nodes {
- background-color: rgb(from var(--color-accent-270) r g b / 0.2);
+ background-color: rgb(from var(--color-accent) r g b / 0.2);
transition: background-color 0.3s ease;
}
@@ -646,7 +646,7 @@ mark {
.diff-insert {
background: color-mix(
in srgb,
- var(--diff-author, hsl(145, 63%, 42%)) 24%,
+ var(--diff-author-color, hsl(145, 63%, 42%)) 24%,
transparent
);
border-radius: 2px;
@@ -654,6 +654,6 @@ mark {
.diff-delete {
text-decoration: line-through;
- text-decoration-color: var(--diff-author, hsl(0, 65%, 55%));
+ text-decoration-color: var(--diff-author-color, hsl(0, 65%, 55%));
opacity: 0.6;
}
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts b/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts
index 5a6b593f97..a1acdcfd03 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/theme.ts
@@ -150,7 +150,7 @@ export const aiChatTheme = createTheme(
heading: {
h1: 'text-2xl font-semibold mb-5',
h2: 'text-xl font-semibold mb-4',
- h3: 'text-l font-semibold mb-3',
+ h3: 'text-lg font-semibold mb-3',
h4: 'text-base font-medium',
h5: 'text-base font-medium',
h6: 'text-base font-medium',
@@ -180,7 +180,7 @@ export const channelThemeSender = createTheme(
{
text: {
base: 'text-current',
- code: 'chat-blue font-mono rounded md-inline-code border pt-0.5 bg-[navy]/20 border border-[navy]/23',
+ code: 'chat-blue font-mono rounded md-inline-code pt-0.5 bg-[navy]/20 border border-[navy]/23',
},
quote: 'border-l-2 border-current/20 pl-4 py-2 italic text-current/80 my-4',
list: {
diff --git a/apps/web/src/lib/core/component/PcNoiseGrid.tsx b/apps/web/src/lib/core/component/PcNoiseGrid.tsx
index ee2bf3de3d..c06fa9cbbd 100644
--- a/apps/web/src/lib/core/component/PcNoiseGrid.tsx
+++ b/apps/web/src/lib/core/component/PcNoiseGrid.tsx
@@ -202,6 +202,9 @@ export function PcNoiseGrid(props: {
});
return (
- <canvas ref={canvas} class="pointer-none bg-inherit size-full block" />
+ <canvas
+ ref={canvas}
+ class="pointer-events-none bg-inherit size-full block"
+ />
);
}
diff --git a/apps/web/src/lib/core/component/References.tsx b/apps/web/src/lib/core/component/References.tsx
index 0831536fb4..15dfd1b3ea 100644
--- a/apps/web/src/lib/core/component/References.tsx
+++ b/apps/web/src/lib/core/component/References.tsx
@@ -86,7 +86,7 @@ function ReferenceRow(props: ReferenceRowProps) {
<div
role="button"
tabIndex={0}
- class="group/ref-row flex flex-col px-3 py-2 hover:bg-ink-muted/6 min-w-0 overflow-hidden cursor-pointer"
+ class="group/ref-row flex flex-col px-3 py-2 hover:bg-ink-muted/6 min-w-0 overflow-hidden"
onMouseDown={navHandlers.onMouseDown}
onClick={navHandlers.onClick}
onKeyDown={(e) => {
diff --git a/apps/web/src/lib/core/component/Themes.tsx b/apps/web/src/lib/core/component/Themes.tsx
index e6822ac7cb..c8983a0f45 100644
--- a/apps/web/src/lib/core/component/Themes.tsx
+++ b/apps/web/src/lib/core/component/Themes.tsx
@@ -65,7 +65,7 @@ export const themeStyles: Record<Theme, string> = {
const _themeSelectedColors: Record<Theme, string> = {
base: 'bg-hover!',
accent: 'bg-accent/20!',
- accentFill: 'bg-acent/80',
+ accentFill: 'bg-accent/80',
accentOpaque:
'bg-[oklch(from_var(--color-accent)_calc(l*1.4)_calc(c*0.15)_h)]!',
contrast: 'bg-ink/20!',
diff --git a/apps/web/src/lib/core/internal/DataDebug.tsx b/apps/web/src/lib/core/internal/DataDebug.tsx
index 55030ebe3c..e7f1ac682f 100644
--- a/apps/web/src/lib/core/internal/DataDebug.tsx
+++ b/apps/web/src/lib/core/internal/DataDebug.tsx
@@ -94,7 +94,7 @@ const DataDebug: Component = () => {
}
></Bar>
<div class="flex flex-col gap-6 p-6 overflow-scroll">
- <div class="grid grid-cols-2 @width-md/split:-grid-cols-1 gap-6">
+ <div class="grid grid-cols-2 @max-md/split:grid-cols-1 gap-6">
<SignalDebugCard
title="useContacts()"
data={contacts()}
diff --git a/apps/web/src/lib/core/internal/IconGallery.tsx b/apps/web/src/lib/core/internal/IconGallery.tsx
index 93633f9396..cc234940e0 100644
--- a/apps/web/src/lib/core/internal/IconGallery.tsx
+++ b/apps/web/src/lib/core/internal/IconGallery.tsx
@@ -5,21 +5,20 @@ import { Dynamic } from 'solid-js/web';
// Theme color swatches - uses CSS variables from the theme
const THEME_COLORS = [
- // Row 1: Accent hue wheel (0, 60, 120, 180, 240)
- { name: 'Accent', value: 'accent', css: 'var(--color-accent)' },
- { name: 'Accent +60°', value: 'accent-60', css: 'var(--color-accent-60)' },
- { name: 'Accent +120°', value: 'accent-120', css: 'var(--color-accent-120)' },
- { name: 'Accent +180°', value: 'accent-180', css: 'var(--color-accent-180)' },
- { name: 'Accent +240°', value: 'accent-240', css: 'var(--color-accent-240)' },
- // Row 2: Accent hue wheel (30, 90, 150, 210, 270)
- { name: 'Accent +30°', value: 'accent-30', css: 'var(--color-accent-30)' },
- { name: 'Accent +90°', value: 'accent-90', css: 'var(--color-accent-90)' },
- { name: 'Accent +150°', value: 'accent-150', css: 'var(--color-accent-150)' },
- { name: 'Accent +210°', value: 'accent-210', css: 'var(--color-accent-210)' },
- { name: 'Accent +270°', value: 'accent-270', css: 'var(--color-accent-270)' },
- // Row 3: Accent hue wheel (300, 330) + semantic colors
- { name: 'Accent +300°', value: 'accent-300', css: 'var(--color-accent-300)' },
- { name: 'Accent +330°', value: 'accent-330', css: 'var(--color-accent-330)' },
+ // Rows 1–3: authored palette colors
+ { name: 'Red', value: 'red', css: 'var(--color-red)' },
+ { name: 'Orange', value: 'orange', css: 'var(--color-orange)' },
+ { name: 'Amber', value: 'amber', css: 'var(--color-amber)' },
+ { name: 'Yellow', value: 'yellow', css: 'var(--color-yellow)' },
+ { name: 'Lime', value: 'lime', css: 'var(--color-lime)' },
+ { name: 'Green', value: 'green', css: 'var(--color-green)' },
+ { name: 'Teal', value: 'teal', css: 'var(--color-teal)' },
+ { name: 'Cyan', value: 'cyan', css: 'var(--color-cyan)' },
+ { name: 'Blue', value: 'blue', css: 'var(--color-blue)' },
+ { name: 'Violet', value: 'violet', css: 'var(--color-violet)' },
+ { name: 'Purple', value: 'purple', css: 'var(--color-purple)' },
+ { name: 'Pink', value: 'pink', css: 'var(--color-pink)' },
+ // Row 3 continued: semantic colors
{ name: 'Failure', value: 'failure', css: 'var(--color-failure)' },
{ name: 'Success', value: 'success', css: 'var(--color-success)' },
{ name: 'Alert', value: 'alert', css: 'var(--color-alert)' },
@@ -224,7 +223,7 @@ export default function IconGallery() {
{/* Color picker - 5 column grid of tiny rounded squares */}
<div class="mb-3">
<span class="mb-1.5 block text-xs text-ink">
- Color: <span class="text-muted">{selectedColor().name}</span>
+ Color: <span class="text-ink-muted">{selectedColor().name}</span>
</span>
<div class="inline-grid grid-cols-5 gap-1">
{/* Theme color swatches */}
@@ -245,7 +244,7 @@ export default function IconGallery() {
</div>
{/* Custom color option */}
<div class="mt-1.5 flex items-center gap-1.5">
- <span class="text-xxs text-muted">Custom</span>
+ <span class="text-xxs text-ink-muted">Custom</span>
<label
class="relative size-2.5 rounded-[1px] transition-transform hover:scale-125"
classList={{
@@ -288,7 +287,7 @@ export default function IconGallery() {
onInput={(e) => setIconSize(Number(e.currentTarget.value))}
class="icon-gallery-slider w-24"
/>
- <span class="w-8 text-xxs text-muted">{iconSize()}px</span>
+ <span class="w-8 text-xxs text-ink-muted">{iconSize()}px</span>
</label>
<button
onClick={triggerAllAnimations}
@@ -324,7 +323,9 @@ export default function IconGallery() {
>
<Dynamic component={staticComponent()} />
</div>
- <span class="mt-2 text-[8px] text-muted">static</span>
+ <span class="mt-2 text-[8px] text-ink-muted">
+ static
+ </span>
</div>
)}
</Show>
@@ -356,10 +357,10 @@ export default function IconGallery() {
/>
</div>
<div class="mt-2 flex items-center gap-1">
- <span class="text-[8px] text-muted">animated</span>
+ <span class="text-[8px] text-ink-muted">animated</span>
<button
onClick={() => triggerAnimation(pair.name)}
- class="flex size-2.5 items-center justify-center rounded-full border border-current text-muted transition-colors hover:bg-ink/10 hover:text-ink"
+ class="flex size-2.5 items-center justify-center rounded-full border border-current text-ink-muted transition-colors hover:bg-ink/10 hover:text-ink"
title="Play animation"
>
<svg
@@ -398,7 +399,7 @@ export default function IconGallery() {
>
<icon.component />
</div>
- <span class="mt-2 text-[8px] text-muted">{icon.name}</span>
+ <span class="mt-2 text-[8px] text-ink-muted">{icon.name}</span>
</div>
)}
</For>
diff --git a/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx b/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx
index 6eb4ba861f..4d6c665dee 100644
--- a/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx
+++ b/apps/web/src/lib/core/internal/PixelArtIconDemo.tsx
@@ -490,10 +490,10 @@ function GlyphGrid(props: GlyphGridProps) {
class="items-center border relative group transition-colors justify-self-stretch"
classList={{
'border-edge bg-edge': isSelected(),
- 'border-edge bg-background hover:bg-edge': !isSelected(),
+ 'border-edge bg-surface hover:bg-edge': !isSelected(),
}}
>
- <div class="size-20 flex items-center justify-center mx-auto m-2">
+ <div class="size-20 flex items-center justify-center mx-auto my-2">
<Show when={pixels().length > 0}>
<PixelIcon
pixels={pixels()}
@@ -874,7 +874,7 @@ function GlyphEditor(props: GlyphEditorProps) {
<h3 class="font-mono text-ink-extra-muted text-xs">
[ PREVIEW ]
</h3>
- <div class="size-24 flex items-center justify-center border border-edge bg-background">
+ <div class="size-24 flex items-center justify-center border border-edge bg-surface">
<PixelIcon
pixels={pixels()}
iconSize={iconSize()}
@@ -1095,7 +1095,7 @@ function GlyphSidebar(props: GlyphSidebarProps) {
}}
class="font-mono text-ink-muted text-sm text-left w-full border border-edge"
/>
- <div class="size-32 flex items-center justify-center border border-edge bg-background">
+ <div class="size-32 flex items-center justify-center border border-edge bg-surface">
<Show when={selectedPixels()}>
<PixelIcon
pixels={selectedPixels()!}
diff --git a/apps/web/src/lib/core/internal/ResizeDemo.tsx b/apps/web/src/lib/core/internal/ResizeDemo.tsx
index 4f0f204fa1..56cc631f27 100644
--- a/apps/web/src/lib/core/internal/ResizeDemo.tsx
+++ b/apps/web/src/lib/core/internal/ResizeDemo.tsx
@@ -20,7 +20,7 @@ function PanelCard(
) {
return (
<div
- class="size-full bg-surface flex overflow-hidden flex-col border border-edge focus-within:border-accent -ring-offset-2 focus-within:ring-2 focus-within:ring-accent group"
+ class="size-full bg-surface flex overflow-hidden flex-col border border-edge focus-within:border-accent ring-inset focus-within:ring-2 focus-within:ring-accent group"
id={props.id}
>
<div class="bg-edge flex-0 p-2 text-ink flex items-center justify-between group-focus-within:bg-accent group-focus-within:text-surface">
@@ -78,7 +78,7 @@ function VerticalPanelCard(
) {
return (
<div
- class="size-full bg-surface flex overflow-hidden flex-col border border-edge focus-within:border-accent -ring-offset-2 focus-within:ring-2 focus-within:ring-accent group"
+ class="size-full bg-surface flex overflow-hidden flex-col border border-edge focus-within:border-accent ring-inset focus-within:ring-2 focus-within:ring-accent group"
id={props.id}
>
<div class="bg-edge flex-0 p-2 text-ink flex items-center justify-between group-focus-within:bg-accent group-focus-within:text-surface">
@@ -278,7 +278,7 @@ export default function ResizeDemo() {
};
return (
- <div class="size-full flex-flex-col">
+ <div class="size-full flex flex-col">
<Bar
left={
<div class="p-2 text-sm w-2xl truncate">
diff --git a/apps/web/src/lib/core/internal/ThemeDebug.tsx b/apps/web/src/lib/core/internal/ThemeDebug.tsx
index bb893bcf86..9a4c38465e 100644
--- a/apps/web/src/lib/core/internal/ThemeDebug.tsx
+++ b/apps/web/src/lib/core/internal/ThemeDebug.tsx
@@ -343,19 +343,19 @@ function ThemeDebug() {
<Badge variant="outline" size="sm">
<span
aria-hidden="true"
- class="size-2 rounded-full bg-blue"
+ class="size-2 rounded-full bg-folder"
/>
tags
</Badge>
<Badge variant="outline" size="sm">
<span
aria-hidden="true"
- class="size-2 rounded-full bg-pink"
+ class="size-2 rounded-full bg-snippet"
/>
tags-ux
</Badge>
<Badge variant="outline" size="sm">
- <span class="inline-flex size-[1em] items-center justify-center rounded-full bg-pink text-surface-4">
+ <span class="inline-flex size-[1em] items-center justify-center rounded-full bg-snippet text-surface-4">
<CheckIcon aria-hidden="true" class="size-[0.65em]" />
</span>
Completed
diff --git a/packages/collaboration/src/internal/palette.ts b/packages/collaboration/src/internal/palette.ts
index 475c0e2391..5f93e068cb 100644
--- a/packages/collaboration/src/internal/palette.ts
+++ b/packages/collaboration/src/internal/palette.ts
@@ -1,15 +1,15 @@
const palette = [
- 'accent-30',
- 'accent-60',
- 'accent-90',
- 'accent-120',
- 'accent-150',
- 'accent-180',
- 'accent-210',
- 'accent-240',
- 'accent-270',
- 'accent-300',
- 'accent-330',
+ 'red',
+ 'orange',
+ 'yellow',
+ 'lime',
+ 'green',
+ 'teal',
+ 'cyan',
+ 'blue',
+ 'violet',
+ 'purple',
+ 'pink',
] as const;
/** Pick a collaboration cursor color from Macro's shared accent palette. */
diff --git a/packages/lexical-core/nodes/DiffTextNode.ts b/packages/lexical-core/nodes/DiffTextNode.ts
index 8a9992b45f..741bd2b5fe 100644
--- a/packages/lexical-core/nodes/DiffTextNode.ts
+++ b/packages/lexical-core/nodes/DiffTextNode.ts
@@ -14,20 +14,8 @@ export type SerializedDiffTextNode = Spread<
SerializedTextNode
>;
-const LANE_HUES = [30, 60, 90, 120, 150, 180, 210, 240, 270, 300, 330];
-
-export function diffAuthorColor(author: string): string {
- // claude hashing magic
- let hash = 0x811c9dc5;
- for (let i = 0; i < author.length; i++) {
- hash ^= author.charCodeAt(i);
- hash = Math.imul(hash, 0x01000193);
- }
- return `var(--color-accent-${LANE_HUES[(hash >>> 0) % LANE_HUES.length]})`;
-}
-
// Inline diff marker: a TextNode that renders highlighted (insert) or struck
-// (delete), tinted by its author's color via a per-node `--diff-author`
+// (delete) and exposes its author for app-owned attribution and tinting.
export class DiffTextNode extends TextNode {
__diffStatus: DiffStatus;
__author: string;
@@ -60,8 +48,6 @@ export class DiffTextNode extends TextNode {
dom.dataset.diffStatus = this.__diffStatus;
if (this.__author) {
dom.dataset.diffAuthor = this.__author;
- // Tint this run by its own editor, overriding the container default.
- dom.style.setProperty('--diff-author', diffAuthorColor(this.__author));
}
return dom;
}
diff --git a/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.test.ts b/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.test.ts
index e04954a64f..5825222593 100644
--- a/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.test.ts
+++ b/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.test.ts
@@ -86,7 +86,7 @@ describe('realAwarenessSource (no live mirror)', () => {
doc: { getContainerById: () => null } as any,
send,
name: 'Sam (AI)',
- color: 'accent-30',
+ color: 'red',
});
src.apply({ type: 'cursor', node: 'missing', at: 0 });
expect(send).not.toHaveBeenCalled();
@@ -102,7 +102,7 @@ describe('realAwarenessSource (no live mirror)', () => {
doc,
send,
name: 'Sam (AI)',
- color: 'accent-30',
+ color: 'red',
});
src.apply({ type: 'cursor', node: 't1', at: 3 });
@@ -130,7 +130,7 @@ describe('realAwarenessSource (no live mirror)', () => {
doc,
send,
name: 'Sam (AI)',
- color: 'accent-30',
+ color: 'red',
});
src.apply({ type: 'cursor', node: 't1', at: 3 });
diff --git a/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.ts b/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.ts
index 4952696fef..53d68c94fd 100644
--- a/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.ts
+++ b/services/ai-editing-worker/src/ai-editing/awareness/awareness-source.ts
@@ -36,14 +36,7 @@ export const AI_NAMES = [
'Hutch',
].map((n) => `${n} (AI)`);
/** Palette names must resolve to `--color-<name>` (see collaboration/color.ts). */
-export const COLORS = [
- 'accent-210',
- 'accent-30',
- 'accent-90',
- 'accent-150',
- 'accent-270',
- 'accent-330',
-];
+export const COLORS = ['cyan', 'red', 'yellow', 'green', 'violet', 'pink'];
/** How long the cursor lingers after a writer finishes before it disappears. */
const LINGER_MS = 700;