Skip to content

🙌 OpenHands: AI-Driven Development

design: cool-grey palette, runtime theme switcher, and token-system cleanup (#458)

FraterCCCLXIIIe1f5a6662f07
diff --git a/__tests__/components/backends/backend-selector.test.tsx b/__tests__/components/backends/backend-selector.test.tsx
index f49b26e4c7..19e1e292b7 100644
--- a/__tests__/components/backends/backend-selector.test.tsx
+++ b/__tests__/components/backends/backend-selector.test.tsx
@@ -733,7 +733,7 @@ describe("BackendSelector", () => {
);
const settingsButton = screen.getByTestId("backend-selector-settings-link");
- expect(settingsButton.className).toContain("bg-[#1f1f1f99]");
+ expect(settingsButton.className).toContain("bg-tertiary");
expect(settingsButton.className).toContain("text-white");
const user = await openDropdown();
diff --git a/__tests__/components/context-menu/context-menu-container.test.tsx b/__tests__/components/context-menu/context-menu-container.test.tsx
index 29e74021e2..cc9e619209 100644
--- a/__tests__/components/context-menu/context-menu-container.test.tsx
+++ b/__tests__/components/context-menu/context-menu-container.test.tsx
@@ -27,9 +27,9 @@ describe("ContextMenuContainer", () => {
);
const container = screen.getByTestId("test-container");
- expect(container).toHaveClass("bg-[#050505]");
+ expect(container).toHaveClass("bg-[var(--oh-surface-deep)]");
expect(container).toHaveClass("border");
- expect(container).toHaveClass("border-[#242424]");
+ expect(container).toHaveClass("border-[var(--oh-border-subtle)]");
expect(container).toHaveClass("rounded-[12px]");
expect(container).toHaveClass("p-[25px]");
expect(container).toHaveClass("context-menu-box-shadow");
diff --git a/__tests__/components/features/chat/components/chat-input-model.test.tsx b/__tests__/components/features/chat/components/chat-input-model.test.tsx
index 91a5548d8d..138f7a378a 100644
--- a/__tests__/components/features/chat/components/chat-input-model.test.tsx
+++ b/__tests__/components/features/chat/components/chat-input-model.test.tsx
@@ -31,7 +31,9 @@ describe("ChatInputModel", () => {
expect(model).toBeInTheDocument();
expect(model).toHaveTextContent("openai/gpt-4o");
expect(model).toHaveAttribute("title", "openai/gpt-4o");
- expect(screen.queryByTestId("chat-input-llm-model-popover")).not.toBeInTheDocument();
+ expect(
+ screen.queryByTestId("chat-input-llm-model-popover"),
+ ).not.toBeInTheDocument();
fireEvent.click(model);
const popover = screen.getByTestId("chat-input-llm-model-popover");
@@ -63,9 +65,9 @@ describe("ChatInputModel", () => {
// Assert — button shows the full name (no truncation),
// and the popover renders the same full string.
expect(button).toHaveTextContent(longModel);
- expect(screen.getByTestId("chat-input-llm-model-popover")).toHaveTextContent(
- longModel,
- );
+ expect(
+ screen.getByTestId("chat-input-llm-model-popover"),
+ ).toHaveTextContent(longModel);
});
it("renders nothing when llm_model is missing", () => {
diff --git a/__tests__/components/features/chat/git-control-bar-repo-button.test.tsx b/__tests__/components/features/chat/git-control-bar-repo-button.test.tsx
index d6fc20b482..3799fd5458 100644
--- a/__tests__/components/features/chat/git-control-bar-repo-button.test.tsx
+++ b/__tests__/components/features/chat/git-control-bar-repo-button.test.tsx
@@ -18,14 +18,11 @@ vi.mock("#/components/shared/git-provider-icon", () => ({
}));
// Mock GitExternalLinkIcon
-vi.mock(
- "#/components/features/chat/git-external-link-icon",
- () => ({
- GitExternalLinkIcon: () => (
- <span data-testid="git-external-link-icon">external</span>
- ),
- }),
-);
+vi.mock("#/components/features/chat/git-external-link-icon", () => ({
+ GitExternalLinkIcon: () => (
+ <span data-testid="git-external-link-icon">external</span>
+ ),
+}));
// Mock RepoForkedIcon
vi.mock("#/icons/repo-forked.svg?react", () => ({
@@ -86,9 +83,7 @@ describe("GitControlBarRepoButton", () => {
/>,
);
- expect(
- screen.queryByTestId("repo-forked-icon"),
- ).not.toBeInTheDocument();
+ expect(screen.queryByTestId("repo-forked-icon")).not.toBeInTheDocument();
});
});
@@ -131,9 +126,7 @@ describe("GitControlBarRepoButton", () => {
expect(
screen.getByTestId("git-control-bar-connect-repo-icon"),
).toBeInTheDocument();
- expect(
- screen.queryByTestId("repo-forked-icon"),
- ).not.toBeInTheDocument();
+ expect(screen.queryByTestId("repo-forked-icon")).not.toBeInTheDocument();
});
it("should not show external link icon", () => {
diff --git a/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx b/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx
index 97090455fc..bc304c3610 100644
--- a/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx
+++ b/__tests__/components/features/diff-viewer/file-diff-viewer.test.tsx
@@ -173,12 +173,12 @@ describe("FileDiffViewer", () => {
await expand(user);
- expect(screen.getByTestId("view-mode-diff").className).toContain("bg-[#474A54] text-white");
- expect(screen.getByTestId("view-mode-old").className).not.toContain("bg-[#474A54] text-white");
+ expect(screen.getByTestId("view-mode-diff").className).toContain("bg-[var(--oh-interactive-hover)] text-white");
+ expect(screen.getByTestId("view-mode-old").className).not.toContain("bg-[var(--oh-interactive-hover)] text-white");
await user.click(screen.getByTestId("view-mode-old"));
- expect(screen.getByTestId("view-mode-old").className).toContain("bg-[#474A54] text-white");
- expect(screen.getByTestId("view-mode-diff").className).not.toContain("bg-[#474A54] text-white");
+ expect(screen.getByTestId("view-mode-old").className).toContain("bg-[var(--oh-interactive-hover)] text-white");
+ expect(screen.getByTestId("view-mode-diff").className).not.toContain("bg-[var(--oh-interactive-hover)] text-white");
});
});
diff --git a/__tests__/components/features/sidebar/sidebar.test.tsx b/__tests__/components/features/sidebar/sidebar.test.tsx
index 0ba8a15279..9ea4b9ae42 100644
--- a/__tests__/components/features/sidebar/sidebar.test.tsx
+++ b/__tests__/components/features/sidebar/sidebar.test.tsx
@@ -213,11 +213,13 @@ describe("Sidebar", () => {
},
);
- it("renders sidebar nav links with the default text color (text-[#8C8C8C])", () => {
+ it("renders sidebar nav links with the muted default text color", () => {
renderSidebar("/skills");
const conversationsLink = screen.getByTestId("sidebar-conversations-link");
- expect(conversationsLink.className).toMatch(/(^|\s)text-\[#8C8C8C\](\s|$)/);
+ expect(conversationsLink.className).toMatch(
+ /(^|\s)text-\[var\(--oh-muted\)\](\s|$)/,
+ );
});
it("toggles between expanded and collapsed states and persists the choice", () => {
diff --git a/__tests__/components/settings/llm-profiles/profile-name-input.test.tsx b/__tests__/components/settings/llm-profiles/profile-name-input.test.tsx
index 6cb1c75179..1a2f13896c 100644
--- a/__tests__/components/settings/llm-profiles/profile-name-input.test.tsx
+++ b/__tests__/components/settings/llm-profiles/profile-name-input.test.tsx
@@ -85,7 +85,7 @@ describe("ProfileNameInput", () => {
);
const rule = screen.getByTestId("rule-text");
- expect(rule).toHaveClass("text-gray-400");
+ expect(rule).toHaveClass("text-[var(--oh-muted)]");
expect(rule).not.toHaveClass("text-red-400");
});
@@ -100,7 +100,7 @@ describe("ProfileNameInput", () => {
const rule = screen.getByTestId("rule-text");
expect(rule).toHaveClass("text-red-400");
- expect(rule).not.toHaveClass("text-gray-400");
+ expect(rule).not.toHaveClass("text-[var(--oh-muted)]");
});
it("shows rule text in gray for empty value (treated as valid)", () => {
@@ -109,7 +109,7 @@ describe("ProfileNameInput", () => {
);
const rule = screen.getByTestId("rule-text");
- expect(rule).toHaveClass("text-gray-400");
+ expect(rule).toHaveClass("text-[var(--oh-muted)]");
});
it("shows rule text in red for whitespace-only value", () => {
@@ -206,7 +206,7 @@ describe("ProfileNameInput", () => {
/>,
);
// Valid names show gray rule text
- expect(screen.getByTestId("rule")).toHaveClass("text-gray-400");
+ expect(screen.getByTestId("rule")).toHaveClass("text-[var(--oh-muted)]");
});
it("rejects 65 character names", () => {
@@ -230,7 +230,7 @@ describe("ProfileNameInput", () => {
ruleTestId="rule"
/>,
);
- expect(screen.getByTestId("rule")).toHaveClass("text-gray-400");
+ expect(screen.getByTestId("rule")).toHaveClass("text-[var(--oh-muted)]");
});
it("accepts names with all allowed special characters", () => {
@@ -241,7 +241,7 @@ describe("ProfileNameInput", () => {
ruleTestId="rule"
/>,
);
- expect(screen.getByTestId("rule")).toHaveClass("text-gray-400");
+ expect(screen.getByTestId("rule")).toHaveClass("text-[var(--oh-muted)]");
});
it("rejects names starting with special characters", () => {
diff --git a/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx b/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx
index 0032850ef9..074b55e85b 100644
--- a/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx
+++ b/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx
@@ -6,11 +6,14 @@ import AgentServerConversationService from "#/api/conversation-service/agent-ser
import type { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
// Mock the AgentServerConversationService
-vi.mock("#/api/conversation-service/agent-server-conversation-service.api", () => ({
- default: {
- updateConversationRepository: vi.fn(),
- },
-}));
+vi.mock(
+ "#/api/conversation-service/agent-server-conversation-service.api",
+ () => ({
+ default: {
+ updateConversationRepository: vi.fn(),
+ },
+ }),
+);
// Mock react-i18next
vi.mock("react-i18next", () => ({
@@ -59,9 +62,9 @@ describe("useUpdateConversationRepository", () => {
git_provider: "github",
};
- vi.mocked(AgentServerConversationService.updateConversationRepository).mockResolvedValue(
- mockResponse as any,
- );
+ vi.mocked(
+ AgentServerConversationService.updateConversationRepository,
+ ).mockResolvedValue(mockResponse as any);
const { Wrapper } = createWrapper();
const { result } = renderHook(() => useUpdateConversationRepository(), {
@@ -79,7 +82,9 @@ describe("useUpdateConversationRepository", () => {
expect(result.current.isSuccess).toBe(true);
});
- expect(AgentServerConversationService.updateConversationRepository).toHaveBeenCalledWith(
+ expect(
+ AgentServerConversationService.updateConversationRepository,
+ ).toHaveBeenCalledWith(
"test-conversation-id",
"owner/repo",
"main",
@@ -95,9 +100,9 @@ describe("useUpdateConversationRepository", () => {
git_provider: null,
};
- vi.mocked(AgentServerConversationService.updateConversationRepository).mockResolvedValue(
- mockResponse as any,
- );
+ vi.mocked(
+ AgentServerConversationService.updateConversationRepository,
+ ).mockResolvedValue(mockResponse as any);
const { Wrapper } = createWrapper();
const { result } = renderHook(() => useUpdateConversationRepository(), {
@@ -115,18 +120,15 @@ describe("useUpdateConversationRepository", () => {
expect(result.current.isSuccess).toBe(true);
});
- expect(AgentServerConversationService.updateConversationRepository).toHaveBeenCalledWith(
- "test-conversation-id",
- null,
- null,
- null,
- );
+ expect(
+ AgentServerConversationService.updateConversationRepository,
+ ).toHaveBeenCalledWith("test-conversation-id", null, null, null);
});
it("should handle errors gracefully", async () => {
- vi.mocked(AgentServerConversationService.updateConversationRepository).mockRejectedValue(
- new Error("Failed to update repository"),
- );
+ vi.mocked(
+ AgentServerConversationService.updateConversationRepository,
+ ).mockRejectedValue(new Error("Failed to update repository"));
const { Wrapper } = createWrapper();
const { result } = renderHook(() => useUpdateConversationRepository(), {
diff --git a/__tests__/routes/files-tab.test.tsx b/__tests__/routes/files-tab.test.tsx
index 4f96e403b2..8529e9132e 100644
--- a/__tests__/routes/files-tab.test.tsx
+++ b/__tests__/routes/files-tab.test.tsx
@@ -315,7 +315,7 @@ describe("FilesTab", () => {
// color (so it blends with the surrounding chrome) and project white
// text — both spelled out in the user's design ask.
const container = screen.getByTestId("file-content-viewer-markdown");
- expect(container.className).toContain("bg-[#25272D]");
+ expect(container.className).toContain("bg-[var(--oh-surface)]");
expect(container.className).toContain("text-white");
});
diff --git a/__tests__/routes/task-list-tab.test.tsx b/__tests__/routes/task-list-tab.test.tsx
index d5718d1749..83994b5a57 100644
--- a/__tests__/routes/task-list-tab.test.tsx
+++ b/__tests__/routes/task-list-tab.test.tsx
@@ -117,13 +117,13 @@ describe("TaskListTab", () => {
// Find each task item via its text, then check the wrapper div
const activeItem = screen.getByText("Active task").closest("[data-name]");
const activeWrapper = activeItem?.parentElement;
- expect(activeWrapper?.className).toContain("bg-[#2D3039]");
+ expect(activeWrapper?.className).toContain("bg-[var(--oh-surface-raised)]");
const todoItem = screen.getByText("Todo task").closest("[data-name]");
- expect(todoItem?.parentElement?.className).not.toContain("bg-[#2D3039]");
+ expect(todoItem?.parentElement?.className).not.toContain("bg-[var(--oh-surface-raised)]");
const doneItem = screen.getByText("Done task").closest("[data-name]");
- expect(doneItem?.parentElement?.className).not.toContain("bg-[#2D3039]");
+ expect(doneItem?.parentElement?.className).not.toContain("bg-[var(--oh-surface-raised)]");
});
it("displays task notes when present and omits when absent", () => {
diff --git a/__tests__/stores/conversation-store.test.ts b/__tests__/stores/conversation-store.test.ts
index c88e77aa3b..462db9aaf0 100644
--- a/__tests__/stores/conversation-store.test.ts
+++ b/__tests__/stores/conversation-store.test.ts
@@ -7,7 +7,9 @@ const defaultConversationState = {
conversationMode: "code" as const,
};
-const mockGetConversationState = vi.fn((_id: string) => defaultConversationState);
+const mockGetConversationState = vi.fn(
+ (_id: string) => defaultConversationState,
+);
const mockSetConversationState = vi.fn();
vi.mock("#/utils/conversation-local-storage", () => ({
diff --git a/__tests__/ui/card.test.tsx b/__tests__/ui/card.test.tsx
index 3445878239..88a266cb96 100644
--- a/__tests__/ui/card.test.tsx
+++ b/__tests__/ui/card.test.tsx
@@ -30,8 +30,8 @@ describe("Card", () => {
render(<Card testId="test-card">Content</Card>);
const card = screen.getByTestId("test-card");
- expect(card).toHaveClass("bg-[#26282D]");
- expect(card).toHaveClass("border-[#727987]");
+ expect(card).toHaveClass("bg-[var(--oh-surface)]");
+ expect(card).toHaveClass("border-[var(--oh-border)]");
expect(card).toHaveClass("rounded-xl");
});
@@ -44,7 +44,7 @@ describe("Card", () => {
const card = screen.getByTestId("test-card");
expect(card).toHaveClass("bg-transparent");
- expect(card).toHaveClass("border-[#727987]");
+ expect(card).toHaveClass("border-[var(--oh-border)]");
});
it("should apply dark theme styles", () => {
@@ -56,7 +56,7 @@ describe("Card", () => {
const card = screen.getByTestId("test-card");
expect(card).toHaveClass("bg-black");
- expect(card).toHaveClass("border-[#242424]");
+ expect(card).toHaveClass("border-[var(--oh-border-subtle)]");
expect(card).toHaveClass("rounded-2xl");
});
});
@@ -95,7 +95,7 @@ describe("Card", () => {
);
const card = screen.getByTestId("test-card");
- expect(card).not.toHaveClass("bg-[#0A0A0A80]");
+ expect(card.className).not.toContain("--cool-grey-975");
});
it("should apply standard gradient styles", () => {
@@ -106,8 +106,8 @@ describe("Card", () => {
);
const card = screen.getByTestId("test-card");
- expect(card).toHaveClass("bg-[#0A0A0A80]");
- expect(card).toHaveClass("border-t-[#24242499]");
+ expect(card.className).toContain("--cool-grey-975");
+ expect(card.className).toContain("--cool-grey-925");
});
});
@@ -121,10 +121,10 @@ describe("Card", () => {
const card = screen.getByTestId("test-card");
// Should have dark theme base
- expect(card).toHaveClass("border-[#242424]");
+ expect(card).toHaveClass("border-[var(--oh-border-subtle)]");
expect(card).toHaveClass("rounded-2xl");
// Should have gradient overlay
- expect(card).toHaveClass("bg-[#0A0A0A80]");
+ expect(card.className).toContain("--cool-grey-975");
});
it("should apply dark theme with elevated hover", () => {
diff --git a/hero.ts b/hero.ts
index fd0add045a..d7f6a41c91 100644
--- a/hero.ts
+++ b/hero.ts
@@ -12,6 +12,53 @@ export default heroui({
dark: {
colors: {
primary: "#4465DB",
+
+ // Map HeroUI's zinc-based semantic colours to our cool-grey palette.
+ // This ensures every HeroUI component that uses bg-default, bg-content*,
+ // etc. stays within the same colour family as the rest of the UI.
+
+ background: {
+ DEFAULT: "#0B0E14", // cool-grey-950 — app shell base
+ foreground: "#F7F9FC", // cool-grey-50
+ },
+
+ foreground: {
+ DEFAULT: "#C3CDDC", // cool-grey-300 — primary readable text
+ "50": "#05070A", // cool-grey-975
+ "100": "#0B0E14", // cool-grey-950
+ "200": "#21252F", // cool-grey-925
+ "300": "#2C313F", // cool-grey-900
+ "400": "#383F50", // cool-grey-800
+ "500": "#4B5468", // cool-grey-700
+ "600": "#626D82", // cool-grey-600
+ "700": "#7E8A9E", // cool-grey-500
+ "800": "#A3B0C4", // cool-grey-400
+ "900": "#C3CDDC", // cool-grey-300
+ },
+
+ // Surface layers: panel → card → inner card → inset
+ content1: { DEFAULT: "#21252F", foreground: "#EEF2F7" }, // cool-grey-925 / 100
+ content2: { DEFAULT: "#2C313F", foreground: "#DCE3EE" }, // cool-grey-900 / 200
+ content3: { DEFAULT: "#383F50", foreground: "#C3CDDC" }, // cool-grey-800 / 300
+ content4: { DEFAULT: "#4B5468", foreground: "#A3B0C4" }, // cool-grey-700 / 400
+
+ focus: {
+ DEFAULT: "#ffffff", // white focus ring — visible on all dark surfaces
+ },
+ default: {
+ "50": "#05070A", // cool-grey-975
+ "100": "#0B0E14", // cool-grey-950
+ "200": "#21252F", // cool-grey-925
+ "300": "#2C313F", // cool-grey-900
+ "400": "#383F50", // cool-grey-800
+ "500": "#4B5468", // cool-grey-700
+ "600": "#626D82", // cool-grey-600
+ "700": "#7E8A9E", // cool-grey-500
+ "800": "#A3B0C4", // cool-grey-400
+ "900": "#C3CDDC", // cool-grey-300
+ DEFAULT: "#383F50", // cool-grey-800 — hover/selected tint
+ foreground: "#F7F9FC", // cool-grey-50 — text on default bg
+ },
},
},
},
diff --git a/scripts/migrate-grey-tokens.mjs b/scripts/migrate-grey-tokens.mjs
new file mode 100644
index 0000000000..8ced26b0ee
--- /dev/null
+++ b/scripts/migrate-grey-tokens.mjs
@@ -0,0 +1,463 @@
+#!/usr/bin/env node
+/**
+ * migrate-grey-tokens.mjs
+ *
+ * Replaces all legacy grey hex values and Tailwind grey utility classes throughout
+ * src/ with the new 13-shade cool-grey token system documented in
+ * artifacts/cool-grey-migration.md.
+ *
+ * Usage:
+ * node scripts/migrate-grey-tokens.mjs # Dry run — shows changes, writes nothing
+ * node scripts/migrate-grey-tokens.mjs --apply # Apply all changes to disk
+ * node scripts/migrate-grey-tokens.mjs --verbose # Also show unchanged files
+ *
+ * What it changes:
+ * • src/index.css — injects --cool-grey-* CSS var block into :root if absent
+ * • src/tailwind.css — injects --color-cool-grey-* @theme entries if absent
+ * • src/ css files — replaces grey hex values → var(--cool-grey-X)
+ * • src/ tsx/ts/jsx files — replaces Tailwind gray-N/neutral-N utility classes +
+ * grey hex values → var(--cool-grey-X)
+ * • src/icons/ svg files — replaces grey fill/stroke hex → currentColor
+ * • src/ other svg files — replaces grey fill/stroke hex → var(--cool-grey-X)
+ *
+ * Alpha variants (#RRGGBBAA) are auto-replaced with color-mix(in srgb, ...) equivalents.
+ */
+
+import { readFileSync, writeFileSync, readdirSync, statSync } from 'fs';
+import { join, extname, relative, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const ROOT = join(__dirname, '..');
+const SRC = join(ROOT, 'src');
+
+const APPLY = process.argv.includes('--apply');
+const VERBOSE = process.argv.includes('--verbose');
+
+// ─── PALETTE ────────────────────────────────────────────────────────────────
+
+const SHADE_TO_HEX = {
+ '50': '#F7F9FC',
+ '100': '#EEF2F7',
+ '200': '#DCE3EE',
+ '300': '#C3CDDC',
+ '400': '#A3B0C4',
+ '500': '#7E8A9E',
+ '600': '#626D82',
+ '700': '#4B5468',
+ '800': '#383F50',
+ '900': '#2C313F',
+ '925': '#21252F',
+ '950': '#111319',
+ '975': '#05070A',
+};
+
+/**
+ * Maps uppercase legacy hex → cool-grey shade number.
+ * All 98 greys from the exhaustive palette analysis (artifacts/cool-grey-migration.md).
+ */
+const HEX_TO_SHADE = {
+ // ── cool-grey-50 (#F7F9FC) ────────────────────────────────────────────────
+ '#F9FBFE': '50', '#F4F4F5': '50', '#FAFAFA': '50',
+ '#FCFCFC': '50', '#F5F5F5': '50', '#F3F4F6': '50',
+ // ── cool-grey-100 (#EEF2F7) ───────────────────────────────────────────────
+ '#ECEDEE': '100', '#E6EDF3': '100', '#E5E5E5': '100',
+ '#EEEEEE': '100', '#E8E8E8': '100',
+ // ── cool-grey-200 (#DCE3EE) ───────────────────────────────────────────────
+ '#E4E7EB': '200', '#E4E4E4': '200', '#E5E7EB': '200', '#DEDFE0': '200',
+ '#D9D9D9': '200', '#D6D6D6': '200', '#D5D9E5': '200', '#D0D9FA': '200',
+ '#D4D4D4': '200', '#D1D5DB': '200',
+ // ── cool-grey-300 (#C3CDDC) ───────────────────────────────────────────────
+ '#C4CBDA': '300', '#C9C7C7': '300', '#B7BDC2': '300',
+ '#B1B9D3': '300', '#AFB8C1': '300',
+ // ── cool-grey-400 (#A3B0C4) ───────────────────────────────────────────────
+ '#9CA3AF': '400', '#959CB2': '400', '#9299AA': '400', '#9099AC': '400',
+ '#A3A3A3': '400', '#A7A7A7': '400', '#A1A1A1': '400',
+ // ── cool-grey-500 (#7E8A9E) ───────────────────────────────────────────────
+ '#8D95A9': '500', '#868E96': '500', '#7E848C': '500',
+ '#8C8C8C': '500', '#969896': '500',
+ // ── cool-grey-600 (#626D82) ───────────────────────────────────────────────
+ '#727987': '600', '#717888': '600', '#6B7280': '600',
+ '#6C6C6C': '600', '#737373': '600',
+ // ── cool-grey-700 (#4B5468) ───────────────────────────────────────────────
+ '#525B6F': '700', '#4B505F': '700', '#4B4E57': '700', '#474A54': '700',
+ '#4B5563': '700', '#5C5D62': '700', '#525252': '700', '#4E4E4E': '700',
+ // ── cool-grey-800 (#383F50) ───────────────────────────────────────────────
+ '#3F4452': '800', '#3A3D44': '800', '#3A3D46': '800', '#3C3C4A': '800',
+ '#3C3C49': '800', '#3A3C45': '800', '#383B45': '800', '#363840': '800',
+ '#374151': '800', '#393939': '800', '#363636': '800', '#404040': '800',
+ '#454545': '800', '#444444': '800',
+ // ── cool-grey-900 (#2C313F) ───────────────────────────────────────────────
+ '#30363D': '900', '#31343D': '900', '#2F3137': '900', '#2D3039': '900',
+ '#2A3038': '900', '#2D2F36': '900', '#2A2F38': '900', '#2A2D37': '900',
+ '#2D2D2D': '900', '#2A2A2A': '900', '#292929': '900',
+ // ── cool-grey-925 (#21252F) ───────────────────────────────────────────────
+ '#24272E': '925', '#24292F': '925', '#25272D': '925', '#26282D': '925',
+ '#1F2228': '925', '#1F2125': '925', '#1E2028': '925', '#1F2937': '925',
+ '#262626': '925', '#242424': '925', '#1F1F1F': '925', '#1E1E1E': '925',
+ // ── cool-grey-950 (#111319) ───────────────────────────────────────────────
+ '#1A1A1A': '950', '#171717': '950', '#0D0F11': '950', '#0B0E14': '950',
+ '#0F172A': '950', '#111827': '950', '#0C0E10': '950', '#0F0F0F': '950',
+ // ── cool-grey-975 (#05070A) ───────────────────────────────────────────────
+ '#0A0A0A': '975', '#050505': '975',
+};
+
+/** Old Tailwind gray-* shade numbers → cool-grey shade */
+const GRAY_TO_COOL_GREY = {
+ '100': '50', '200': '200', '300': '200', '400': '400',
+ '500': '600', '600': '700', '700': '800', '800': '925',
+ '900': '950', '950': '975',
+};
+
+/** Old Tailwind neutral-* shade numbers → cool-grey shade */
+const NEUTRAL_TO_COOL_GREY = {
+ '100': '50', '200': '100', '300': '200', '400': '400',
+ '500': '600', '600': '700', '700': '800', '800': '925',
+ '900': '950', '950': '975',
+};
+
+/**
+ * 8-digit alpha hex values → color-mix() equivalents.
+ * Opacity computed as round(0xAA / 255 * 100).
+ * #RRGGBB → nearest cool-grey shade (same rules as 6-digit mapping)
+ * pure black alpha values → rgba() to avoid color-mix dependency on cool-grey tokens
+ */
+const ALPHA_HEX_RE = /#[0-9A-Fa-f]{8}(?![0-9A-Fa-f])/g;
+const ALPHA_HEX_REPLACEMENTS = {
+ // solid base → cool-grey-300, opacity 0x33/255 = 20%
+ '#AFB8C133': 'color-mix(in srgb, var(--cool-grey-300) 20%, transparent)',
+ // solid base → cool-grey-925, opacity 0x99/255 = 60%
+ '#24242499': 'color-mix(in srgb, var(--cool-grey-925) 60%, transparent)',
+ // solid base → cool-grey-925, opacity 0xCC/255 = 80%
+ '#242424CC': 'color-mix(in srgb, var(--cool-grey-925) 80%, transparent)',
+ // solid base → cool-grey-925, opacity 0x99/255 = 60%
+ '#1F1F1F99': 'color-mix(in srgb, var(--cool-grey-925) 60%, transparent)',
+ // solid base → cool-grey-975, opacity 0x80/255 ≈ 50%
+ '#0A0A0A80': 'color-mix(in srgb, var(--cool-grey-975) 50%, transparent)',
+ // solid base → cool-grey-950, opacity 0xCC/255 = 80%
+ '#171717CC': 'color-mix(in srgb, var(--cool-grey-950) 80%, transparent)',
+ // solid base → cool-grey-975, opacity 0xCC/255 = 80%
+ '#0A0A0ACC': 'color-mix(in srgb, var(--cool-grey-975) 80%, transparent)',
+ // pure black, opacity 0x1A/255 ≈ 10%
+ '#0000001A': 'rgba(0, 0, 0, 0.1)',
+ // pure black, opacity 0x77/255 ≈ 47%
+ '#00000077': 'rgba(0, 0, 0, 0.467)',
+};
+
+// ─── CSS BLOCKS TO INJECT ───────────────────────────────────────────────────
+
+const CSS_VARS_BLOCK = `
+ /* ── Cool Grey Scale (13 shades + 2 pure anchors: white / black) ──────── */
+ --cool-grey-50: #F7F9FC;
+ --cool-grey-100: #EEF2F7;
+ --cool-grey-200: #DCE3EE;
+ --cool-grey-300: #C3CDDC;
+ --cool-grey-400: #A3B0C4;
+ --cool-grey-500: #7E8A9E;
+ --cool-grey-600: #626D82;
+ --cool-grey-700: #4B5468;
+ --cool-grey-800: #383F50;
+ --cool-grey-900: #2C313F;
+ --cool-grey-925: #21252F;
+ --cool-grey-950: #0B0E14; /* intentional override: preserves original app-shell depth */
+ --cool-grey-975: #05070A;
+ /* ─────────────────────────────────────────────────────────────────────── */`;
+
+const TAILWIND_THEME_BLOCK = `
+ /* Cool Grey scale */
+ --color-cool-grey-50: var(--cool-grey-50);
+ --color-cool-grey-100: var(--cool-grey-100);
+ --color-cool-grey-200: var(--cool-grey-200);
+ --color-cool-grey-300: var(--cool-grey-300);
+ --color-cool-grey-400: var(--cool-grey-400);
+ --color-cool-grey-500: var(--cool-grey-500);
+ --color-cool-grey-600: var(--cool-grey-600);
+ --color-cool-grey-700: var(--cool-grey-700);
+ --color-cool-grey-800: var(--cool-grey-800);
+ --color-cool-grey-900: var(--cool-grey-900);
+ --color-cool-grey-925: var(--cool-grey-925);
+ --color-cool-grey-950: var(--cool-grey-950);
+ --color-cool-grey-975: var(--cool-grey-975);`;
+
+// ─── FILE WALKER ─────────────────────────────────────────────────────────────
+
+const SKIP_DIRS = new Set([
+ 'node_modules', '.git', 'build', 'dist', '__snapshots__',
+ 'test-results', '.next', 'coverage', 'playwright-report',
+]);
+
+function* walkFiles(dir, exts) {
+ for (const entry of readdirSync(dir, { withFileTypes: true })) {
+ const full = join(dir, entry.name);
+ if (entry.isDirectory()) {
+ if (!SKIP_DIRS.has(entry.name)) yield* walkFiles(full, exts);
+ } else if (entry.isFile() && exts.includes(extname(entry.name).toLowerCase())) {
+ yield full;
+ }
+ }
+}
+
+// ─── HEX REGEX (built once from the full mapping table) ─────────────────────
+
+// Matches any of the known grey hex values, case-insensitive, not preceded/followed
+// by another hex digit (prevents partial matches inside longer hex strings).
+const HEX_PATTERN = new RegExp(
+ `(?<![0-9A-Fa-f])(${
+ Object.keys(HEX_TO_SHADE)
+ .map(h => h.slice(1)) // strip leading '#', we'll match '#' separately
+ .join('|')
+ })(?![0-9A-Fa-f])`,
+ 'gi',
+);
+
+function replaceHex(str, replacement) {
+ return str.replace(/#([0-9A-Fa-f]{6})(?![0-9A-Fa-f])/g, (match) => {
+ const upper = `#${match.slice(1).toUpperCase()}`;
+ const shade = HEX_TO_SHADE[upper];
+ if (!shade) return match;
+ return replacement(shade, match);
+ });
+}
+
+// ─── TAILWIND CLASS REPLACEMENT ──────────────────────────────────────────────
+
+// Matches: {prefix}-(gray|neutral)-(shade)(/(opacity))?
+// Prefix covers the full set of Tailwind color-bearing utilities.
+const TAILWIND_RE = /\b(bg|text|border|ring|divide|fill|stroke|shadow|placeholder|outline|from|via|to|accent|caret|decoration|underline|inset-ring)-(gray|neutral|slate|zinc)-(\d+)(\/[\d.]+)?\b/g;
+
+function replaceTailwind(str, changes) {
+ return str.replace(TAILWIND_RE, (match, prefix, scale, shade, opacity = '') => {
+ let map;
+ if (scale === 'gray') map = GRAY_TO_COOL_GREY;
+ else if (scale === 'neutral') map = NEUTRAL_TO_COOL_GREY;
+ else return match; // slate/zinc: same as neutral
+ const newShade = map[shade];
+ if (!newShade) return match;
+ const replacement = `${prefix}-cool-grey-${newShade}${opacity}`;
+ changes.push({ from: match, to: replacement });
+ return replacement;
+ });
+}
+
+// ─── PER-FILETYPE PROCESSORS ─────────────────────────────────────────────────
+
+/** CSS files: replace hex → var(--cool-grey-X) and alpha hex → color-mix(), line by line */
+function processCss(content) {
+ const changes = [];
+ const result = content
+ .split('\n')
+ .map(line => {
+ // Never touch the cool-grey variable definitions themselves
+ if (/--cool-grey-\d+:/.test(line)) return line;
+
+ // Replace 8-digit alpha hex values first (must run before 6-digit to avoid partial match)
+ let out = line.replace(ALPHA_HEX_RE, (match) => {
+ const upper = match.toUpperCase();
+ const repl = ALPHA_HEX_REPLACEMENTS[upper];
+ if (!repl) return match;
+ changes.push({ from: match, to: repl });
+ return repl;
+ });
+
+ // Replace 6-digit hex values
+ out = replaceHex(out, (shade, original) => {
+ changes.push({ from: original, to: `var(--cool-grey-${shade})` });
+ return `var(--cool-grey-${shade})`;
+ });
+
+ return out;
+ })
+ .join('\n');
+ return { result, changes };
+}
+
+/** TSX/TS/JSX files: Tailwind class names + alpha hex + hex → var(--cool-grey-X) */
+function processScript(content) {
+ const changes = [];
+
+ // 1. Tailwind grey utility classes
+ let result = replaceTailwind(content, changes);
+
+ // 2. Replace 8-digit alpha hex values first (must run before 6-digit pass)
+ result = result.replace(ALPHA_HEX_RE, (match) => {
+ const upper = match.toUpperCase();
+ const repl = ALPHA_HEX_REPLACEMENTS[upper];
+ if (!repl) return match;
+ changes.push({ from: match, to: repl });
+ return repl;
+ });
+
+ // 3. Raw 6-digit hex values (in string literals, style objects, template literals)
+ result = replaceHex(result, (shade, original) => {
+ changes.push({ from: original, to: `var(--cool-grey-${shade})` });
+ return `var(--cool-grey-${shade})`;
+ });
+
+ return { result, changes };
+}
+
+/**
+ * SVG files in src/icons/: grey fill/stroke → currentColor (icons inherit text color).
+ * Other SVG files: grey fill/stroke → var(--cool-grey-X).
+ */
+function processSvg(content, isIcon) {
+ const changes = [];
+ const result = content.replace(
+ /\b(fill|stroke)="(#[0-9A-Fa-f]{6})"/gi,
+ (match, attr, hex) => {
+ const upper = `#${hex.slice(1).toUpperCase()}`;
+ const shade = HEX_TO_SHADE[upper];
+ if (!shade) return match;
+ const to = isIcon ? `${attr}="currentColor"` : `${attr}="var(--cool-grey-${shade})"`;
+ changes.push({ from: match, to });
+ return to;
+ },
+ );
+ return { result, changes };
+}
+
+// ─── SPECIAL FILES: inject token definitions ─────────────────────────────────
+
+function injectIndexCss(content) {
+ if (content.includes('--cool-grey-50:')) return { result: content, changes: [] };
+ // Insert before the closing brace of the first :root block
+ const result = content.replace(/(:root\s*\{[\s\S]*?)(})/, (_, body, close) => {
+ return `${body}${CSS_VARS_BLOCK}\n${close}`;
+ });
+ const changed = result !== content;
+ return {
+ result,
+ changes: changed ? [{ from: '(no --cool-grey vars)', to: '(injected 13 CSS var definitions into :root)' }] : [],
+ };
+}
+
+function injectTailwindCss(content) {
+ if (content.includes('--color-cool-grey-50:')) return { result: content, changes: [] };
+ // Insert before the closing brace of the @theme inline block
+ const result = content.replace(/(@theme\s+inline\s*\{[\s\S]*?)(})/, (_, body, close) => {
+ return `${body}${TAILWIND_THEME_BLOCK}\n${close}`;
+ });
+ const changed = result !== content;
+ return {
+ result,
+ changes: changed ? [{ from: '(no --color-cool-grey entries)', to: '(injected 13 Tailwind @theme entries)' }] : [],
+ };
+}
+
+// ─── MAIN ────────────────────────────────────────────────────────────────────
+
+const stats = {
+ filesScanned: 0,
+ filesChanged: 0,
+ hexChanges: 0,
+ twChanges: 0,
+ alphaChanges: 0,
+ injections: 0,
+};
+
+const report = [];
+
+function processFile(filePath) {
+ const rel = relative(ROOT, filePath);
+ const ext = extname(filePath).toLowerCase();
+ const base = filePath.split('/').at(-1);
+ const isIconSvg = filePath.includes('/icons/') && ext === '.svg';
+
+ const original = readFileSync(filePath, 'utf8');
+ let content = original;
+ let allChanges = [];
+
+ // Special injection pass for the two root style files
+ if (rel === 'src/index.css') {
+ const { result, changes } = injectIndexCss(content);
+ content = result;
+ allChanges.push(...changes);
+ if (changes.length) stats.injections++;
+ }
+ if (rel === 'src/tailwind.css') {
+ const { result, changes } = injectTailwindCss(content);
+ content = result;
+ allChanges.push(...changes);
+ if (changes.length) stats.injections++;
+ }
+
+ // Per-filetype transformation
+ let processed;
+ if (ext === '.css') {
+ processed = processCss(content);
+ } else if (['.tsx', '.ts', '.jsx', '.js'].includes(ext)) {
+ processed = processScript(content);
+ } else if (ext === '.svg') {
+ processed = processSvg(content, isIconSvg);
+ } else {
+ return;
+ }
+
+ content = processed.result;
+ allChanges.push(...processed.changes);
+
+ stats.filesScanned++;
+
+ const hexCount = allChanges.filter(c => !c.isWarning && (c.from.startsWith('#') || c.from.includes('AFB8') || c.from.includes('242424'))).length;
+ const twCount = allChanges.filter(c => !c.from.startsWith('#') && !c.from.startsWith('(') && c.from.match(/-(gray|neutral|slate|zinc)-/)).length;
+ const alphaCount = allChanges.filter(c => /^#[0-9a-fA-F]{8}/.test(c.from)).length;
+
+ stats.hexChanges += hexCount;
+ stats.twChanges += twCount;
+ stats.alphaChanges += alphaCount;
+
+ const changed = content !== original;
+
+ if (changed || allChanges.length > 0) {
+ stats.filesChanged++;
+ report.push({ rel, allChanges, changed });
+
+ if (APPLY && changed) {
+ writeFileSync(filePath, content, 'utf8');
+ }
+ } else if (VERBOSE) {
+ report.push({ rel, allChanges: [], changed: false });
+ }
+}
+
+// Process src/index.css and src/tailwind.css first (injection)
+processFile(join(SRC, 'index.css'));
+processFile(join(SRC, 'tailwind.css'));
+
+// Walk all other source files
+for (const file of walkFiles(SRC, ['.tsx', '.ts', '.jsx', '.js', '.css', '.svg'])) {
+ const rel = relative(SRC, file);
+ if (rel === 'index.css' || rel === 'tailwind.css') continue; // already processed
+ processFile(file);
+}
+
+// ─── OUTPUT ──────────────────────────────────────────────────────────────────
+
+const mode = APPLY ? '🟢 APPLIED' : '🔵 DRY RUN';
+console.log(`\n${mode} — Cool Grey Token Migration`);
+console.log('═'.repeat(60));
+
+for (const { rel, allChanges } of report) {
+ if (allChanges.length === 0) continue;
+ console.log(`\n ${rel}`);
+ for (const c of allChanges) {
+ const label = c.isWarning ? ' ⚠ ' : ' → ';
+ // Deduplicate same from→to pairs in display
+ console.log(`${label}${c.from.padEnd(28)} ➜ ${c.to}`);
+ }
+}
+
+console.log('\n' + '─'.repeat(60));
+console.log(` Files scanned : ${stats.filesScanned}`);
+console.log(` Files changed : ${stats.filesChanged}`);
+console.log(` Hex swaps : ${stats.hexChanges}`);
+console.log(` Tailwind swaps: ${stats.twChanges}`);
+console.log(` Alpha swaps : ${stats.alphaChanges}`);
+console.log(` Injections : ${stats.injections}`);
+
+if (!APPLY && stats.filesChanged > 0) {
+ console.log(`\n ℹ Run with --apply to write changes to disk.\n`);
+}
+if (APPLY) {
+ console.log(`\n ✅ All changes written. Run 'npm run typecheck && npm run build' to verify.\n`);
+}
diff --git a/scripts/migrate-to-semantic-tokens.mjs b/scripts/migrate-to-semantic-tokens.mjs
new file mode 100644
index 0000000000..1aba6ac333
--- /dev/null
+++ b/scripts/migrate-to-semantic-tokens.mjs
@@ -0,0 +1,166 @@
+#!/usr/bin/env node
+/**
+ * Replaces direct cool-grey palette references in .tsx/.ts files
+ * with --oh-* semantic tokens, making the codebase theme-ready.
+ *
+ * Usage:
+ * node scripts/migrate-to-semantic-tokens.mjs (dry run)
+ * node scripts/migrate-to-semantic-tokens.mjs --apply (write files)
+ */
+
+import { readFileSync, writeFileSync, readdirSync, statSync } from "fs";
+import { join, extname } from "path";
+
+const APPLY = process.argv.includes("--apply");
+const ROOT = new URL("../src", import.meta.url).pathname;
+
+// ── Replacement table ──────────────────────────────────────────────────────
+// Each entry: [regex, replacement]
+// Order matters — more specific patterns first.
+
+const REPLACEMENTS = [
+ // ── Backgrounds ────────────────────────────────────────────────────────
+ // cool-grey-975 → surface-deep
+ [/\bbg-\[var\(--cool-grey-975\)\]/g, "bg-[var(--oh-surface-deep)]"],
+ [/\bbg-cool-grey-975\b/g, "bg-[var(--oh-surface-deep)]"],
+
+ // cool-grey-950 → base
+ [/\bbg-\[var\(--cool-grey-950\)\]/g, "bg-base"],
+ [/\bbg-cool-grey-950\b/g, "bg-base"],
+
+ // cool-grey-925 → surface
+ [/\bbg-\[var\(--cool-grey-925\)\]/g, "bg-[var(--oh-surface)]"],
+ [/\bbg-cool-grey-925\b/g, "bg-[var(--oh-surface)]"],
+
+ // cool-grey-900 → surface-raised
+ [/\bbg-\[var\(--cool-grey-900\)\]/g, "bg-[var(--oh-surface-raised)]"],
+ [/\bbg-cool-grey-900\b/g, "bg-[var(--oh-surface-raised)]"],
+
+ // cool-grey-800 → tertiary (already a Tailwind alias via --color-tertiary)
+ [/\bbg-\[var\(--cool-grey-800\)\]/g, "bg-tertiary"],
+ [/\bbg-cool-grey-800\b/g, "bg-tertiary"],
+
+ // ── Text ───────────────────────────────────────────────────────────────
+ // cool-grey-50 → content-2
+ [/\btext-\[var\(--cool-grey-50\)\]/g, "text-content-2"],
+ [/\btext-cool-grey-50\b/g, "text-content-2"],
+
+ // cool-grey-100 → foreground
+ [/\btext-\[var\(--cool-grey-100\)\]/g, "text-[var(--oh-foreground)]"],
+ [/\btext-cool-grey-100\b/g, "text-[var(--oh-foreground)]"],
+
+ // cool-grey-200 → text-tertiary
+ [/\btext-\[var\(--cool-grey-200\)\]/g, "text-[var(--oh-text-tertiary)]"],
+ [/\btext-cool-grey-200\b/g, "text-[var(--oh-text-tertiary)]"],
+
+ // cool-grey-300 → text-secondary
+ [/\btext-\[var\(--cool-grey-300\)\]/g, "text-[var(--oh-text-secondary)]"],
+ [/\btext-cool-grey-300\b/g, "text-[var(--oh-text-secondary)]"],
+
+ // cool-grey-400 → muted
+ [/\btext-\[var\(--cool-grey-400\)\]/g, "text-[var(--oh-muted)]"],
+ [/\btext-cool-grey-400\b/g, "text-[var(--oh-muted)]"],
+ [/\bplaceholder:text-\[var\(--cool-grey-400\)\]/g, "placeholder:text-[var(--oh-muted)]"],
+ [/\bfill-\[var\(--cool-grey-400\)\]/g, "fill-[var(--oh-muted)]"],
+
+ // cool-grey-500 → text-dim
+ [/\btext-\[var\(--cool-grey-500\)\]/g, "text-[var(--oh-text-dim)]"],
+ [/\btext-cool-grey-500\b/g, "text-[var(--oh-text-dim)]"],
+
+ // cool-grey-600 → text-subtle
+ [/\btext-\[var\(--cool-grey-600\)\]/g, "text-[var(--oh-text-subtle)]"],
+ [/\btext-cool-grey-600\b/g, "text-[var(--oh-text-subtle)]"],
+
+ // cool-grey-950 as text (inverted, e.g. label on light/gold bg)
+ [/\btext-\[var\(--cool-grey-950\)\]/g, "text-base"],
+ [/\btext-cool-grey-950\b/g, "text-base"],
+
+ // ── Borders ────────────────────────────────────────────────────────────
+ // cool-grey-600 → border-input
+ [/\bborder-\[var\(--cool-grey-600\)\]/g, "border-[var(--oh-border-input)]"],
+ [/\bborder-cool-grey-600\b/g, "border-[var(--oh-border-input)]"],
+ // directional
+ [/\bborder-[tblr]-\[var\(--cool-grey-600\)\]/g, (m) =>
+ m.replace("var(--cool-grey-600)", "var(--oh-border-input)")],
+
+ // cool-grey-700 → border (standard)
+ [/\bborder-\[var\(--cool-grey-700\)\]/g, "border-[var(--oh-border)]"],
+ [/\bborder-cool-grey-700\b/g, "border-[var(--oh-border)]"],
+ [/\bborder-[tblr]-\[var\(--cool-grey-700\)\]/g, (m) =>
+ m.replace("var(--cool-grey-700)", "var(--oh-border)")],
+
+ // cool-grey-800 → border-subtle
+ [/\bborder-\[var\(--cool-grey-800\)\]/g, "border-[var(--oh-border-subtle)]"],
+ [/\bborder-cool-grey-800\b/g, "border-[var(--oh-border-subtle)]"],
+ [/\bborder-[tblr]-\[var\(--cool-grey-800\)\]/g, (m) =>
+ m.replace("var(--cool-grey-800)", "var(--oh-border-subtle)")],
+
+ // ── Interactive hover / active states ──────────────────────────────────
+ // hover on mid surfaces (panels with 800/925 bg)
+ [/\bhover:bg-\[var\(--cool-grey-700\)\]/g, "hover:bg-[var(--oh-interactive-hover)]"],
+ [/\bhover:bg-cool-grey-700\b/g, "hover:bg-[var(--oh-interactive-hover)]"],
+
+ // hover on dark base (sidebar on 950 bg) — still "slightly lighter"
+ [/\bhover:bg-\[var\(--cool-grey-900\)\]/g, "hover:bg-[var(--oh-interactive-hover-low)]"],
+ [/\bhover:bg-cool-grey-900\b/g, "hover:bg-[var(--oh-interactive-hover-low)]"],
+
+ // active/selected on dark base
+ [/\bbg-cool-grey-800\b(?=[^"]*(text-white|font-medium))/g, "bg-[var(--oh-interactive-active)]"],
+
+ // placeholder text in inputs using direct palette refs
+ [/\bplaceholder:text-\[var\(--cool-grey-400\)\]/g, "placeholder:text-[var(--oh-muted)]"],
+ [/\bplaceholder:text-cool-grey-400\b/g, "placeholder:text-[var(--oh-muted)]"],
+];
+
+// ── File walker ────────────────────────────────────────────────────────────
+function* walk(dir) {
+ for (const entry of readdirSync(dir)) {
+ if (entry === "node_modules" || entry.startsWith(".")) continue;
+ const full = join(dir, entry);
+ if (statSync(full).isDirectory()) yield* walk(full);
+ else if ([".tsx", ".ts"].includes(extname(full))) yield full;
+ }
+}
+
+// ── Process one file ───────────────────────────────────────────────────────
+function processFile(path) {
+ const original = readFileSync(path, "utf8");
+ let result = original;
+ let count = 0;
+
+ for (const [pattern, replacement] of REPLACEMENTS) {
+ const before = result;
+ result = result.replace(pattern, replacement);
+ if (result !== before) {
+ const matches = (before.match(pattern) || []).length;
+ count += matches;
+ }
+ }
+
+ if (result !== original) {
+ if (APPLY) writeFileSync(path, result, "utf8");
+ return count;
+ }
+ return 0;
+}
+
+// ── Run ────────────────────────────────────────────────────────────────────
+let totalFiles = 0;
+let totalChanges = 0;
+
+for (const file of walk(ROOT)) {
+ const changes = processFile(file);
+ if (changes > 0) {
+ totalFiles++;
+ totalChanges += changes;
+ const rel = file.replace(ROOT, "src");
+ console.log(` ${APPLY ? "✓" : "~"} ${rel} (${changes} changes)`);
+ }
+}
+
+console.log(
+ `\n${APPLY ? "Applied" : "Dry run:"} ${totalChanges} replacements across ${totalFiles} files`,
+);
+if (!APPLY) {
+ console.log("Run with --apply to write changes.");
+}
diff --git a/src/assets/chevron-left.tsx b/src/assets/chevron-left.tsx
index b2ae9abdde..b400fcea29 100644
--- a/src/assets/chevron-left.tsx
+++ b/src/assets/chevron-left.tsx
@@ -21,7 +21,7 @@ export function ChevronLeft({
fillRule="evenodd"
clipRule="evenodd"
d="M11.204 15.0037L6.65511 9.99993L11.204 4.99617L12.1289 5.83701L8.34444 9.99993L12.1289 14.1628L11.204 15.0037Z"
- fill={active ? "#D4D4D4" : "#525252"}
+ fill={active ? "var(--oh-text-tertiary)" : "var(--oh-border)"}
/>
</svg>
);
diff --git a/src/assets/chevron-right.tsx b/src/assets/chevron-right.tsx
index 4d7119d4a9..a298724e9a 100644
--- a/src/assets/chevron-right.tsx
+++ b/src/assets/chevron-right.tsx
@@ -21,7 +21,7 @@ export function ChevronRight({
fillRule="evenodd"
clipRule="evenodd"
d="M8.79602 4.99634L13.3449 10.0001L8.79602 15.0038L7.87109 14.163L11.6556 10.0001L7.87109 5.83718L8.79602 4.99634Z"
- fill={active ? "#D4D4D4" : "#525252"}
+ fill={active ? "var(--oh-text-tertiary)" : "var(--oh-border)"}
/>
</svg>
);
diff --git a/src/components/conversation-events/chat/event-message-components/collapsible-thinking.tsx b/src/components/conversation-events/chat/event-message-components/collapsible-thinking.tsx
index 0a7c9747f4..7b5100ec43 100644
--- a/src/components/conversation-events/chat/event-message-components/collapsible-thinking.tsx
+++ b/src/components/conversation-events/chat/event-message-components/collapsible-thinking.tsx
@@ -41,9 +41,9 @@ export function CollapsibleThinking({ content }: CollapsibleThinkingProps) {
data-testid="collapsible-thinking-toggle"
className="w-full flex items-center gap-2 text-left cursor-pointer"
>
- <Chevron className="h-4 w-4 fill-[#959CB2] flex-shrink-0" />
- <LightbulbIcon className="h-4 w-4 fill-[#959CB2] flex-shrink-0" />
- <span className="font-normal text-[#959CB2]">
+ <Chevron className="h-4 w-4 fill-[var(--oh-muted)] flex-shrink-0" />
+ <LightbulbIcon className="h-4 w-4 fill-[var(--oh-muted)] flex-shrink-0" />
+ <span className="font-normal text-[var(--oh-muted)]">
{t(I18nKey.THINKING$TITLE)}
</span>
</button>
diff --git a/src/components/conversation-events/chat/event-message-components/event-group.tsx b/src/components/conversation-events/chat/event-message-components/event-group.tsx
index d36ff94183..1e373bab95 100644
--- a/src/components/conversation-events/chat/event-message-components/event-group.tsx
+++ b/src/components/conversation-events/chat/event-message-components/event-group.tsx
@@ -123,22 +123,22 @@ export function EventGroup({
className="w-full flex items-center justify-between gap-2 text-left cursor-pointer"
>
{isFinalized ? (
- <span className="flex items-center gap-2 min-w-0 font-normal text-[#959CB2]">
- <Chevron className="h-4 w-4 fill-[#959CB2] flex-shrink-0" />
+ <span className="flex items-center gap-2 min-w-0 font-normal text-[var(--oh-muted)]">
+ <Chevron className="h-4 w-4 fill-[var(--oh-muted)] flex-shrink-0" />
<span className="truncate">{countSummary}</span>
</span>
) : (
<>
- <span className="flex items-center gap-2 min-w-0 font-normal text-[#959CB2]">
- <Chevron className="h-4 w-4 fill-[#959CB2] flex-shrink-0" />
+ <span className="flex items-center gap-2 min-w-0 font-normal text-[var(--oh-muted)]">
+ <Chevron className="h-4 w-4 fill-[var(--oh-muted)] flex-shrink-0" />
<span className="truncate">{latestTitle ?? countSummary}</span>
</span>
- <span className="flex items-center flex-shrink-0 font-normal text-[#959CB2]">
+ <span className="flex items-center flex-shrink-0 font-normal text-[var(--oh-muted)]">
<span className="truncate">{countSummary}</span>
{isRunning ? (
<LoaderCircle
data-testid="spinner-icon"
- className="h-4 w-4 ml-2 inline animate-spin text-[#959CB2]"
+ className="h-4 w-4 ml-2 inline animate-spin text-[var(--oh-muted)]"
/>
) : null}
</span>
diff --git a/src/components/conversation-events/chat/event-message-components/skill-item-expanded.tsx b/src/components/conversation-events/chat/event-message-components/skill-item-expanded.tsx
index 720d2b649b..e9da328d8f 100644
--- a/src/components/conversation-events/chat/event-message-components/skill-item-expanded.tsx
+++ b/src/components/conversation-events/chat/event-message-components/skill-item-expanded.tsx
@@ -71,14 +71,14 @@ export function SkillItemExpanded({ content }: SkillItemExpandedProps) {
return (
<div className="pl-6 pr-2 pt-2 pb-2">
{hasMetadata && (
- <div className="mb-3 text-sm text-neutral-400 space-y-1">
+ <div className="mb-3 text-sm text-[var(--oh-muted)] space-y-1">
{matchInfo && <p>{matchInfo}</p>}
{filePath && (
<p>
- <Typography.Text className="text-neutral-500">
+ <Typography.Text className="text-[var(--oh-text-subtle)]">
{t(I18nKey.COMMON$PATH)}{" "}
</Typography.Text>
- <code className="bg-neutral-800 px-1.5 py-0.5 rounded text-neutral-300">
+ <code className="bg-[var(--oh-surface)] px-1.5 py-0.5 rounded text-[var(--oh-text-tertiary)]">
{filePath}
</code>
</p>
@@ -86,7 +86,9 @@ export function SkillItemExpanded({ content }: SkillItemExpandedProps) {
</div>
)}
- {hasMetadata && body && <hr className="border-neutral-700 mb-3" />}
+ {hasMetadata && body && (
+ <hr className="border-[var(--oh-border-subtle)] mb-3" />
+ )}
{body && <MarkdownRenderer>{styleImportantTags(body)}</MarkdownRenderer>}
</div>
diff --git a/src/components/conversation-events/chat/event-message-components/skill-ready-content-list.tsx b/src/components/conversation-events/chat/event-message-components/skill-ready-content-list.tsx
index 0268aaa78e..fd4421b4e2 100644
--- a/src/components/conversation-events/chat/event-message-components/skill-ready-content-list.tsx
+++ b/src/components/conversation-events/chat/event-message-components/skill-ready-content-list.tsx
@@ -22,7 +22,7 @@ export function SkillReadyContentList({ items }: SkillReadyContentListProps) {
return (
<div className="flex flex-col gap-1 mt-1">
- <Typography.Text className="font-bold text-neutral-200 text-sm px-2 py-1">
+ <Typography.Text className="font-bold text-[var(--oh-foreground)] text-sm px-2 py-1">
{t(I18nKey.SKILLS$TRIGGERED_SKILL_KNOWLEDGE)}
</Typography.Text>
{items.map((item) => {
@@ -31,28 +31,28 @@ export function SkillReadyContentList({ items }: SkillReadyContentListProps) {
return (
<div
key={item.name}
- className="border border-neutral-700 rounded-md overflow-hidden"
+ className="border border-[var(--oh-border-subtle)] rounded-md overflow-hidden"
>
<button
type="button"
onClick={() => toggleSkill(item.name)}
- className="w-full py-1.5 px-2 text-left flex items-center gap-2 hover:bg-neutral-700 transition-colors cursor-pointer"
+ className="w-full py-1.5 px-2 text-left flex items-center gap-2 hover:bg-tertiary transition-colors cursor-pointer"
>
- <Typography.Text className="text-neutral-300">
+ <Typography.Text className="text-[var(--oh-text-tertiary)]">
{isExpanded ? (
<ChevronDown size={14} />
) : (
<ChevronRight size={14} />
)}
</Typography.Text>
- <Typography.Text className="font-semibold text-neutral-200 text-sm">
+ <Typography.Text className="font-semibold text-[var(--oh-foreground)] text-sm">
{item.name}
</Typography.Text>
</button>
{isExpanded && item.content && (
<>
- <hr className="border-neutral-700" />
+ <hr className="border-[var(--oh-border-subtle)]" />
<SkillItemExpanded content={item.content} />
</>
)}
diff --git a/src/components/conversation-events/chat/task-tracking/task-item.tsx b/src/components/conversation-events/chat/task-tracking/task-item.tsx
index 8c0c70008d..cf77654351 100644
--- a/src/components/conversation-events/chat/task-tracking/task-item.tsx
+++ b/src/components/conversation-events/chat/task-tracking/task-item.tsx
@@ -22,7 +22,7 @@ export function TaskItem({ task }: TaskItemProps) {
case "in_progress":
return <CheckCircleHalfIcon className="w-4 h-4 text-[#ffffff]" />;
case "done":
- return <CheckCircleIcon className="w-4 h-4 text-[#A3A3A3]" />;
+ return <CheckCircleIcon className="w-4 h-4 text-[var(--oh-muted)]" />;
default:
return <CircleIcon className="w-4 h-4 text-[#ffffff]" />;
}
@@ -40,13 +40,13 @@ export function TaskItem({ task }: TaskItemProps) {
<Typography.Text
className={cn(
"text-[12px] text-white",
- isDoneStatus && "text-[#A3A3A3]",
+ isDoneStatus && "text-[var(--oh-muted)]",
)}
>
{task.title}
</Typography.Text>
{task.notes && (
- <Typography.Text className="text-[10px] text-[#A3A3A3]">
+ <Typography.Text className="text-[10px] text-[var(--oh-muted)]">
{t(I18nKey.TASK_TRACKING_OBSERVATION$TASK_NOTES)}: {task.notes}
</Typography.Text>
)}
diff --git a/src/components/conversation-events/chat/task-tracking/task-list-section.tsx b/src/components/conversation-events/chat/task-tracking/task-list-section.tsx
index 17287dbf1f..8b0552e843 100644
--- a/src/components/conversation-events/chat/task-tracking/task-list-section.tsx
+++ b/src/components/conversation-events/chat/task-tracking/task-list-section.tsx
@@ -13,10 +13,10 @@ export function TaskListSection({ taskList }: TaskListSectionProps) {
const { t } = useTranslation("openhands");
return (
- <div className="flex flex-col overflow-clip bg-[#25272d] border border-[#525252] rounded-[12px] w-full">
+ <div className="flex flex-col overflow-clip bg-[var(--oh-surface)] border border-[var(--oh-border)] rounded-[12px] w-full">
{/* Header Tabs */}
- <div className="flex gap-1 items-center border-b border-[#525252] h-[41px] px-2 shrink-0">
- <LessonPlanIcon className="shrink-0 w-4.5 h-4.5 text-[#9299aa]" />
+ <div className="flex gap-1 items-center border-b border-[var(--oh-border)] h-[41px] px-2 shrink-0">
+ <LessonPlanIcon className="shrink-0 w-4.5 h-4.5 text-[var(--oh-muted)]" />
<Typography.Text className="text-[11px] text-nowrap text-white tracking-[0.11px] font-medium leading-[16px] whitespace-pre">
{t(I18nKey.COMMON$TASKS)}
</Typography.Text>
diff --git a/src/components/features/alerts/alert-banner.tsx b/src/components/features/alerts/alert-banner.tsx
index 56f7ef5502..141a110638 100644
--- a/src/components/features/alerts/alert-banner.tsx
+++ b/src/components/features/alerts/alert-banner.tsx
@@ -116,7 +116,7 @@ export function AlertBanner({
<div
data-testid="alert-banner"
className={cn(
- "bg-[#0D0F11] border border-primary text-white p-4 rounded",
+ "bg-base border border-primary text-white p-4 rounded",
"flex flex-row items-center justify-between m-1",
currentPath === "/" && "mt-3 mr-3",
)}
@@ -133,7 +133,7 @@ export function AlertBanner({
data-testid="dismiss-button"
onClick={() => setDismissedAt(updatedAt)}
className={cn(
- "bg-[#0D0F11] rounded-full w-5 h-5 flex items-center justify-center cursor-pointer",
+ "bg-base rounded-full w-5 h-5 flex items-center justify-center cursor-pointer",
)}
>
<CloseIcon />
diff --git a/src/components/features/analytics/analytics-consent-form-modal.tsx b/src/components/features/analytics/analytics-consent-form-modal.tsx
index ecea90f83c..32bce9d375 100644
--- a/src/components/features/analytics/analytics-consent-form-modal.tsx
+++ b/src/components/features/analytics/analytics-consent-form-modal.tsx
@@ -45,7 +45,7 @@ export function AnalyticsConsentFormModal({
onSubmit={handleSubmit}
className="flex flex-col gap-2"
>
- <ModalBody className="border border-tertiary">
+ <ModalBody className="border border-[var(--oh-border)]">
<BaseModalTitle title={t(I18nKey.ANALYTICS$TITLE)} />
<BaseModalDescription>
{t(I18nKey.ANALYTICS$DESCRIPTION)}
diff --git a/src/components/features/analytics/telemetry-consent-banner.tsx b/src/components/features/analytics/telemetry-consent-banner.tsx
index d3d9781bac..89dbf8adf3 100644
--- a/src/components/features/analytics/telemetry-consent-banner.tsx
+++ b/src/components/features/analytics/telemetry-consent-banner.tsx
@@ -82,7 +82,7 @@ export function TelemetryConsentBanner({
onSubmit={handleSubmit}
className="flex flex-col gap-2"
>
- <ModalBody className="border border-tertiary">
+ <ModalBody className="border border-[var(--oh-border)]">
<BaseModalTitle title={t(I18nKey.TELEMETRY$CONSENT_TITLE)} />
<BaseModalDescription>
{t(I18nKey.TELEMETRY$CONSENT_DESCRIPTION)}
diff --git a/src/components/features/automations/automation-card-skeleton.tsx b/src/components/features/automations/automation-card-skeleton.tsx
index 54cf90883f..d9b19840b8 100644
--- a/src/components/features/automations/automation-card-skeleton.tsx
+++ b/src/components/features/automations/automation-card-skeleton.tsx
@@ -2,17 +2,17 @@ export function AutomationCardSkeleton() {
return (
<div
data-testid="automation-card-skeleton"
- className="rounded-2xl border border-border bg-surface-card p-5"
+ className="rounded-2xl border border-[var(--oh-border)] bg-[var(--oh-surface)] p-5"
>
<div className="flex items-start justify-between">
- <div className="h-5 w-40 animate-pulse rounded bg-surface-elevated" />
- <div className="h-5 w-10 animate-pulse rounded-full bg-surface-elevated" />
+ <div className="h-5 w-40 animate-pulse rounded bg-surface-raised" />
+ <div className="h-5 w-10 animate-pulse rounded-full bg-surface-raised" />
</div>
- <div className="mt-2 h-4 w-72 animate-pulse rounded bg-surface-elevated" />
+ <div className="mt-2 h-4 w-72 animate-pulse rounded bg-surface-raised" />
<div className="mt-4 flex gap-2">
- <div className="h-7 w-32 animate-pulse rounded-full bg-surface-elevated" />
- <div className="h-7 w-28 animate-pulse rounded-full bg-surface-elevated" />
- <div className="h-7 w-24 animate-pulse rounded-full bg-surface-elevated" />
+ <div className="h-7 w-32 animate-pulse rounded-full bg-surface-raised" />
+ <div className="h-7 w-28 animate-pulse rounded-full bg-surface-raised" />
+ <div className="h-7 w-24 animate-pulse rounded-full bg-surface-raised" />
</div>
</div>
);
diff --git a/src/components/features/automations/automation-card.tsx b/src/components/features/automations/automation-card.tsx
index 0a64b68711..6a8644d52b 100644
--- a/src/components/features/automations/automation-card.tsx
+++ b/src/components/features/automations/automation-card.tsx
@@ -59,14 +59,14 @@ export function AutomationCard({
onKeyDown={(e) => {
if (e.key === "Enter") handleCardClick();
}}
- className="cursor-pointer rounded-2xl border border-border bg-surface-card p-5 transition-colors hover:border-border-hover"
+ className="cursor-pointer rounded-2xl border border-[var(--oh-border)] bg-[var(--oh-surface)] p-5 transition-colors hover:border-[var(--oh-border)]"
>
<div className="flex items-start justify-between">
<div className="min-w-0 flex-1">
<h3 className="truncate text-base font-semibold text-white">
{automation.name}
</h3>
- <p className="mt-1 line-clamp-2 text-sm text-content-muted">
+ <p className="mt-1 line-clamp-2 text-sm text-muted">
{automation.prompt}
</p>
</div>
diff --git a/src/components/features/automations/backend-not-configured.tsx b/src/components/features/automations/backend-not-configured.tsx
index a8bd46090e..6f2a91ddc6 100644
--- a/src/components/features/automations/backend-not-configured.tsx
+++ b/src/components/features/automations/backend-not-configured.tsx
@@ -11,17 +11,17 @@ export function BackendUnavailable({ onRetry }: BackendUnavailableProps) {
return (
<div className="flex flex-col items-center justify-center py-20 px-4">
- <ExclamationCircleIcon className="size-12 text-amber-500" />
+ <ExclamationCircleIcon className="size-12 text-[var(--oh-warning)]" />
<h2 className="mt-4 text-lg font-semibold text-content">
{t(I18nKey.AUTOMATIONS$BACKEND_UNAVAILABLE_TITLE)}
</h2>
- <p className="mt-2 text-sm text-content-muted text-center max-w-md">
+ <p className="mt-2 text-sm text-muted text-center max-w-md">
{t(I18nKey.AUTOMATIONS$BACKEND_UNAVAILABLE_MESSAGE)}
</p>
<button
type="button"
onClick={onRetry}
- className="mt-6 rounded-lg border border-border px-4 py-2 text-sm text-white hover:bg-surface-elevated"
+ className="mt-6 rounded-lg border border-[var(--oh-border)] px-4 py-2 text-sm text-white hover:bg-surface-raised"
>
{t(I18nKey.AUTOMATIONS$BACKEND_UNAVAILABLE_RETRY)}
</button>
diff --git a/src/components/features/automations/create-instructions.tsx b/src/components/features/automations/create-instructions.tsx
index 65a631a7a9..297132f8ac 100644
--- a/src/components/features/automations/create-instructions.tsx
+++ b/src/components/features/automations/create-instructions.tsx
@@ -27,43 +27,43 @@ export function CreateInstructions({
<>
<div className="mt-4 grid gap-4 sm:grid-cols-2">
{/* Option 1: Claude Code / Codex */}
- <div className="rounded-lg border border-border bg-surface-card p-4">
+ <div className="rounded-lg border border-[var(--oh-border)] bg-[var(--oh-surface)] p-4">
<div className="flex items-center gap-2">
- <TerminalIcon className="size-5 text-content-muted" />
+ <TerminalIcon className="size-5 text-muted" />
<span className="text-sm font-medium text-content">
{t(I18nKey.AUTOMATIONS$EMPTY_OPTION_PLUGIN_TITLE)}
</span>
</div>
- <p className="mt-2 text-sm text-content-muted">
+ <p className="mt-2 text-sm text-muted">
<a
href={PLUGIN_INSTALL_URL}
target="_blank"
rel="noopener noreferrer"
- className="underline hover:text-content transition-colors"
+ className="underline hover:text-foreground transition-colors"
>
{t(I18nKey.AUTOMATIONS$EMPTY_INSTALL_PLUGIN)}
</a>{" "}
{t(I18nKey.AUTOMATIONS$EMPTY_OPTION_PLUGIN_DESC)}
</p>
- <code className="mt-2 block rounded bg-surface-elevated px-3 py-2 font-mono text-xs text-content">
+ <code className="mt-2 block rounded bg-surface-raised px-3 py-2 font-mono text-xs text-content">
{PLUGIN_COMMAND}
</code>
</div>
{/* Option 2: OpenHands Cloud conversation */}
- <div className="rounded-lg border border-border bg-surface-card p-4">
+ <div className="rounded-lg border border-[var(--oh-border)] bg-[var(--oh-surface)] p-4">
<div className="flex items-center gap-2">
- <SparkleIcon className="size-5 text-content-muted" />
+ <SparkleIcon className="size-5 text-muted" />
<span className="text-sm font-medium text-content">
{t(I18nKey.AUTOMATIONS$EMPTY_OPTION_CONVERSATION_TITLE)}
</span>
</div>
- <p className="mt-2 text-sm text-content-muted">
+ <p className="mt-2 text-sm text-muted">
{t(I18nKey.AUTOMATIONS$EMPTY_OPTION_CONVERSATION_DESC)}
</p>
<a
href={NEW_CONVERSATION_URL}
- className="mt-2 inline-flex items-center gap-1 rounded-md bg-surface-elevated px-3 py-2 text-xs font-medium text-content hover:bg-border transition-colors"
+ className="mt-2 inline-flex items-center gap-1 rounded-md bg-surface-raised px-3 py-2 text-xs font-medium text-content hover:bg-surface-raised transition-colors"
>
{t(I18nKey.AUTOMATIONS$EMPTY_START_CONVERSATION)}
<span aria-hidden="true">→</span>
@@ -72,12 +72,12 @@ export function CreateInstructions({
</div>
{/* Documentation link */}
- <p className="mt-4 text-center text-sm text-content-muted">
+ <p className="mt-4 text-center text-sm text-muted">
<a
href={DOCS_URL}
target="_blank"
rel="noopener noreferrer"
- className="underline hover:text-content transition-colors"
+ className="underline hover:text-foreground transition-colors"
>
{t(I18nKey.AUTOMATIONS$EMPTY_LEARN_MORE)}
</a>
@@ -87,18 +87,18 @@ export function CreateInstructions({
if (collapsible) {
return (
- <div className="w-full rounded-lg border border-border bg-surface-card">
+ <div className="w-full rounded-lg border border-[var(--oh-border)] bg-[var(--oh-surface)]">
<button
type="button"
onClick={() => setIsExpanded(!isExpanded)}
aria-expanded={isExpanded}
- className="flex w-full items-center justify-between p-4 text-left hover:bg-surface-elevated transition-colors rounded-lg"
+ className="flex w-full items-center justify-between p-4 text-left hover:bg-surface-raised transition-colors rounded-lg"
>
<span className="text-sm font-medium text-content">
{t(I18nKey.AUTOMATIONS$EMPTY_HOW_TO_CREATE_TITLE)}
</span>
<ChevronDownIcon
- className={`size-5 text-content-muted transition-transform ${
+ className={`size-5 text-muted transition-transform ${
isExpanded ? "rotate-180" : ""
}`}
/>
diff --git a/src/components/features/automations/delete-confirmation-modal.tsx b/src/components/features/automations/delete-confirmation-modal.tsx
index 213af32b4c..ce927a56f6 100644
--- a/src/components/features/automations/delete-confirmation-modal.tsx
+++ b/src/components/features/automations/delete-confirmation-modal.tsx
@@ -29,11 +29,11 @@ export function DeleteConfirmationModal({
}}
role="presentation"
/>
- <div className="relative w-full max-w-sm rounded-xl border border-border bg-surface-card p-6">
+ <div className="relative w-full max-w-sm rounded-xl border border-[var(--oh-border)] bg-[var(--oh-surface)] p-6">
<button
type="button"
onClick={onCancel}
- className="absolute right-4 top-4 text-content-muted hover:text-content"
+ className="absolute right-4 top-4 text-muted hover:text-foreground"
aria-label="Close"
>
<XMarkIcon className="size-5" />
@@ -42,7 +42,7 @@ export function DeleteConfirmationModal({
<h2 className="text-lg font-semibold text-white">
{t(I18nKey.AUTOMATIONS$DELETE_CONFIRM_TITLE)}
</h2>
- <p className="mt-2 text-sm text-content-muted">
+ <p className="mt-2 text-sm text-muted">
{t(I18nKey.AUTOMATIONS$DELETE_CONFIRM_MESSAGE, {
name: automationName,
})}
@@ -52,14 +52,14 @@ export function DeleteConfirmationModal({
<button
type="button"
onClick={onCancel}
- className="rounded-lg border border-border px-4 py-2 text-sm text-white hover:bg-surface-elevated"
+ className="rounded-lg border border-[var(--oh-border)] px-4 py-2 text-sm text-white hover:bg-surface-raised"
>
{t(I18nKey.AUTOMATIONS$CANCEL)}
</button>
<button
type="button"
onClick={onConfirm}
- className="rounded-lg bg-status-fail-solid px-4 py-2 text-sm text-white hover:bg-status-fail-solid-hover"
+ className="rounded-lg bg-danger px-4 py-2 text-sm text-white hover:bg-danger/80"
>
{t(I18nKey.AUTOMATIONS$DELETE)}
</button>
diff --git a/src/components/features/automations/detail/active-status-badge.tsx b/src/components/features/automations/detail/active-status-badge.tsx
index 3dfde68050..a1e1df6883 100644
--- a/src/components/features/automations/detail/active-status-badge.tsx
+++ b/src/components/features/automations/detail/active-status-badge.tsx
@@ -15,8 +15,8 @@ export function ActiveStatusBadge({ active }: ActiveStatusBadgeProps) {
}
className={`inline-flex items-center rounded-full px-3 py-1 text-xs font-medium ${
active
- ? "bg-status-success-badge-bg text-status-success-text"
- : "bg-border text-content-muted"
+ ? "bg-[var(--oh-success)]/15 text-[var(--oh-success)]"
+ : "bg-surface-raised text-muted"
}`}
>
{active
diff --git a/src/components/features/automations/detail/activity-log-item.tsx b/src/components/features/automations/detail/activity-log-item.tsx
index 142f4c3140..46fc028f46 100644
--- a/src/components/features/automations/detail/activity-log-item.tsx
+++ b/src/components/features/automations/detail/activity-log-item.tsx
@@ -35,7 +35,7 @@ export function ActivityLogItem({ run }: ActivityLogItemProps) {
{formatRunTimestamp(run.started_at, i18n.language)}
</span>
{!hasConversation && (
- <span className="text-xs text-content-muted italic">
+ <span className="text-xs text-muted italic">
({t(I18nKey.AUTOMATIONS$DETAIL$NO_CONVERSATION)})
</span>
)}
@@ -48,7 +48,7 @@ export function ActivityLogItem({ run }: ActivityLogItemProps) {
return (
<a
href={getConversationUrl(run.conversation_id)}
- className="flex items-center justify-between px-5 py-3 transition-colors cursor-pointer hover:bg-surface-elevated focus:bg-surface-elevated focus:outline-none"
+ className="flex items-center justify-between px-5 py-3 transition-colors cursor-pointer hover:bg-surface-raised focus:bg-surface-raised focus:outline-none"
aria-label={`View conversation for run at ${formatRunTimestamp(run.started_at, i18n.language)}`}
>
{content}
diff --git a/src/components/features/automations/detail/activity-log-section.tsx b/src/components/features/automations/detail/activity-log-section.tsx
index 00714683be..f76ea1a01f 100644
--- a/src/components/features/automations/detail/activity-log-section.tsx
+++ b/src/components/features/automations/detail/activity-log-section.tsx
@@ -23,9 +23,9 @@ export function ActivityLogSection({ automationId }: ActivityLogSectionProps) {
const hasMore = data ? data.total > data.runs.length : false;
return (
- <div className="rounded-2xl border border-border bg-surface-card">
- <div className="flex items-center gap-2 border-b border-border px-5 pb-3 pt-4">
- <span className="size-4 text-content-muted">
+ <div className="rounded-2xl border border-[var(--oh-border)] bg-[var(--oh-surface)]">
+ <div className="flex items-center gap-2 border-b border-[var(--oh-border)] px-5 pb-3 pt-4">
+ <span className="size-4 text-muted">
<ActivityIcon className="size-4" />
</span>
<h3 className="text-sm font-medium text-content">
@@ -40,15 +40,15 @@ export function ActivityLogSection({ automationId }: ActivityLogSectionProps) {
key={`skeleton-${i}`}
className="flex items-center justify-between py-3"
>
- <div className="h-5 w-64 animate-pulse rounded bg-surface-elevated" />
- <div className="h-6 w-24 animate-pulse rounded-full bg-surface-elevated" />
+ <div className="h-5 w-64 animate-pulse rounded bg-surface-raised" />
+ <div className="h-6 w-24 animate-pulse rounded-full bg-surface-raised" />
</div>
))}
</div>
)}
{!isLoading && data?.runs.length === 0 && (
- <p className="px-5 py-8 text-center text-sm text-content-muted">
+ <p className="px-5 py-8 text-center text-sm text-muted">
{t(I18nKey.AUTOMATIONS$DETAIL$NO_RUNS)}
</p>
)}
@@ -58,18 +58,18 @@ export function ActivityLogSection({ automationId }: ActivityLogSectionProps) {
{data.runs.map((run, index) => (
<div
key={run.id}
- className={index > 0 ? "border-t border-border" : ""}
+ className={index > 0 ? "border-t border-[var(--oh-border)]" : ""}
>
<ActivityLogItem run={run} />
</div>
))}
{hasMore && (
- <div className="border-t border-border px-5 py-3">
+ <div className="border-t border-[var(--oh-border)] px-5 py-3">
<button
type="button"
onClick={() => setLimit((prev) => prev + PAGE_SIZE)}
- className="text-sm text-content-muted hover:text-content"
+ className="text-sm text-muted hover:text-foreground"
>
{t(I18nKey.AUTOMATIONS$DETAIL$LOAD_MORE_RUNS)}
</button>
diff --git a/src/components/features/automations/detail/back-link.tsx b/src/components/features/automations/detail/back-link.tsx
index b238736ed0..bf91d89ed1 100644
--- a/src/components/features/automations/detail/back-link.tsx
+++ b/src/components/features/automations/detail/back-link.tsx
@@ -9,7 +9,7 @@ export function BackLink() {
return (
<NavigationLink
to="/automations"
- className="inline-flex items-center gap-1.5 text-sm text-content-muted hover:text-content"
+ className="inline-flex items-center gap-1.5 text-sm text-muted hover:text-foreground"
>
<ChevronLeftIcon className="size-4" />
{t(I18nKey.AUTOMATIONS$DETAIL$BACK_TO_LIST)}
diff --git a/src/components/features/automations/detail/branch-badge.tsx b/src/components/features/automations/detail/branch-badge.tsx
index 380f47fd9c..81ae76b523 100644
--- a/src/components/features/automations/detail/branch-badge.tsx
+++ b/src/components/features/automations/detail/branch-badge.tsx
@@ -4,7 +4,7 @@ interface BranchBadgeProps {
export function BranchBadge({ branch }: BranchBadgeProps) {
return (
- <span className="inline-flex items-center rounded-full border border-border bg-pill-bg px-2.5 py-0.5 text-xs text-content-muted">
+ <span className="inline-flex items-center rounded-full border border-[var(--oh-border)] bg-surface-raised px-2.5 py-0.5 text-xs text-muted">
{branch}
</span>
);
diff --git a/src/components/features/automations/detail/config-field.tsx b/src/components/features/automations/detail/config-field.tsx
index 1c68981280..1f40edf648 100644
--- a/src/components/features/automations/detail/config-field.tsx
+++ b/src/components/features/automations/detail/config-field.tsx
@@ -8,8 +8,8 @@ export function ConfigField({ icon, label, children }: ConfigFieldProps) {
return (
<div className="flex flex-col gap-2">
<div className="flex items-center gap-2">
- <span className="size-3.5 text-content-muted">{icon}</span>
- <span className="text-xs font-medium text-content-muted">{label}</span>
+ <span className="size-3.5 text-muted">{icon}</span>
+ <span className="text-xs font-medium text-muted">{label}</span>
</div>
<div className="text-sm text-content">{children}</div>
</div>
diff --git a/src/components/features/automations/detail/detail-skeleton.tsx b/src/components/features/automations/detail/detail-skeleton.tsx
index 277a483d34..641332520d 100644
--- a/src/components/features/automations/detail/detail-skeleton.tsx
+++ b/src/components/features/automations/detail/detail-skeleton.tsx
@@ -1,6 +1,6 @@
function SkeletonBlock({ className }: { className: string }) {
return (
- <div className={`animate-pulse rounded bg-surface-elevated ${className}`} />
+ <div className={`animate-pulse rounded bg-surface-raised ${className}`} />
);
}
diff --git a/src/components/features/automations/detail/not-found-state.tsx b/src/components/features/automations/detail/not-found-state.tsx
index 85069801a7..2d80608a4a 100644
--- a/src/components/features/automations/detail/not-found-state.tsx
+++ b/src/components/features/automations/detail/not-found-state.tsx
@@ -8,11 +8,11 @@ export function NotFoundState() {
return (
<div className="flex flex-col items-center justify-center py-20">
- <ExclamationCircleIcon className="size-12 text-content-muted" />
+ <ExclamationCircleIcon className="size-12 text-muted" />
<p className="mt-4 text-sm font-medium text-content">
{t(I18nKey.AUTOMATIONS$DETAIL$NOT_FOUND_TITLE)}
</p>
- <p className="mt-2 text-sm text-content-muted">
+ <p className="mt-2 text-sm text-muted">
{t(I18nKey.AUTOMATIONS$DETAIL$NOT_FOUND_MESSAGE)}
</p>
<div className="mt-6">
diff --git a/src/components/features/automations/detail/plugin-chip.tsx b/src/components/features/automations/detail/plugin-chip.tsx
index d95f9a989e..061a7193cd 100644
--- a/src/components/features/automations/detail/plugin-chip.tsx
+++ b/src/components/features/automations/detail/plugin-chip.tsx
@@ -4,7 +4,7 @@ interface PluginChipProps {
export function PluginChip({ name }: PluginChipProps) {
return (
- <span className="inline-flex items-center rounded-full border border-border bg-muted-overlay px-3.5 py-1.5 text-sm text-content">
+ <span className="inline-flex items-center rounded-full border border-[var(--oh-border)] bg-[var(--oh-surface-deep)] px-3.5 py-1.5 text-sm text-content">
{name}
</span>
);
diff --git a/src/components/features/automations/detail/prompt-section.tsx b/src/components/features/automations/detail/prompt-section.tsx
index 052561e22f..757022be46 100644
--- a/src/components/features/automations/detail/prompt-section.tsx
+++ b/src/components/features/automations/detail/prompt-section.tsx
@@ -15,7 +15,7 @@ export function PromptSection({ prompt }: PromptSectionProps) {
icon={<TerminalIcon className="size-4" />}
title={t(I18nKey.AUTOMATIONS$DETAIL$PROMPT)}
>
- <div className="rounded-xl bg-muted-overlay">
+ <div className="rounded-xl bg-[var(--oh-surface-deep)]">
<p className="whitespace-pre-wrap text-sm leading-6 text-content">
{prompt}
</p>
diff --git a/src/components/features/automations/detail/run-status-badge.tsx b/src/components/features/automations/detail/run-status-badge.tsx
index cea0fdb535..a109f3ff1f 100644
--- a/src/components/features/automations/detail/run-status-badge.tsx
+++ b/src/components/features/automations/detail/run-status-badge.tsx
@@ -16,19 +16,19 @@ const statusConfig: Record<
[AutomationRunStatus.COMPLETED]: {
label: I18nKey.AUTOMATIONS$DETAIL$SUCCESSFUL,
style:
- "border-status-success-border bg-status-success-bg text-status-success-text",
+ "border-[var(--oh-success)]/50 bg-[var(--oh-success)]/10 text-[var(--oh-success)]",
},
[AutomationRunStatus.FAILED]: {
label: I18nKey.AUTOMATIONS$DETAIL$FAILED,
- style: "border-status-fail-border bg-status-fail-bg text-status-fail-text",
+ style: "border-[var(--oh-danger)]/50 bg-[var(--oh-danger)]/10 text-danger",
},
[AutomationRunStatus.PENDING]: {
label: I18nKey.AUTOMATIONS$DETAIL$PENDING,
- style: "border-border bg-surface-elevated text-content-muted",
+ style: "border-[var(--oh-border)] bg-surface-raised text-muted",
},
[AutomationRunStatus.RUNNING]: {
label: I18nKey.AUTOMATIONS$DETAIL$RUNNING,
- style: "border-border bg-surface-elevated text-content-muted",
+ style: "border-[var(--oh-border)] bg-surface-raised text-muted",
},
};
diff --git a/src/components/features/automations/detail/section-card.tsx b/src/components/features/automations/detail/section-card.tsx
index acbce725f5..49428bb1b8 100644
--- a/src/components/features/automations/detail/section-card.tsx
+++ b/src/components/features/automations/detail/section-card.tsx
@@ -6,9 +6,9 @@ interface SectionCardProps {
export function SectionCard({ icon, title, children }: SectionCardProps) {
return (
- <div className="rounded-2xl border border-border bg-surface-card">
- <div className="flex items-center gap-2 border-b border-border px-5 pb-3 pt-4">
- <span className="size-4 text-content-muted">{icon}</span>
+ <div className="rounded-2xl border border-[var(--oh-border)] bg-[var(--oh-surface)]">
+ <div className="flex items-center gap-2 border-b border-[var(--oh-border)] px-5 pb-3 pt-4">
+ <span className="size-4 text-muted">{icon}</span>
<h3 className="text-sm font-medium text-content">{title}</h3>
</div>
<div className="px-5 py-5">{children}</div>
diff --git a/src/components/features/automations/empty-state.tsx b/src/components/features/automations/empty-state.tsx
index 99ecae1d15..0a4eb0bddd 100644
--- a/src/components/features/automations/empty-state.tsx
+++ b/src/components/features/automations/empty-state.tsx
@@ -8,10 +8,8 @@ export function EmptyState() {
return (
<div className="flex flex-col items-center justify-center py-12">
- <DatabaseIcon className="size-12 text-content-icon" />
- <p className="mt-4 text-sm text-content-muted">
- {t(I18nKey.AUTOMATIONS$EMPTY)}
- </p>
+ <DatabaseIcon className="size-12 text-muted" />
+ <p className="mt-4 text-sm text-muted">{t(I18nKey.AUTOMATIONS$EMPTY)}</p>
{/* How to create section */}
<div className="mt-8 flex justify-center">
diff --git a/src/components/features/automations/error-state.tsx b/src/components/features/automations/error-state.tsx
index 9738c93c52..a91bc8e131 100644
--- a/src/components/features/automations/error-state.tsx
+++ b/src/components/features/automations/error-state.tsx
@@ -11,14 +11,14 @@ export function ErrorState({ onRetry }: ErrorStateProps) {
return (
<div className="flex flex-col items-center justify-center py-20">
- <ExclamationCircleIcon className="size-12 text-status-fail-text" />
- <p className="mt-4 text-sm text-content-muted">
+ <ExclamationCircleIcon className="size-12 text-danger" />
+ <p className="mt-4 text-sm text-muted">
{t(I18nKey.AUTOMATIONS$ERROR_TITLE)}
</p>
<button
type="button"
onClick={onRetry}
- className="mt-4 rounded-lg border border-border px-4 py-2 text-sm text-white hover:bg-surface-elevated"
+ className="mt-4 rounded-lg border border-[var(--oh-border)] px-4 py-2 text-sm text-white hover:bg-surface-raised"
>
{t(I18nKey.AUTOMATIONS$ERROR_RETRY)}
</button>
diff --git a/src/components/features/automations/kebab-menu.tsx b/src/components/features/automations/kebab-menu.tsx
index 552356f320..d21f7bf3bc 100644
--- a/src/components/features/automations/kebab-menu.tsx
+++ b/src/components/features/automations/kebab-menu.tsx
@@ -37,14 +37,14 @@ export function KebabMenu({ items }: KebabMenuProps) {
e.stopPropagation();
setOpen(!open);
}}
- className="flex size-8 cursor-pointer items-center justify-center rounded border border-border bg-surface hover:bg-surface-elevated"
+ className="flex size-8 cursor-pointer items-center justify-center rounded border border-[var(--oh-border)] bg-surface hover:bg-surface-raised"
aria-label="Automation actions"
>
- <KebabVerticalIcon className="size-4 text-content-muted" />
+ <KebabVerticalIcon className="size-4 text-muted" />
</button>
{open && (
- <div className="absolute right-0 top-full z-10 mt-1 w-36 rounded-lg border border-border bg-surface-elevated py-1 shadow-lg">
+ <div className="absolute right-0 top-full z-10 mt-1 w-36 rounded-lg border border-[var(--oh-border)] bg-surface-raised py-1 shadow-lg">
{items.map((item) => (
<button
key={item.label}
@@ -54,10 +54,8 @@ export function KebabMenu({ items }: KebabMenuProps) {
item.onClick();
setOpen(false);
}}
- className={`flex w-full cursor-pointer items-center gap-2 px-4 py-2 text-sm hover:bg-border ${
- item.variant === "danger"
- ? "text-status-fail-text"
- : "text-white"
+ className={`flex w-full cursor-pointer items-center gap-2 px-4 py-2 text-sm hover:bg-surface-raised ${
+ item.variant === "danger" ? "text-danger" : "text-white"
}`}
>
{item.icon}
diff --git a/src/components/features/automations/metadata-chip.tsx b/src/components/features/automations/metadata-chip.tsx
index af2b6fab04..595667d1f2 100644
--- a/src/components/features/automations/metadata-chip.tsx
+++ b/src/components/features/automations/metadata-chip.tsx
@@ -5,7 +5,7 @@ interface MetadataChipProps {
export function MetadataChip({ icon, label }: MetadataChipProps) {
return (
- <span className="inline-flex items-center gap-1.5 rounded-full border border-border px-3 py-1 text-xs text-content-muted">
+ <span className="inline-flex items-center gap-1.5 rounded-full border border-[var(--oh-border)] px-3 py-1 text-xs text-muted">
{icon}
{label}
</span>
diff --git a/src/components/features/automations/search-input.tsx b/src/components/features/automations/search-input.tsx
index 35f855f571..aa2f0c85e1 100644
--- a/src/components/features/automations/search-input.tsx
+++ b/src/components/features/automations/search-input.tsx
@@ -12,13 +12,13 @@ export function SearchInput({ value, onChange }: SearchInputProps) {
return (
<div className="relative">
- <SearchIcon className="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-content-muted" />
+ <SearchIcon className="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-muted" />
<input
type="text"
value={value}
onChange={(e) => onChange(e.target.value)}
placeholder={t(I18nKey.AUTOMATIONS$SEARCH_PLACEHOLDER)}
- className="w-full max-w-sm rounded-lg border border-border bg-surface-card py-2 pl-10 pr-3 text-sm text-white placeholder:text-content-muted focus:border-border-hover focus:outline-none"
+ className="w-full max-w-sm rounded-lg border border-[var(--oh-border)] bg-[var(--oh-surface)] py-2 pl-10 pr-3 text-sm text-white placeholder:text-muted focus:border-[var(--oh-border)] focus:outline-none"
/>
</div>
);
diff --git a/src/components/features/automations/status-badge.tsx b/src/components/features/automations/status-badge.tsx
index 2a6af72c2e..ba234de236 100644
--- a/src/components/features/automations/status-badge.tsx
+++ b/src/components/features/automations/status-badge.tsx
@@ -4,7 +4,7 @@ interface StatusBadgeProps {
export function StatusBadge({ count }: StatusBadgeProps) {
return (
- <span className="ml-2 inline-flex items-center justify-center rounded-full bg-border px-2 py-0.5 text-xs text-white">
+ <span className="ml-2 inline-flex items-center justify-center rounded-full bg-surface-raised px-2 py-0.5 text-xs text-foreground">
{count}
</span>
);
diff --git a/src/components/features/automations/toggle-switch.tsx b/src/components/features/automations/toggle-switch.tsx
index 2d07919fa3..99cb05e859 100644
--- a/src/components/features/automations/toggle-switch.tsx
+++ b/src/components/features/automations/toggle-switch.tsx
@@ -17,15 +17,15 @@ export function ToggleSwitch({ enabled, label, onToggle }: ToggleSwitchProps) {
}}
className={`relative inline-flex h-[22px] w-[40px] shrink-0 cursor-pointer items-center rounded-full border transition-colors ${
enabled
- ? "border-toggle-active-border bg-toggle-active-bg"
- : "border-toggle-inactive-border bg-toggle-inactive"
+ ? "border-[var(--oh-success)] bg-[var(--oh-success)]/15"
+ : "border-[var(--oh-border)] bg-surface-raised"
}`}
>
<span
className={`inline-block size-4 rounded-full transition-transform ${
enabled
- ? "translate-x-[20px] bg-toggle-active"
- : "translate-x-[3px] bg-toggle-inactive-knob"
+ ? "translate-x-[20px] bg-[var(--oh-success)]"
+ : "translate-x-[3px] bg-[var(--oh-muted)]"
}`}
/>
</button>
diff --git a/src/components/features/backends/backend-form-modal.tsx b/src/components/features/backends/backend-form-modal.tsx
index eb0f55fd51..94a7b57bb2 100644
--- a/src/components/features/backends/backend-form-modal.tsx
+++ b/src/components/features/backends/backend-form-modal.tsx
@@ -100,10 +100,10 @@ function BackendStatusBadge({
{statusLabel}
</span>
<span className="text-tertiary-alt">·</span>
- <span className="text-gray-300">{kindLabel}</span>
+ <span className="text-[var(--oh-text-tertiary)]">{kindLabel}</span>
{version ? (
<span
- className="text-xs text-gray-400"
+ className="text-xs text-[var(--oh-muted)]"
data-testid={`${testIdRoot}-version`}
>
{t(I18nKey.BACKEND$VERSION_LABEL, { version })}
@@ -119,7 +119,7 @@ function BackendStatusBadge({
<span className="font-semibold text-red-300">
{t(I18nKey.BACKEND$HEALTH_FAILED_TITLE)}
</span>
- <span className="text-xs text-gray-300">
+ <span className="text-xs text-[var(--oh-text-tertiary)]">
{t(I18nKey.BACKEND$HEALTH_FAILED_DETAIL, {
count: consecutiveFailures,
})}
@@ -275,11 +275,11 @@ export function BackendForm({
{/* Divider with "or" */}
<div className="flex items-center gap-3">
- <div className="flex-1 border-t border-gray-600" />
- <span className="text-xs text-gray-500 uppercase">
+ <div className="flex-1 border-t border-[var(--oh-border)]" />
+ <span className="text-xs text-[var(--oh-text-subtle)] uppercase">
{t(I18nKey.BACKEND$LOGIN_OR)}
</span>
- <div className="flex-1 border-t border-gray-600" />
+ <div className="flex-1 border-t border-[var(--oh-border)]" />
</div>
{/* Manual API key section */}
@@ -294,7 +294,7 @@ export function BackendForm({
placeholder=""
className="w-full"
/>
- <p className="text-xs text-gray-400">
+ <p className="text-xs text-[var(--oh-muted)]">
{t(I18nKey.BACKEND$KEY_DOCS_HINT)}{" "}
<a
href="https://docs.openhands.dev/openhands/usage/settings/api-keys-settings"
@@ -358,7 +358,7 @@ export function BackendForm({
{t(I18nKey.BACKEND$KIND_CLOUD)}
</label>
</div>
- <p className="text-xs text-gray-400 mt-3">
+ <p className="text-xs text-[var(--oh-muted)] mt-3">
{kind === "cloud"
? t(I18nKey.BACKEND$KEY_HELPER_CLOUD)
: t(I18nKey.BACKEND$KEY_HELPER_LOCAL)}
@@ -418,13 +418,13 @@ export function BackendFormModal({
>
<div
data-testid={`${testIdRoot}-modal`}
- className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-tertiary"
+ className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-[var(--oh-border)]"
style={{ width: "480px" }}
>
<div className="flex flex-col gap-1">
<h3 className="text-xl font-bold">{t(titleKey)}</h3>
{mode === "add" ? (
- <p className="text-xs text-gray-400">
+ <p className="text-xs text-[var(--oh-muted)]">
{t(I18nKey.BACKEND$ADD_SUBTITLE)}
</p>
) : null}
diff --git a/src/components/features/backends/backend-selector.tsx b/src/components/features/backends/backend-selector.tsx
index 1cd9ab16af..a94a6f66ca 100644
--- a/src/components/features/backends/backend-selector.tsx
+++ b/src/components/features/backends/backend-selector.tsx
@@ -226,7 +226,7 @@ export function BackendSelector({
data-testid="add-backend-menu-item"
onMouseDown={preventDropdownMenuClose}
onClick={openAddBackendModal}
- className="flex w-full items-center gap-2 px-2 py-2 rounded-md text-sm cursor-pointer text-white hover:bg-[#5C5D62]"
+ className="flex w-full items-center gap-2 px-2 py-2 rounded-md text-sm cursor-pointer text-white hover:bg-[var(--oh-interactive-hover)]"
>
<Plus width={16} height={16} className="text-white shrink-0" />
{t(I18nKey.BACKEND$ADD)}
@@ -236,7 +236,7 @@ export function BackendSelector({
data-testid="manage-backends-menu-item"
onMouseDown={preventDropdownMenuClose}
onClick={openManageBackendsModal}
- className="flex w-full items-center gap-2 px-2 py-2 rounded-md text-sm cursor-pointer text-white hover:bg-[#5C5D62]"
+ className="flex w-full items-center gap-2 px-2 py-2 rounded-md text-sm cursor-pointer text-white hover:bg-[var(--oh-interactive-hover)]"
>
<Settings width={16} height={16} className="text-white shrink-0" />
{t(I18nKey.BACKEND$MANAGE)}
@@ -304,7 +304,7 @@ export function BackendSelector({
placeholder={active.backend.name}
loading={someCloudLoading}
options={options}
- className="bg-transparent border-transparent hover:bg-[#1f1f1f99] focus-within:bg-[#1f1f1f99]"
+ className="bg-transparent border-transparent hover:bg-[var(--oh-surface-raised)] focus-within:bg-[var(--oh-surface-raised)]"
/>
</div>
{!hideTrigger ? (
@@ -315,8 +315,8 @@ export function BackendSelector({
onClick={() => navigate("/settings")}
className={
isSettingsActive
- ? "inline-flex items-center justify-center shrink-0 w-9 h-9 rounded-md bg-[#1f1f1f99] text-white font-medium transition-colors"
- : "inline-flex items-center justify-center shrink-0 w-9 h-9 rounded-md text-[#8C8C8C] hover:text-white hover:bg-[#1f1f1f99] transition-colors"
+ ? "inline-flex items-center justify-center shrink-0 w-9 h-9 rounded-md bg-tertiary text-white font-medium transition-colors cursor-pointer"
+ : "inline-flex items-center justify-center shrink-0 w-9 h-9 rounded-md text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)] transition-colors cursor-pointer"
}
>
<Settings width={16} height={16} />
diff --git a/src/components/features/backends/backend-status-dot.tsx b/src/components/features/backends/backend-status-dot.tsx
index 65bdfe4be8..8569132e25 100644
--- a/src/components/features/backends/backend-status-dot.tsx
+++ b/src/components/features/backends/backend-status-dot.tsx
@@ -29,7 +29,7 @@ export function BackendStatusDot({
label = "Disconnected";
status = "disconnected";
} else {
- color = "bg-neutral-500";
+ color = "bg-[var(--oh-interactive-selected)]";
label = "Checking connection";
status = "checking";
}
diff --git a/src/components/features/backends/device-flow-auth.tsx b/src/components/features/backends/device-flow-auth.tsx
index 252f2ab740..492501c4da 100644
--- a/src/components/features/backends/device-flow-auth.tsx
+++ b/src/components/features/backends/device-flow-auth.tsx
@@ -150,7 +150,7 @@ export function DeviceFlowAuth({
aria-live="polite"
>
<LoadingSpinner />
- <span className="text-sm text-gray-300">
+ <span className="text-sm text-[var(--oh-text-tertiary)]">
{t(I18nKey.BACKEND$AUTH_STARTING)}
</span>
</div>
@@ -169,12 +169,12 @@ export function DeviceFlowAuth({
{t(I18nKey.BACKEND$AUTH_AWAITING)}
</span>
</div>
- <p className="text-sm text-gray-300">
+ <p className="text-sm text-[var(--oh-text-tertiary)]">
{t(I18nKey.BACKEND$AUTH_BROWSER_OPENED)}
</p>
{deviceFlow.verificationUrl &&
isValidVerificationUrl(deviceFlow.verificationUrl) && (
- <div className="text-xs text-gray-400">
+ <div className="text-xs text-[var(--oh-muted)]">
<p>{t(I18nKey.BACKEND$AUTH_OPEN_MANUALLY)}</p>
<a
href={deviceFlow.verificationUrl}
diff --git a/src/components/features/backends/environment-switch-overlay.tsx b/src/components/features/backends/environment-switch-overlay.tsx
index 108cd24d9f..b4b50f489a 100644
--- a/src/components/features/backends/environment-switch-overlay.tsx
+++ b/src/components/features/backends/environment-switch-overlay.tsx
@@ -157,8 +157,8 @@ export function EnvironmentSwitchOverlay() {
aria-live="polite"
aria-atomic="true"
>
- <div className="pointer-events-none flex min-w-[280px] max-w-[420px] flex-col items-center gap-2 rounded-xl border border-border bg-card px-5 py-4 text-foreground shadow-2xl">
- <EnvironmentSwitchIcon className="mb-2 h-6 w-20 shrink-0 text-foreground" />
+ <div className="pointer-events-none flex min-w-[280px] max-w-[420px] flex-col items-center gap-2 rounded-xl border border-[var(--oh-border)] bg-[var(--oh-surface)] px-5 py-4 text-[var(--oh-foreground)] shadow-2xl">
+ <EnvironmentSwitchIcon className="mb-2 h-6 w-20 shrink-0 text-[var(--oh-foreground)]" />
<p className="text-center text-sm font-medium">
{t(I18nKey.BACKEND$SWITCHING_TO, { environment: target })}
</p>
diff --git a/src/components/features/backends/manage-backends-modal.tsx b/src/components/features/backends/manage-backends-modal.tsx
index 400fbab5c4..d4b9f8cec0 100644
--- a/src/components/features/backends/manage-backends-modal.tsx
+++ b/src/components/features/backends/manage-backends-modal.tsx
@@ -43,7 +43,7 @@ function BackendVersion({ backend }: { backend: Backend }) {
return (
<span
- className="text-xs text-[#7E848C] truncate"
+ className="text-xs text-[var(--oh-text-dim)] truncate"
data-testid={`manage-backends-version-${backend.name}`}
>
{t(I18nKey.BACKEND$VERSION_LABEL, { version })}
@@ -72,16 +72,18 @@ function BackendRow({ backend, health, onEdit, onRemove }: BackendRowProps) {
return (
<li
- className="flex items-center gap-3 px-5 py-3 border-b border-[#363840] last:border-b-0"
+ className="flex items-center gap-3 px-5 py-3 border-b border-[var(--oh-border)] last:border-b-0"
data-testid={`manage-backends-row-${backend.name}`}
>
<BackendStatusDot isConnected={health?.isConnected ?? null} />
<div className="flex flex-col min-w-0 flex-1">
<span className="text-sm text-white truncate">{backend.name}</span>
- <span className="text-xs text-[#A3A3A3] truncate">{backend.host}</span>
+ <span className="text-xs text-[var(--oh-muted)] truncate">
+ {backend.host}
+ </span>
<BackendVersion backend={backend} />
</div>
- <span className="px-2 py-1 rounded-full text-[11px] uppercase tracking-wide text-[#D6D6D6] bg-[#1F1F1F] border border-[#4B4E57]">
+ <span className="px-2 py-1 rounded-full text-[11px] uppercase tracking-wide text-[var(--oh-text-tertiary)] bg-[var(--oh-surface)] border border-[var(--oh-border)]">
{backend.kind === "cloud"
? t(I18nKey.BACKEND$KIND_CLOUD)
: t(I18nKey.BACKEND$KIND_LOCAL)}
@@ -91,7 +93,7 @@ function BackendRow({ backend, health, onEdit, onRemove }: BackendRowProps) {
onClick={onEdit}
aria-label={t(I18nKey.BACKEND$EDIT)}
data-testid={`manage-backends-edit-${backend.name}`}
- className="px-2 py-1 rounded text-xs text-[#D6D6D6] hover:bg-[#5C5D62] hover:text-white cursor-pointer"
+ className="px-2 py-1 rounded text-xs text-[var(--oh-text-tertiary)] hover:bg-[var(--oh-interactive-hover)] hover:text-white cursor-pointer"
>
{t(I18nKey.BACKEND$EDIT)}
</button>
@@ -100,7 +102,7 @@ function BackendRow({ backend, health, onEdit, onRemove }: BackendRowProps) {
onClick={onRemove}
aria-label={t(I18nKey.BACKEND$REMOVE)}
data-testid={`manage-backends-remove-${backend.name}`}
- className="flex items-center gap-1 px-2 py-1 rounded text-xs text-[#D6D6D6] hover:bg-[#5C5D62] hover:text-white cursor-pointer"
+ className="flex items-center gap-1 px-2 py-1 rounded text-xs text-[var(--oh-text-tertiary)] hover:bg-[var(--oh-interactive-hover)] hover:text-white cursor-pointer"
>
<CloseIcon width={12} height={12} />
<span>{t(I18nKey.BACKEND$REMOVE)}</span>
@@ -137,11 +139,11 @@ export function ManageBackendsModal({ onClose }: ManageBackendsModalProps) {
<div
data-testid="manage-backends-modal"
className={cn(
- "flex flex-col bg-[#26282D] border border-[#727987] rounded-xl",
+ "flex flex-col bg-[var(--oh-surface)] border border-[var(--oh-border)] rounded-xl",
"w-[640px] max-w-[90vw] max-h-[70vh]",
)}
>
- <div className="flex items-center justify-between px-5 py-3 border-b border-[#727987]">
+ <div className="flex items-center justify-between px-5 py-3 border-b border-[var(--oh-border)]">
<span className="text-sm font-semibold text-white">
{t(I18nKey.BACKEND$MANAGE_TITLE)}
</span>
@@ -152,7 +154,7 @@ export function ManageBackendsModal({ onClose }: ManageBackendsModalProps) {
data-testid="manage-backends-list"
>
{backends.length === 0 ? (
- <p className="px-5 py-6 text-sm text-[#B7BDC2] text-center">
+ <p className="px-5 py-6 text-sm text-[var(--oh-text-secondary)] text-center">
{t(I18nKey.BACKEND$MANAGE_EMPTY)}
</p>
) : (
@@ -175,7 +177,7 @@ export function ManageBackendsModal({ onClose }: ManageBackendsModalProps) {
)}
</div>
- <div className="flex justify-between gap-2 px-5 py-3 border-t border-[#727987]">
+ <div className="flex justify-between gap-2 px-5 py-3 border-t border-[var(--oh-border)]">
<BrandButton
type="button"
variant="secondary"
diff --git a/src/components/features/browser/browser.tsx b/src/components/features/browser/browser.tsx
index 95c8f1fa1a..c2636a3f35 100644
--- a/src/components/features/browser/browser.tsx
+++ b/src/components/features/browser/browser.tsx
@@ -17,8 +17,8 @@ export function BrowserPanel() {
: `data:image/png;base64,${screenshotSrc ?? ""}`;
return (
- <div className="h-full w-full flex flex-col text-neutral-400">
- <div className="w-full p-2 truncate border-b border-neutral-600">
+ <div className="h-full w-full flex flex-col text-[var(--oh-muted)]">
+ <div className="w-full p-2 truncate border-b border-[var(--oh-border)]">
{url}
</div>
<div className="overflow-y-auto grow scrollbar-hide rounded-xl">
diff --git a/src/components/features/browser/empty-browser-message.tsx b/src/components/features/browser/empty-browser-message.tsx
index 66d9333e8c..3d8618c968 100644
--- a/src/components/features/browser/empty-browser-message.tsx
+++ b/src/components/features/browser/empty-browser-message.tsx
@@ -8,7 +8,7 @@ export function EmptyBrowserMessage() {
return (
<div className="flex flex-col items-center justify-center w-full h-full p-10 gap-4">
<IoIosGlobe size={113} />
- <span className="text-[#8D95A9] text-[19px] font-normal leading-5">
+ <span className="text-[var(--oh-text-dim)] text-[19px] font-normal leading-5">
{" "}
{t(I18nKey.BROWSER$NO_PAGE_LOADED)}
</span>
diff --git a/src/components/features/chat/btw-messages.tsx b/src/components/features/chat/btw-messages.tsx
index 28528467fb..8dfcae4ac2 100644
--- a/src/components/features/chat/btw-messages.tsx
+++ b/src/components/features/chat/btw-messages.tsx
@@ -42,7 +42,7 @@ export function BtwMessages({ conversationId }: BtwMessagesProps) {
{isPending && (
<span
data-testid="btw-spinner"
- className="inline-block w-3.5 h-3.5 ml-2 rounded-full border-2 border-neutral-500 border-t-transparent animate-spin"
+ className="inline-block w-3.5 h-3.5 ml-2 rounded-full border-2 border-[var(--oh-border-input)] border-t-transparent animate-spin"
/>
)}
</span>
diff --git a/src/components/features/chat/change-agent-button.tsx b/src/components/features/chat/change-agent-button.tsx
index 1a213911ce..c9827b9239 100644
--- a/src/components/features/chat/change-agent-button.tsx
+++ b/src/components/features/chat/change-agent-button.tsx
@@ -155,7 +155,7 @@ export function ChangeAgentButton() {
className={cn(
"flex items-center rounded-[100px] transition-[border-color,color,opacity]",
isExecutionAgent
- ? "border border-transparent text-[#959CB2]"
+ ? "border border-transparent text-[var(--oh-muted)]"
: "border border-[#597FF4] bg-[#4A67BD]",
!isButtonDisabled &&
isExecutionAgent &&
diff --git a/src/components/features/chat/chat-add-file-button.tsx b/src/components/features/chat/chat-add-file-button.tsx
index c26f54dec0..aebcfee30a 100644
--- a/src/components/features/chat/chat-add-file-button.tsx
+++ b/src/components/features/chat/chat-add-file-button.tsx
@@ -20,8 +20,8 @@ export function ChatAddFileButton({
className={cn(
"relative shrink-0 size-6 rounded-full transition-colors",
disabled
- ? "cursor-not-allowed text-[#6B7280]"
- : "cursor-pointer text-[#959CB2] hover:text-white hover:bg-white/10",
+ ? "cursor-not-allowed text-[var(--oh-text-subtle)]"
+ : "cursor-pointer text-[var(--oh-muted)] hover:text-white hover:bg-white/10",
)}
aria-label={t(I18nKey.CHAT_INTERFACE$ADD_FILE)}
data-testid="paperclip-icon"
diff --git a/src/components/features/chat/chat-send-button.tsx b/src/components/features/chat/chat-send-button.tsx
index a4c633af81..0b895796e7 100644
--- a/src/components/features/chat/chat-send-button.tsx
+++ b/src/components/features/chat/chat-send-button.tsx
@@ -18,7 +18,7 @@ export function ChatSendButton({
className={cn(
"flex items-center justify-center rounded-full border border-white size-8",
disabled
- ? "cursor-not-allowed border-[#959CB2]"
+ ? "cursor-not-allowed border-[var(--oh-muted)]"
: "cursor-pointer hover:bg-white/10",
buttonClassName,
)}
@@ -27,7 +27,10 @@ export function ChatSendButton({
onClick={handleSubmit}
disabled={disabled}
>
- <ArrowUp className="w-4 h-4" color={disabled ? "#959CB2" : "white"} />
+ <ArrowUp
+ className="w-4 h-4"
+ color={disabled ? "var(--oh-muted)" : "white"}
+ />
</button>
);
}
diff --git a/src/components/features/chat/chat-status-indicator.tsx b/src/components/features/chat/chat-status-indicator.tsx
index 8add46667c..bf1de033d7 100644
--- a/src/components/features/chat/chat-status-indicator.tsx
+++ b/src/components/features/chat/chat-status-indicator.tsx
@@ -15,7 +15,7 @@ function ChatStatusIndicator({
<div
data-testid="chat-status-indicator"
className={cn(
- "w-full max-w-full rounded-[100px] p-1 bg-[#25272D] flex items-center gap-1",
+ "w-full max-w-full rounded-[100px] p-1 bg-[var(--oh-surface)] flex items-center gap-1",
)}
>
<AnimatePresence mode="wait">
diff --git a/src/components/features/chat/components/chat-input-actions.tsx b/src/components/features/chat/components/chat-input-actions.tsx
index 154dfe08cb..d69ca3149a 100644
--- a/src/components/features/chat/components/chat-input-actions.tsx
+++ b/src/components/features/chat/components/chat-input-actions.tsx
@@ -446,10 +446,10 @@ export function ChatInputActions({
>
<ContextMenu
testId="overflow-model-submenu"
- className="overflow-visible min-w-[220px]"
+ className="overflow-visible min-w-[220px] max-w-[320px]"
>
<li className="text-sm">
- <div className="p-2 leading-5 text-white whitespace-nowrap">
+ <div className="p-2 leading-5 text-white break-all">
{conversation?.llm_model}
</div>
</li>
@@ -458,7 +458,7 @@ export function ChatInputActions({
<NavigationLink
to="/settings"
onClick={closeOverflowMenus}
- className="flex h-[30px] items-center gap-2 rounded p-2 leading-5 text-white hover:bg-[#5C5D62] transition-colors"
+ className="flex h-[30px] items-center gap-2 rounded p-2 leading-5 text-white hover:bg-[var(--oh-interactive-hover)] transition-colors"
>
<SettingsGearIcon
width={16}
@@ -507,7 +507,7 @@ export function ChatInputActions({
ref={overflowTriggerRef}
type="button"
className={cn(
- "flex size-6 items-center justify-center rounded-full text-[#959CB2] transition-colors",
+ "flex size-6 items-center justify-center rounded-full text-[var(--oh-muted)] transition-colors",
"hover:bg-white/10 hover:text-white cursor-pointer",
)}
aria-label="More input actions"
diff --git a/src/components/features/chat/components/chat-input-container.tsx b/src/components/features/chat/components/chat-input-container.tsx
index 635a0979c6..684c5bb7d0 100644
--- a/src/components/features/chat/components/chat-input-container.tsx
+++ b/src/components/features/chat/components/chat-input-container.tsx
@@ -65,7 +65,7 @@ export function ChatInputContainer({
<div
ref={chatContainerRef}
className={cn(
- "bg-[#25272D] box-border content-stretch flex flex-col items-start justify-center p-4 relative rounded-[15px] w-full",
+ "bg-[var(--oh-surface)] box-border content-stretch flex flex-col items-start justify-center p-4 relative rounded-[15px] w-full",
conversationMode === "plan" && "border border-[#597FF4]",
)}
onDragOver={(e) => onDragOver(e, disabled)}
diff --git a/src/components/features/chat/components/chat-input-field.tsx b/src/components/features/chat/components/chat-input-field.tsx
index 43310b5c1d..f42db5b0c4 100644
--- a/src/components/features/chat/components/chat-input-field.tsx
+++ b/src/components/features/chat/components/chat-input-field.tsx
@@ -36,7 +36,7 @@ export function ChatInputField({
className="box-border content-stretch flex flex-row items-center justify-start min-h-6 p-0 relative shrink-0 flex-1"
data-name="Text & caret"
>
- <div className="basis-0 flex flex-col font-normal grow justify-center leading-[0] min-h-px min-w-px overflow-ellipsis overflow-hidden relative shrink-0 text-[#d0d9fa] text-[16px] text-left">
+ <div className="basis-0 flex flex-col font-normal grow justify-center leading-[0] min-h-px min-w-px overflow-ellipsis overflow-hidden relative shrink-0 text-[var(--oh-text-tertiary)] text-[16px] text-left">
<div
ref={chatInputRef}
className={cn(
diff --git a/src/components/features/chat/components/chat-input-model.tsx b/src/components/features/chat/components/chat-input-model.tsx
index 249e87808d..e4eb1b46bd 100644
--- a/src/components/features/chat/components/chat-input-model.tsx
+++ b/src/components/features/chat/components/chat-input-model.tsx
@@ -28,7 +28,7 @@ export function ChatInputModel() {
<button
type="button"
className={cn(
- "inline-flex items-center gap-1 rounded-[100px] border border-transparent px-1.5 text-sm font-normal leading-5 text-[#959CB2] whitespace-nowrap min-w-0 transition-[border-color,color]",
+ "inline-flex items-center gap-1 rounded-[100px] border border-transparent px-1.5 text-sm font-normal leading-5 text-[var(--oh-muted)] whitespace-nowrap min-w-0 transition-[border-color,color]",
"hover:text-white hover:bg-white/10 cursor-pointer",
)}
title={conversation.llm_model}
@@ -61,7 +61,7 @@ export function ChatInputModel() {
className="z-[60] mb-2 min-w-[200px]"
>
<li className="text-sm">
- <div className="p-2 leading-5 text-white whitespace-nowrap">
+ <div className="p-2 leading-5 text-white break-all">
{conversation.llm_model}
</div>
</li>
@@ -70,7 +70,7 @@ export function ChatInputModel() {
<NavigationLink
to="/settings"
onClick={() => setIsPopoverOpen(false)}
- className="flex h-[30px] items-center gap-2 rounded p-2 leading-5 text-white hover:bg-[#5C5D62] transition-colors"
+ className="flex h-[30px] items-center gap-2 rounded p-2 leading-5 text-white hover:bg-[var(--oh-interactive-hover)] transition-colors"
>
<SettingsGearIcon
width={16}
diff --git a/src/components/features/chat/components/slash-command-menu.tsx b/src/components/features/chat/components/slash-command-menu.tsx
index d2f9a16182..c68636444a 100644
--- a/src/components/features/chat/components/slash-command-menu.tsx
+++ b/src/components/features/chat/components/slash-command-menu.tsx
@@ -97,7 +97,7 @@ function SlashCommandMenuItem({
type="button"
className={cn(
"w-full px-3 py-2.5 text-left transition-colors",
- isSelected ? "bg-[#383b45]" : "hover:bg-[#2a2d37]",
+ isSelected ? "bg-tertiary" : "hover:bg-[var(--oh-surface-raised)]",
)}
onMouseDown={(e) => {
// Use mouseDown instead of click to fire before input blur
@@ -107,7 +107,7 @@ function SlashCommandMenuItem({
>
<Text className="font-semibold">{item.command}</Text>
{description && (
- <Text className="text-xs text-[#9ca3af] mt-0.5 truncate block">
+ <Text className="text-xs text-[var(--oh-muted)] mt-0.5 truncate block">
{description}
</Text>
)}
@@ -148,10 +148,10 @@ export function SlashCommandMenu({
<div
role="listbox"
aria-label={t("CHAT_INTERFACE$COMMANDS")}
- className="absolute bottom-full left-0 w-full mb-1 bg-[#1e2028] border border-[#383b45] rounded-lg shadow-lg max-h-[300px] overflow-y-auto custom-scrollbar z-50"
+ className="absolute bottom-full left-0 w-full mb-1 bg-[var(--oh-surface)] border border-[var(--oh-border-subtle)] rounded-lg shadow-lg max-h-[300px] overflow-y-auto custom-scrollbar z-50"
data-testid="slash-command-menu"
>
- <div className="px-3 py-2 text-xs text-[#9ca3af] border-b border-[#383b45]">
+ <div className="px-3 py-2 text-xs text-[var(--oh-muted)] border-b border-[var(--oh-border-subtle)]">
{t("CHAT_INTERFACE$COMMANDS")}
</div>
{items.map((item, index) => (
diff --git a/src/components/features/chat/confirmation-mode-enabled.tsx b/src/components/features/chat/confirmation-mode-enabled.tsx
index baa14c5f8d..8b5bcb6f0a 100644
--- a/src/components/features/chat/confirmation-mode-enabled.tsx
+++ b/src/components/features/chat/confirmation-mode-enabled.tsx
@@ -19,7 +19,7 @@ function ConfirmationModeEnabled() {
content={t(I18nKey.COMMON$CONFIRMATION_MODE_ENABLED)}
tooltipClassName="bg-white text-black hover:bg-transparent"
>
- <div className="flex items-center justify-center w-[26px] h-[26px] rounded-lg bg-[#25272D]">
+ <div className="flex items-center justify-center w-[26px] h-[26px] rounded-lg bg-[var(--oh-surface)]">
<LockIcon width={15} height={15} />
</div>
</StyledTooltip>
diff --git a/src/components/features/chat/generic-event-message.tsx b/src/components/features/chat/generic-event-message.tsx
index 4b55c7ab2e..841b5e79ab 100644
--- a/src/components/features/chat/generic-event-message.tsx
+++ b/src/components/features/chat/generic-event-message.tsx
@@ -35,13 +35,13 @@ export function GenericEventMessage({
>
{showDetails ? (
<ArrowUp
- className={`h-4 w-4 inline fill-[#959CB2] ${
+ className={`h-4 w-4 inline fill-[var(--oh-muted)] ${
chevronPosition === "after" ? "ml-2" : "mr-2"
}`}
/>
) : (
<ArrowDown
- className={`h-4 w-4 inline fill-[#959CB2] ${
+ className={`h-4 w-4 inline fill-[var(--oh-muted)] ${
chevronPosition === "after" ? "ml-2" : "mr-2"
}`}
/>
@@ -51,7 +51,7 @@ export function GenericEventMessage({
return (
<div className="flex flex-col gap-1.5 my-1 py-1 text-sm w-full">
- <div className="flex items-center justify-between font-normal text-[#959CB2]">
+ <div className="flex items-center justify-between font-normal text-[var(--oh-muted)]">
<div className="flex items-center">
{chevronPosition === "before" && chevron}
{/* Wrap the title in a span so any whitespace inside Trans-rendered
diff --git a/src/components/features/chat/git-control-bar-branch-button.tsx b/src/components/features/chat/git-control-bar-branch-button.tsx
index 8a3e931e97..0b171ff6cf 100644
--- a/src/components/features/chat/git-control-bar-branch-button.tsx
+++ b/src/components/features/chat/git-control-bar-branch-button.tsx
@@ -48,7 +48,7 @@ export function GitControlBarBranchButton({
className={cn(
"group flex flex-row items-center justify-between gap-2 pl-2.5 pr-2.5 py-1 rounded-[100px] w-fit flex-shrink-0 max-w-[200px] truncate relative",
hasLinkableBranch
- ? "border border-[#525252] bg-transparent hover:border-[#454545] cursor-pointer"
+ ? "border border-[var(--oh-border)] bg-transparent hover:border-[var(--oh-border-subtle)] cursor-pointer"
: "border border-[rgba(71,74,84,0.50)] bg-transparent cursor-not-allowed min-w-[108px]",
)}
>
diff --git a/src/components/features/chat/git-control-bar-pr-button.tsx b/src/components/features/chat/git-control-bar-pr-button.tsx
index 0ee71b1fe7..063e47c92e 100644
--- a/src/components/features/chat/git-control-bar-pr-button.tsx
+++ b/src/components/features/chat/git-control-bar-pr-button.tsx
@@ -41,7 +41,7 @@ export function GitControlBarPrButton({
className={cn(
"flex flex-row gap-1 items-center justify-center px-2 py-1 rounded-[100px] w-[126px] min-w-[126px] h-7",
isButtonEnabled
- ? "bg-[#25272D] hover:bg-[#454545] cursor-pointer"
+ ? "bg-[var(--oh-surface)] hover:bg-tertiary cursor-pointer"
: "bg-[rgba(71,74,84,0.50)] cursor-not-allowed",
)}
>
diff --git a/src/components/features/chat/git-control-bar-pull-button.tsx b/src/components/features/chat/git-control-bar-pull-button.tsx
index a9a7b8f6c3..0a9be811d7 100644
--- a/src/components/features/chat/git-control-bar-pull-button.tsx
+++ b/src/components/features/chat/git-control-bar-pull-button.tsx
@@ -39,7 +39,7 @@ export function GitControlBarPullButton({
className={cn(
"flex flex-row gap-1 items-center justify-center px-0.5 py-1 rounded-[100px] w-[76px] min-w-[76px]",
isButtonEnabled
- ? "bg-[#25272D] hover:bg-[#454545] cursor-pointer"
+ ? "bg-[var(--oh-surface)] hover:bg-tertiary cursor-pointer"
: "bg-[rgba(71,74,84,0.50)] cursor-not-allowed",
)}
>
diff --git a/src/components/features/chat/git-control-bar-push-button.tsx b/src/components/features/chat/git-control-bar-push-button.tsx
index cf6caa991e..fb48d43eb2 100644
--- a/src/components/features/chat/git-control-bar-push-button.tsx
+++ b/src/components/features/chat/git-control-bar-push-button.tsx
@@ -41,7 +41,7 @@ export function GitControlBarPushButton({
className={cn(
"flex flex-row gap-1 items-center justify-center px-2 py-1 rounded-[100px] w-[77px] min-w-[77px]",
isButtonEnabled
- ? "bg-[#25272D] hover:bg-[#454545] cursor-pointer"
+ ? "bg-[var(--oh-surface)] hover:bg-tertiary cursor-pointer"
: "bg-[rgba(71,74,84,0.50)] cursor-not-allowed",
)}
>
diff --git a/src/components/features/chat/git-control-bar-repo-button.tsx b/src/components/features/chat/git-control-bar-repo-button.tsx
index 866bc9ba02..79a97054e6 100644
--- a/src/components/features/chat/git-control-bar-repo-button.tsx
+++ b/src/components/features/chat/git-control-bar-repo-button.tsx
@@ -12,6 +12,7 @@ interface GitControlBarRepoButtonProps {
selectedRepository: string | null | undefined;
gitProvider: Provider | null | undefined;
workspaceName?: string | null;
+ emptyStateLabel?: string;
onClick?: () => void;
disabled?: boolean;
}
@@ -20,6 +21,7 @@ export function GitControlBarRepoButton({
selectedRepository,
gitProvider,
workspaceName,
+ emptyStateLabel: _emptyStateLabel,
onClick,
disabled,
}: GitControlBarRepoButtonProps) {
@@ -53,7 +55,7 @@ export function GitControlBarRepoButton({
rel="noopener noreferrer"
className={cn(
"group flex flex-row items-center justify-between gap-2 pl-2.5 pr-2.5 py-1 rounded-[100px] flex-1 truncate relative",
- "border border-[#525252] bg-transparent hover:border-[#454545] cursor-pointer",
+ "border border-[var(--oh-border)] bg-transparent hover:border-[var(--oh-border-subtle)] cursor-pointer",
)}
>
<div className="w-3 h-3 flex items-center justify-center flex-shrink-0">
@@ -83,7 +85,7 @@ export function GitControlBarRepoButton({
"border border-[rgba(71,74,84,0.50)] bg-transparent",
disabled
? "cursor-not-allowed opacity-50"
- : "cursor-pointer hover:border-[#454545]",
+ : "cursor-pointer hover:border-[var(--oh-border-subtle)]",
)}
>
<div className="w-3 h-3 flex items-center justify-center flex-shrink-0 text-white">
diff --git a/src/components/features/chat/git-control-bar.tsx b/src/components/features/chat/git-control-bar.tsx
index c8842bd738..4a2afb7dd5 100644
--- a/src/components/features/chat/git-control-bar.tsx
+++ b/src/components/features/chat/git-control-bar.tsx
@@ -11,6 +11,7 @@ import { useTaskPolling } from "#/hooks/query/use-task-polling";
import { useUnifiedWebSocketStatus } from "#/hooks/use-unified-websocket-status";
import { useSendMessage } from "#/hooks/use-send-message";
import { useUpdateConversationRepository } from "#/hooks/mutation/use-update-conversation-repository";
+import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
import { Provider } from "#/types/settings";
import { Branch, GitRepository } from "#/types/git";
import { I18nKey } from "#/i18n/declaration";
@@ -31,6 +32,9 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {
const { t } = useTranslation("openhands");
const { conversationId } = useConversationId();
const [isOpenRepoModalOpen, setIsOpenRepoModalOpen] = useState(false);
+ const [isWorkspaceMenuOpen, setIsWorkspaceMenuOpen] = useState(false);
+ const [isFolderBrowserOpen, _setIsFolderBrowserOpen] = useState(false);
+ const workspaceMenuContainerRef = useRef<HTMLDivElement>(null);
const { addRecentRepository } = useHomeStore();
const enqueuePendingMessage = useOptimisticUserMessageStore(
(state) => state.enqueuePendingMessage,
@@ -55,6 +59,8 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {
sendRef.current = send;
}, [send]);
const { mutate: updateRepository } = useUpdateConversationRepository();
+ const { mutate: _createConversation, isPending: _isCreatingConversation } =
+ useCreateConversation();
// Priority: conversation data > task data > locally-detected git info.
// The local fallback runs `git remote get-url origin` / `git rev-parse --abbrev-ref HEAD`
@@ -94,6 +100,31 @@ export function GitControlBar({ onSuggestionsClick }: GitControlBarProps) {
// Enable buttons only when conversation exists and WS is connected
const isConversationReady = !!conversation && webSocketStatus === "OPEN";
+ useEffect(() => {
+ if (!isWorkspaceMenuOpen || isFolderBrowserOpen) return undefined;
+ const onMouseDown = (event: MouseEvent) => {
+ if (
+ workspaceMenuContainerRef.current &&
+ !workspaceMenuContainerRef.current.contains(event.target as Node)
+ ) {
+ setIsWorkspaceMenuOpen(false);
+ }
+ };
+ document.addEventListener("mousedown", onMouseDown);
+ return () => document.removeEventListener("mousedown", onMouseDown);
+ }, [isWorkspaceMenuOpen, isFolderBrowserOpen]);
+
+ useEffect(() => {
+ if (!isWorkspaceMenuOpen || isFolderBrowserOpen) return undefined;
+ const onKeyDown = (event: KeyboardEvent) => {
+ if (event.key === "Escape") {
+ setIsWorkspaceMenuOpen(false);
+ }
+ };
+ window.addEventListener("keydown", onKeyDown);
+ return () => window.removeEventListener("keydown", onKeyDown);
+ }, [isWorkspaceMenuOpen, isFolderBrowserOpen]);
+
const handleLaunchRepository = (
repository: GitRepository,
branch: Branch,
diff --git a/src/components/features/chat/open-repository-modal.tsx b/src/components/features/chat/open-repository-modal.tsx
index 3a4def718c..b69c7d776c 100644
--- a/src/components/features/chat/open-repository-modal.tsx
+++ b/src/components/features/chat/open-repository-modal.tsx
@@ -97,7 +97,7 @@ export function OpenRepositoryModal({
<ModalBackdrop onClose={handleClose}>
<ModalBody
width="small"
- className="items-start border border-tertiary !gap-4"
+ className="items-start border border-[var(--oh-border)] !gap-4"
>
<div className="flex flex-col gap-4 w-full">
<div className="flex items-center gap-[10px]">
diff --git a/src/components/features/chat/plan-preview.tsx b/src/components/features/chat/plan-preview.tsx
index 18d38562e1..430dfa826f 100644
--- a/src/components/features/chat/plan-preview.tsx
+++ b/src/components/features/chat/plan-preview.tsx
@@ -67,10 +67,10 @@ export function PlanPreview({
}
return (
- <div className="bg-[#25272d] border border-[#597FF4] rounded-[12px] w-full mt-2">
+ <div className="bg-[var(--oh-surface)] border border-[#597FF4] rounded-[12px] w-full mt-2">
{/* Header */}
- <div className="border-b border-[#525252] flex h-[41px] items-center px-2 gap-1">
- <LessonPlanIcon width={18} height={18} color="#9299aa" />
+ <div className="border-b border-[var(--oh-border)] flex h-[41px] items-center px-2 gap-1">
+ <LessonPlanIcon width={18} height={18} color="var(--oh-muted)" />
<Typography.Text className="font-medium text-[11px] text-white tracking-[0.11px] leading-4">
{t(I18nKey.COMMON$PLAN_MD)}
</Typography.Text>
@@ -116,7 +116,7 @@ export function PlanPreview({
</div>
{/* Footer */}
- <div className="border-t border-[#525252] flex h-[54px] items-center justify-start px-4">
+ <div className="border-t border-[var(--oh-border)] flex h-[54px] items-center justify-start px-4">
<button
type="button"
onClick={handleBuildClick}
diff --git a/src/components/features/chat/remove-file-button.tsx b/src/components/features/chat/remove-file-button.tsx
index d4a143fabb..bd5fc14d79 100644
--- a/src/components/features/chat/remove-file-button.tsx
+++ b/src/components/features/chat/remove-file-button.tsx
@@ -13,7 +13,7 @@ export function RemoveFileButton({ onClick }: RemoveFileButtonProps) {
type="button"
onClick={onClick}
className={cn(
- "flex w-4 h-4 rounded-full items-center justify-center bg-[#25272D] hover:bg-[#A1A1A1] cursor-pointer absolute top-1 right-1 opacity-0 group-hover:opacity-100 transition-opacity duration-200",
+ "flex w-4 h-4 rounded-full items-center justify-center bg-[var(--oh-surface)] hover:bg-[var(--oh-muted)] cursor-pointer absolute top-1 right-1 opacity-0 group-hover:opacity-100 transition-opacity duration-200",
isMobile && "opacity-100",
)}
>
diff --git a/src/components/features/chat/task-tracking/task-item.tsx b/src/components/features/chat/task-tracking/task-item.tsx
index 9c30800f94..f0119a76e2 100644
--- a/src/components/features/chat/task-tracking/task-item.tsx
+++ b/src/components/features/chat/task-tracking/task-item.tsx
@@ -26,7 +26,7 @@ export function TaskItem({ task }: TaskItemProps) {
case "in_progress":
return <CheckCircleHalfIcon className="w-4 h-4 text-[#ffffff]" />;
case "done":
- return <CheckCircleIcon className="w-4 h-4 text-[#A3A3A3]" />;
+ return <CheckCircleIcon className="w-4 h-4 text-[var(--oh-muted)]" />;
default:
return <CircleIcon className="w-4 h-4 text-[#ffffff]" />;
}
@@ -41,13 +41,13 @@ export function TaskItem({ task }: TaskItemProps) {
<Typography.Text
className={cn(
"text-[12px]",
- isDoneStatus ? "text-[#A3A3A3]" : "text-white",
+ isDoneStatus ? "text-[var(--oh-muted)]" : "text-white",
)}
>
{task.title}
</Typography.Text>
{task.notes && (
- <Typography.Text className="text-[10px] text-[#A3A3A3]">
+ <Typography.Text className="text-[10px] text-[var(--oh-muted)]">
{t(I18nKey.TASK_TRACKING_OBSERVATION$TASK_NOTES)}: {task.notes}
</Typography.Text>
)}
diff --git a/src/components/features/chat/task-tracking/task-list-section.tsx b/src/components/features/chat/task-tracking/task-list-section.tsx
index 8dc48ad30c..b14666da20 100644
--- a/src/components/features/chat/task-tracking/task-list-section.tsx
+++ b/src/components/features/chat/task-tracking/task-list-section.tsx
@@ -17,10 +17,10 @@ export function TaskListSection({ taskList }: TaskListSectionProps) {
const { t } = useTranslation("openhands");
return (
- <div className="flex flex-col overflow-clip bg-[#25272d] border border-[#525252] rounded-[12px] w-full">
+ <div className="flex flex-col overflow-clip bg-[var(--oh-surface)] border border-[var(--oh-border)] rounded-[12px] w-full">
{/* Header Tabs */}
- <div className="flex gap-1 items-center border-b border-[#525252] h-[41px] px-2 shrink-0">
- <LessonPlanIcon className="shrink-0 w-4.5 h-4.5 text-[#9299aa]" />
+ <div className="flex gap-1 items-center border-b border-[var(--oh-border)] h-[41px] px-2 shrink-0">
+ <LessonPlanIcon className="shrink-0 w-4.5 h-4.5 text-[var(--oh-muted)]" />
<Typography.Text className="text-[11px] text-nowrap text-white tracking-[0.11px] font-medium leading-[16px] whitespace-pre">
{t(I18nKey.COMMON$TASKS)}
</Typography.Text>
diff --git a/src/components/features/chat/typing-indicator.tsx b/src/components/features/chat/typing-indicator.tsx
index d078746091..a2ed9ac795 100644
--- a/src/components/features/chat/typing-indicator.tsx
+++ b/src/components/features/chat/typing-indicator.tsx
@@ -1,16 +1,16 @@
export function TypingIndicator() {
return (
- <div className="flex items-center space-x-1.5 rounded-full bg-[#25272D] px-3 py-1.5">
+ <div className="flex items-center space-x-1.5 rounded-full bg-[var(--oh-surface)] px-3 py-1.5">
<span
- className="h-1.5 w-1.5 rounded-full bg-[#959CB2] animate-[bounce_0.5s_infinite] translate-y-[1px]"
+ className="h-1.5 w-1.5 rounded-full bg-[var(--oh-muted)] animate-[bounce_0.5s_infinite] translate-y-[1px]"
style={{ animationDelay: "0ms" }}
/>
<span
- className="h-1.5 w-1.5 rounded-full bg-[#959CB2] animate-[bounce_0.5s_infinite] translate-y-[1px]"
+ className="h-1.5 w-1.5 rounded-full bg-[var(--oh-muted)] animate-[bounce_0.5s_infinite] translate-y-[1px]"
style={{ animationDelay: "75ms" }}
/>
<span
- className="h-1.5 w-1.5 rounded-full bg-[#959CB2] animate-[bounce_0.5s_infinite] translate-y-[1px]"
+ className="h-1.5 w-1.5 rounded-full bg-[var(--oh-muted)] animate-[bounce_0.5s_infinite] translate-y-[1px]"
style={{ animationDelay: "150ms" }}
/>
</div>
diff --git a/src/components/features/chat/upload-as-file-checkbox.tsx b/src/components/features/chat/upload-as-file-checkbox.tsx
index 14632f3819..6f9e9c752a 100644
--- a/src/components/features/chat/upload-as-file-checkbox.tsx
+++ b/src/components/features/chat/upload-as-file-checkbox.tsx
@@ -10,7 +10,7 @@ export function UploadAsFileCheckbox() {
return (
<label
htmlFor="upload-images-as-files-checkbox"
- className="flex items-center gap-2 text-xs text-[#A7A7A7] cursor-pointer select-none whitespace-nowrap"
+ className="flex items-center gap-2 text-xs text-[var(--oh-muted)] cursor-pointer select-none whitespace-nowrap"
>
<input
id="upload-images-as-files-checkbox"
diff --git a/src/components/features/chat/uploaded-file.tsx b/src/components/features/chat/uploaded-file.tsx
index 88a0691211..59d8930001 100644
--- a/src/components/features/chat/uploaded-file.tsx
+++ b/src/components/features/chat/uploaded-file.tsx
@@ -17,22 +17,22 @@ export function UploadedFile({
const fileExtension = getFileExtension(file.name);
return (
- <div className="group flex gap-2 rounded-lg bg-[#525252] max-w-[160px] px-3 py-1 relative">
+ <div className="group flex gap-2 rounded-lg bg-[var(--oh-interactive-hover)] max-w-[160px] px-3 py-1 relative">
<div className="flex flex-col justify-center gap-0.25">
<RemoveFileButton onClick={onRemove} />
<div className="flex items-center gap-2 w-full">
<span
className={cn(
"text-sm font-normal leading-5 flex-1 max-w-[136px] truncate",
- isLoading ? "max-w-[108px] text-[#A7A7A7]" : "text-white",
+ isLoading ? "max-w-[108px] text-[var(--oh-muted)]" : "text-white",
)}
>
{file.name}
</span>
</div>
<div className="flex items-center gap-2">
- <FileIcon width={12} height={12} color="#A7A7A7" />
- <span className="text-[9px] font-normal leading-5 text-[#A7A7A7]">
+ <FileIcon width={12} height={12} color="var(--oh-muted)" />
+ <span className="text-[9px] font-normal leading-5 text-[var(--oh-muted)]">
{fileExtension}
</span>
</div>
diff --git a/src/components/features/chat/uploaded-image.tsx b/src/components/features/chat/uploaded-image.tsx
index ac06267a9e..0f27a90c22 100644
--- a/src/components/features/chat/uploaded-image.tsx
+++ b/src/components/features/chat/uploaded-image.tsx
@@ -27,7 +27,7 @@ export function UploadedImage({
}, [image]);
return (
- <div className="group min-w-[51px] min-h-[49px] w-[51px] h-[49px] rounded-lg bg-[#525252] relative flex items-center justify-center">
+ <div className="group min-w-[51px] min-h-[49px] w-[51px] h-[49px] rounded-lg bg-[var(--oh-interactive-hover)] relative flex items-center justify-center">
<RemoveFileButton onClick={onRemove} />
{isLoading ? (
<LoaderCircle className="animate-spin w-5 h-5" color="white" />
diff --git a/src/components/features/context-menu/context-menu-container.tsx b/src/components/features/context-menu/context-menu-container.tsx
index 7d580fd322..5c434ce976 100644
--- a/src/components/features/context-menu/context-menu-container.tsx
+++ b/src/components/features/context-menu/context-menu-container.tsx
@@ -24,7 +24,7 @@ export function ContextMenuContainer({
className={cn(
// Base styling
"absolute rounded-[12px] p-[25px]",
- "bg-[#050505] border border-[#242424]",
+ "bg-[var(--oh-surface-deep)] border border-[var(--oh-border-subtle)]",
"text-white overflow-hidden z-[9999]",
"context-menu-box-shadow",
// Positioning
diff --git a/src/components/features/context-menu/context-menu-icon-text-with-description.tsx b/src/components/features/context-menu/context-menu-icon-text-with-description.tsx
index fd505fef58..ff3d46a0f6 100644
--- a/src/components/features/context-menu/context-menu-icon-text-with-description.tsx
+++ b/src/components/features/context-menu/context-menu-icon-text-with-description.tsx
@@ -21,7 +21,7 @@ export function ContextMenuIconTextWithDescription({
return (
<div
className={cn(
- "flex flex-col gap-1 justify-center hover:bg-[#5C5D62] rounded p-2",
+ "flex flex-col gap-1 justify-center hover:bg-[var(--oh-interactive-hover)] rounded p-2",
className,
)}
>
@@ -31,7 +31,7 @@ export function ContextMenuIconTextWithDescription({
className="px-0"
iconClassName={iconClassName}
/>
- <Typography.Text className="text-[#A3A3A3] text-[10px] font-normal whitespace-pre-wrap break-words">
+ <Typography.Text className="text-[var(--oh-muted)] text-[10px] font-normal whitespace-pre-wrap break-words">
{description}
</Typography.Text>
</div>
diff --git a/src/components/features/context-menu/context-menu-separator.tsx b/src/components/features/context-menu/context-menu-separator.tsx
index b659119923..ee161494d8 100644
--- a/src/components/features/context-menu/context-menu-separator.tsx
+++ b/src/components/features/context-menu/context-menu-separator.tsx
@@ -12,7 +12,7 @@ export function ContextMenuSeparator({
return (
<div
data-testid={testId}
- className={cn("w-full h-[1px] bg-[#525252]", className)}
+ className={cn("w-full h-[1px] bg-[var(--oh-border)]", className)}
/>
);
}
diff --git a/src/components/features/controls/agent-status.tsx b/src/components/features/controls/agent-status.tsx
index 2015fd065e..241407d5ce 100644
--- a/src/components/features/controls/agent-status.tsx
+++ b/src/components/features/controls/agent-status.tsx
@@ -134,14 +134,14 @@ export function AgentStatus({
)}
>
<span
- className="text-[11px] text-[#959CB2] font-normal leading-5 min-w-0 max-w-full truncate"
+ className="text-[11px] text-[var(--oh-muted)] font-normal leading-5 min-w-0 max-w-full truncate"
title={t(statusCode)}
>
{t(statusCode)}
</span>
<div
className={cn(
- "box-border content-stretch flex flex-row gap-[3px] items-center justify-center overflow-clip px-0.5 py-1 relative rounded-[100px] shrink-0 size-6 transition-all duration-200 active:scale-95 bg-transparent text-[#959CB2] hover:bg-white/10 hover:text-white",
+ "box-border content-stretch flex flex-row gap-[3px] items-center justify-center overflow-clip px-0.5 py-1 relative rounded-[100px] shrink-0 size-6 transition-all duration-200 active:scale-95 bg-transparent text-[var(--oh-muted)] hover:bg-white/10 hover:text-white",
isInteractive ? "cursor-pointer" : "cursor-default",
)}
>
diff --git a/src/components/features/controls/server-status-context-menu-icon-text.tsx b/src/components/features/controls/server-status-context-menu-icon-text.tsx
index 85164d99aa..e56d5c3fd2 100644
--- a/src/components/features/controls/server-status-context-menu-icon-text.tsx
+++ b/src/components/features/controls/server-status-context-menu-icon-text.tsx
@@ -13,7 +13,7 @@ export function ServerStatusContextMenuIconText({
}: ServerStatusContextMenuIconTextProps) {
return (
<button
- className="flex items-center justify-between p-2 hover:bg-[#5C5D62] rounded text-sm text-white font-normal leading-5 cursor-pointer w-full"
+ className="flex items-center justify-between p-2 hover:bg-[var(--oh-interactive-hover)] rounded text-sm text-white font-normal leading-5 cursor-pointer w-full"
onClick={onClick}
data-testid={testId}
type="button"
diff --git a/src/components/features/controls/tools-context-menu-icon-text.tsx b/src/components/features/controls/tools-context-menu-icon-text.tsx
index fe0b6cf52c..0eeb89adbc 100644
--- a/src/components/features/controls/tools-context-menu-icon-text.tsx
+++ b/src/components/features/controls/tools-context-menu-icon-text.tsx
@@ -16,7 +16,7 @@ export function ToolsContextMenuIconText({
return (
<div
className={cn(
- "flex items-center justify-between p-2 hover:bg-[#5C5D62] rounded",
+ "flex items-center justify-between p-2 hover:bg-[var(--oh-interactive-hover)] rounded",
className,
)}
>
diff --git a/src/components/features/controls/tools.tsx b/src/components/features/controls/tools.tsx
index b94a2b1ce9..7b532bc731 100644
--- a/src/components/features/controls/tools.tsx
+++ b/src/components/features/controls/tools.tsx
@@ -47,7 +47,7 @@ export function Tools() {
<div className="relative">
<button
type="button"
- className="group flex items-center gap-1 rounded-[100px] border border-transparent px-1.5 text-[#959CB2] transition-[border-color,color] cursor-pointer hover:text-white hover:bg-white/10"
+ className="group flex items-center gap-1 rounded-[100px] border border-transparent px-1.5 text-[var(--oh-muted)] transition-[border-color,color] cursor-pointer hover:text-white hover:bg-white/10"
onClick={handleClick}
>
<Wrench
diff --git a/src/components/features/conversation-panel/budget-display.tsx b/src/components/features/conversation-panel/budget-display.tsx
index 5b909c3413..a77ce49290 100644
--- a/src/components/features/conversation-panel/budget-display.tsx
+++ b/src/components/features/conversation-panel/budget-display.tsx
@@ -18,14 +18,14 @@ export function BudgetDisplay({ cost, maxBudgetPerTask }: BudgetDisplayProps) {
}
return (
- <div className="border-b border-neutral-700">
+ <div className="border-b border-[var(--oh-border-subtle)]">
{maxBudgetPerTask !== null && maxBudgetPerTask > 0 ? (
<>
<BudgetProgressBar currentCost={cost} maxBudget={maxBudgetPerTask} />
<BudgetUsageText currentCost={cost} maxBudget={maxBudgetPerTask} />
</>
) : (
- <span className="text-xs text-neutral-400">
+ <span className="text-xs text-[var(--oh-muted)]">
{t(I18nKey.CONVERSATION$NO_BUDGET_LIMIT)}
</span>
)}
diff --git a/src/components/features/conversation-panel/budget-progress-bar.tsx b/src/components/features/conversation-panel/budget-progress-bar.tsx
index 17f3dac6e2..96b257936b 100644
--- a/src/components/features/conversation-panel/budget-progress-bar.tsx
+++ b/src/components/features/conversation-panel/budget-progress-bar.tsx
@@ -13,7 +13,7 @@ export function BudgetProgressBar({
const isNearLimit = usagePercentage > 80;
return (
- <div className="w-full h-1.5 bg-neutral-700 rounded-full overflow-hidden mt-1">
+ <div className="w-full h-1.5 bg-tertiary rounded-full overflow-hidden mt-1">
<div
className={`h-full transition-all duration-300 ${
isNearLimit ? "bg-red-500" : "bg-blue-500"
diff --git a/src/components/features/conversation-panel/budget-usage-text.tsx b/src/components/features/conversation-panel/budget-usage-text.tsx
index 9f23c11795..4fd2c716a4 100644
--- a/src/components/features/conversation-panel/budget-usage-text.tsx
+++ b/src/components/features/conversation-panel/budget-usage-text.tsx
@@ -16,7 +16,7 @@ export function BudgetUsageText({
return (
<div className="flex justify-end">
- <span className="text-xs text-neutral-400">
+ <span className="text-xs text-[var(--oh-muted)]">
{t(I18nKey.CONVERSATION$BUDGET_USAGE_FORMAT, {
currentCost: `$${currentCost.toFixed(4)}`,
maxBudget: `$${maxBudget.toFixed(4)}`,
diff --git a/src/components/features/conversation-panel/compact-conversation-row.tsx b/src/components/features/conversation-panel/compact-conversation-row.tsx
index 36d63b8a05..28b0509ec7 100644
--- a/src/components/features/conversation-panel/compact-conversation-row.tsx
+++ b/src/components/features/conversation-panel/compact-conversation-row.tsx
@@ -66,7 +66,7 @@ export function CompactConversationRow({
content={preview}
placement="right"
closeDelay={100}
- className="bg-[#1f2228] text-white border border-[#2a2f38] shadow-xl p-0"
+ className="bg-[var(--oh-surface)] text-white border border-[var(--oh-border-subtle)] shadow-xl p-0"
disableAnimation={disableAnimation}
>
<NavigationLink
@@ -79,7 +79,9 @@ export function CompactConversationRow({
cn(
"flex items-center justify-center w-10 h-9 mx-auto rounded-md",
"transition-colors cursor-pointer",
- navActive || isActive ? "bg-[#1f1f1f99]" : "hover:bg-[#1f1f1f99]",
+ navActive || isActive
+ ? "bg-tertiary"
+ : "hover:bg-[var(--oh-surface-raised)]",
)
}
>
diff --git a/src/components/features/conversation-panel/confirm-delete-modal.tsx b/src/components/features/conversation-panel/confirm-delete-modal.tsx
index ef68d65b31..ea9a1e4718 100644
--- a/src/components/features/conversation-panel/confirm-delete-modal.tsx
+++ b/src/components/features/conversation-panel/confirm-delete-modal.tsx
@@ -44,7 +44,7 @@ export function ConfirmDeleteModal({
return (
<ModalBackdrop onClose={onCancel}>
- <ModalBody className="items-start border border-tertiary">
+ <ModalBody className="items-start border border-[var(--oh-border)]">
<div className="flex flex-col gap-2">
<BaseModalTitle
title={title ?? t(I18nKey.CONVERSATION$CONFIRM_DELETE)}
diff --git a/src/components/features/conversation-panel/confirm-stop-modal.tsx b/src/components/features/conversation-panel/confirm-stop-modal.tsx
index 6eebec8e09..efb5930b7a 100644
--- a/src/components/features/conversation-panel/confirm-stop-modal.tsx
+++ b/src/components/features/conversation-panel/confirm-stop-modal.tsx
@@ -21,7 +21,7 @@ export function ConfirmStopModal({
return (
<ModalBackdrop onClose={onCancel}>
- <ModalBody className="items-start border border-tertiary">
+ <ModalBody className="items-start border border-[var(--oh-border)]">
<div className="flex flex-col gap-2">
<BaseModalTitle
title={t(I18nKey.CONVERSATION$CONFIRM_CLOSE_CONVERSATION)}
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
index 5010773363..4c52b75537 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
@@ -49,7 +49,7 @@ export function ConversationCardFooter({
))}
<div className="flex items-center gap-2 shrink-0 ml-auto">
{showTimestamp && (createdAt ?? lastUpdatedAt) && (
- <p className="text-xs text-[#A3A3A3] text-right">
+ <p className="text-xs text-[var(--oh-muted)] text-right">
<time>
{`${formatTimeDelta(lastUpdatedAt ?? createdAt)} ${t(I18nKey.CONVERSATION$AGO)}`}
</time>
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-skeleton.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-skeleton.tsx
index 9331b17b16..6556a9779d 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-skeleton.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-skeleton.tsx
@@ -1,5 +1,3 @@
-import React from "react";
-
interface ConversationCardSkeletonProps {
compact?: boolean;
}
@@ -21,7 +19,7 @@ export function ConversationCardSkeleton({
return (
<div
data-testid="conversation-card-skeleton"
- className="relative h-auto w-full rounded-md px-3 pt-1 pb-1"
+ className="relative h-auto w-full px-3 py-2 border-b border-[var(--oh-border-subtle)]"
>
<div className="flex items-center w-full min-w-0 h-6">
<div className="flex items-center gap-2 flex-1 min-w-0">
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
index fa96d4e93e..671ea44fc7 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
@@ -129,8 +129,8 @@ export function ConversationCard({
onClick={onClick}
className={cn(
"group relative h-auto w-full rounded-md px-3 pt-1 pb-1 cursor-pointer transition-colors",
- "data-[context-menu-open=false]:hover:bg-[#1f2228]",
- "data-[active=true]:bg-[#25272D]",
+ "data-[context-menu-open=false]:hover:bg-[var(--oh-surface)]",
+ "data-[active=true]:bg-[var(--oh-surface)]",
"data-[context-menu-open=true]:z-20",
)}
>
@@ -148,7 +148,7 @@ export function ConversationCard({
{(createdAt ?? lastUpdatedAt) && (
<p
className={cn(
- "text-xs text-[#A3A3A3] text-right whitespace-nowrap transition-opacity",
+ "text-xs text-[var(--oh-muted)] text-right whitespace-nowrap transition-opacity",
hasContextMenu &&
"group-hover:opacity-0 group-focus-within:opacity-0",
contextMenuOpen && "opacity-0",
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-repo-link.tsx b/src/components/features/conversation-panel/conversation-card/conversation-repo-link.tsx
index b1f77723f5..6bed9ae39e 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-repo-link.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-repo-link.tsx
@@ -26,23 +26,23 @@ export function ConversationRepoLink({
return (
<div className="flex items-center gap-3 flex-1 min-w-0 overflow-hidden">
<div className="flex items-center gap-1 min-w-0 flex-1">
- {Icon && <Icon size={14} className="text-[#A3A3A3]" />}
+ {Icon && <Icon size={14} className="text-[var(--oh-muted)]" />}
{selectedRepository.git_provider === "azure_devops" && (
- <AzureDevOpsLogo className="text-[#A3A3A3] w-[14px] h-[14px]" />
+ <AzureDevOpsLogo className="text-[var(--oh-muted)] w-[14px] h-[14px]" />
)}
<span
data-testid="conversation-card-selected-repository"
- className="text-xs text-[#A3A3A3] truncate min-w-0"
+ className="text-xs text-[var(--oh-muted)] truncate min-w-0"
>
{selectedRepository.selected_repository}
</span>
</div>
<div className="flex items-center gap-1 min-w-0 max-w-[45%] shrink">
- <FaCodeBranch size={12} className="text-[#A3A3A3]" />
+ <FaCodeBranch size={12} className="text-[var(--oh-muted)]" />
<span
data-testid="conversation-card-selected-branch"
- className="text-xs text-[#A3A3A3] truncate min-w-0"
+ className="text-xs text-[var(--oh-muted)] truncate min-w-0"
>
{selectedRepository.selected_branch}
</span>
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-status-badges.tsx b/src/components/features/conversation-panel/conversation-card/conversation-status-badges.tsx
index e0bbe71a0f..3776cf74b5 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-status-badges.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-status-badges.tsx
@@ -15,7 +15,7 @@ export function ConversationStatusBadges({
if (conversationStatus === "ARCHIVED") {
return (
- <span className="flex items-center gap-1 px-1.5 py-0.5 bg-[#868E96] text-white text-xs font-medium rounded-full opacity-60">
+ <span className="flex items-center gap-1 px-1.5 py-0.5 bg-[var(--oh-text-dim)] text-white text-xs font-medium rounded-full opacity-60">
<FaArchive size={10} className="text-white" />
<span>{t(I18nKey.COMMON$ARCHIVED)}</span>
</span>
diff --git a/src/components/features/conversation-panel/conversation-card/no-repository.tsx b/src/components/features/conversation-panel/conversation-card/no-repository.tsx
index d9cf9cef65..6b7153b3b6 100644
--- a/src/components/features/conversation-panel/conversation-card/no-repository.tsx
+++ b/src/components/features/conversation-panel/conversation-card/no-repository.tsx
@@ -18,18 +18,22 @@ export function NoRepository({ workspaceWorkingDir }: NoRepositoryProps) {
if (folderName) {
return (
<div
- className="flex items-center gap-1 text-xs text-[#A3A3A3] flex-1 min-w-0"
+ className="flex items-center gap-1 text-xs text-[var(--oh-muted)] flex-1 min-w-0"
title={workspaceWorkingDir ?? undefined}
>
- <FaFolder size={12} className="text-[#A3A3A3]" />
+ <FaFolder size={12} className="text-[var(--oh-muted)]" />
<span className="truncate min-w-0">{folderName}</span>
</div>
);
}
return (
- <div className="flex items-center gap-1 text-xs text-[#A3A3A3] flex-1 min-w-0 overflow-hidden">
- <RepoForkedIcon width={14} height={14} className="text-[#A3A3A3]" />
+ <div className="flex items-center gap-1 text-xs text-[var(--oh-muted)] flex-1 min-w-0 overflow-hidden">
+ <RepoForkedIcon
+ width={14}
+ height={14}
+ className="text-[var(--oh-muted)]"
+ />
<span className="truncate min-w-0">
{t(I18nKey.COMMON$NO_REPOSITORY)}
</span>
diff --git a/src/components/features/conversation-panel/conversation-panel.tsx b/src/components/features/conversation-panel/conversation-panel.tsx
index e9bb0c75ac..dbbc69ef17 100644
--- a/src/components/features/conversation-panel/conversation-panel.tsx
+++ b/src/components/features/conversation-panel/conversation-panel.tsx
@@ -312,11 +312,11 @@ export function ConversationPanel({
<div
data-testid="older-conversations-summary"
className={cn(
- "pl-4 pr-3 py-2 text-neutral-400 flex flex-wrap items-center gap-x-2 gap-y-1",
- isListScrolled && "border-b border-[#1f2228]",
+ "pl-4 pr-3 py-2 text-[var(--oh-muted)] flex flex-wrap items-center gap-x-2 gap-y-1",
+ isListScrolled && "border-b border-[var(--oh-border-subtle)]",
)}
>
- <span className="text-sm font-medium text-neutral-400">
+ <span className="text-sm font-medium text-[var(--oh-muted)]">
{t(I18nKey.SIDEBAR$CONVERSATIONS)}
</span>
<div ref={olderFilterMenuRef} className="relative ml-auto">
@@ -326,7 +326,7 @@ export function ConversationPanel({
aria-label="Older conversations filter"
aria-expanded={olderFilterMenuOpen}
onClick={() => setOlderFilterMenuOpen((open) => !open)}
- className="inline-flex items-center justify-center rounded-md p-1 text-neutral-400 hover:text-white hover:bg-[#1f1f1f99] transition-colors"
+ className="inline-flex items-center justify-center rounded-md p-1 text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)] transition-colors"
>
<ListFilter size={14} />
</button>
@@ -343,7 +343,7 @@ export function ConversationPanel({
setShowOlderConversations((value) => !value);
setOlderFilterMenuOpen(false);
}}
- className="block w-full rounded px-2 py-2 text-left text-sm text-white hover:bg-[#5C5D62]"
+ className="block w-full rounded px-2 py-2 text-left text-sm text-white hover:bg-[var(--oh-interactive-hover)]"
>
{showOlderConversations
? capitalizeLabel(t(I18nKey.CONVERSATION$HIDE))
@@ -356,11 +356,11 @@ export function ConversationPanel({
setConfirmDeleteOlderVisible(true);
setOlderFilterMenuOpen(false);
}}
- className="block w-full rounded px-2 py-2 text-left text-sm text-danger hover:bg-[#5C5D62]"
+ className="block w-full rounded px-2 py-2 text-left text-sm text-danger hover:bg-[var(--oh-interactive-hover)]"
>
{capitalizeLabel(t(I18nKey.CONVERSATION$DELETE_ALL))}
</button>
- <div className="my-1 h-[1px] w-full bg-[#5C5D62]" />
+ <div className="my-1 h-[1px] w-full bg-[var(--oh-border)]" />
<button
type="button"
data-testid="toggle-repo-branch-metadata"
@@ -368,7 +368,7 @@ export function ConversationPanel({
setShowRepoBranchMetadata((value) => !value);
setOlderFilterMenuOpen(false);
}}
- className="block w-full rounded px-2 py-2 text-left text-sm text-white hover:bg-[#5C5D62]"
+ className="block w-full rounded px-2 py-2 text-left text-sm text-white hover:bg-[var(--oh-interactive-hover)]"
>
{showRepoBranchMetadata
? "Hide Repo/Branch"
@@ -399,7 +399,7 @@ export function ConversationPanel({
{!compact && showEmptyState && (
<div className="flex flex-col items-center justify-center h-full">
- <p className="text-neutral-400">
+ <p className="text-[var(--oh-muted)]">
{t(I18nKey.CONVERSATION$NO_CONVERSATIONS)}
</p>
</div>
@@ -443,7 +443,7 @@ export function ConversationPanel({
type="button"
data-testid="load-more-conversations"
onClick={() => fetchNextPage()}
- className="text-xs text-neutral-400 hover:text-white"
+ className="text-xs text-[var(--oh-muted)] hover:text-white"
>
{t(I18nKey.CONVERSATION$LOAD_MORE)}
</button>
diff --git a/src/components/features/conversation-panel/conversation-status-dot.tsx b/src/components/features/conversation-panel/conversation-status-dot.tsx
index a3e2f88749..05ed43b2d2 100644
--- a/src/components/features/conversation-panel/conversation-status-dot.tsx
+++ b/src/components/features/conversation-panel/conversation-status-dot.tsx
@@ -16,9 +16,9 @@ interface ConversationStatusDotProps {
type Visual = "check" | "working" | "active" | "paused" | "error" | "unknown";
const SUCCESS_GREEN = "#1FBD53";
-const PAUSED_GRAY = "#A3A3A3";
+const PAUSED_GRAY = "var(--oh-muted)";
const ERROR_RED = "#FF684E";
-const UNKNOWN_GRAY = "#3C3C49";
+const UNKNOWN_GRAY = "var(--oh-color-tertiary)";
const visualFor = (status: ExecutionStatus | null | undefined): Visual => {
switch (status) {
@@ -139,7 +139,7 @@ export function ConversationStatusDot({
content={label}
placement="right"
showArrow
- tooltipClassName="bg-[#1a1a1a] text-white text-xs shadow-lg"
+ tooltipClassName="bg-base text-white text-xs shadow-lg"
>
{dot}
</StyledTooltip>
diff --git a/src/components/features/conversation-panel/ellipsis-button.tsx b/src/components/features/conversation-panel/ellipsis-button.tsx
index b94cd8451c..41b975c2e2 100644
--- a/src/components/features/conversation-panel/ellipsis-button.tsx
+++ b/src/components/features/conversation-panel/ellipsis-button.tsx
@@ -47,7 +47,7 @@ export function EllipsisButton({
aria-label={ariaLabel}
className={cn(
"p-1 rounded-md cursor-pointer transition-colors",
- "text-[#9299AA] hover:text-white hover:bg-white/10",
+ "text-[var(--oh-muted)] hover:text-white hover:bg-white/10",
"flex items-center justify-center",
className,
)}
diff --git a/src/components/features/conversation-panel/hook-event-item.tsx b/src/components/features/conversation-panel/hook-event-item.tsx
index 4fbb3c49a7..1f4b5a8383 100644
--- a/src/components/features/conversation-panel/hook-event-item.tsx
+++ b/src/components/features/conversation-panel/hook-event-item.tsx
@@ -39,18 +39,18 @@ export function HookEventItem({
<button
type="button"
onClick={() => onToggle(hookEvent.event_type)}
- className="w-full py-3 px-2 text-left flex items-center justify-between hover:bg-gray-700 transition-colors"
+ className="w-full py-3 px-2 text-left flex items-center justify-between hover:bg-tertiary transition-colors"
>
<div className="flex items-center">
- <Typography.Text className="font-bold text-gray-100">
+ <Typography.Text className="font-bold text-content-2">
{eventTypeLabel}
</Typography.Text>
</div>
<div className="flex items-center">
- <Typography.Text className="px-2 py-1 text-xs rounded-full bg-gray-800 mr-2">
+ <Typography.Text className="px-2 py-1 text-xs rounded-full bg-[var(--oh-surface)] mr-2">
{t(I18nKey.HOOKS_MODAL$HOOK_COUNT, { count: totalHooks })}
</Typography.Text>
- <Typography.Text className="text-gray-300">
+ <Typography.Text className="text-[var(--oh-text-tertiary)]">
{isExpanded ? (
<ChevronDown size={18} />
) : (
diff --git a/src/components/features/conversation-panel/hook-matcher-content.tsx b/src/components/features/conversation-panel/hook-matcher-content.tsx
index d561ac0259..b425d018af 100644
--- a/src/components/features/conversation-panel/hook-matcher-content.tsx
+++ b/src/components/features/conversation-panel/hook-matcher-content.tsx
@@ -12,9 +12,9 @@ export function HookMatcherContent({ matcher }: HookMatcherContentProps) {
const { t } = useTranslation("openhands");
return (
- <div className="mb-4 p-3 bg-gray-800 rounded-md">
+ <div className="mb-4 p-3 bg-[var(--oh-surface)] rounded-md">
<div className="mb-2">
- <Typography.Text className="text-sm font-semibold text-gray-300">
+ <Typography.Text className="text-sm font-semibold text-[var(--oh-text-tertiary)]">
{t(I18nKey.HOOKS_MODAL$MATCHER)}
</Typography.Text>
<Typography.Text className="ml-2 px-2 py-1 text-xs rounded-full bg-blue-900">
@@ -23,7 +23,7 @@ export function HookMatcherContent({ matcher }: HookMatcherContentProps) {
</div>
<div className="mt-3">
- <Typography.Text className="text-sm font-semibold text-gray-300 mb-2">
+ <Typography.Text className="text-sm font-semibold text-[var(--oh-text-tertiary)] mb-2">
{t(I18nKey.HOOKS_MODAL$COMMANDS)}
</Typography.Text>
{(matcher.hooks ?? []).map((hook, index) => (
@@ -42,7 +42,7 @@ export function HookMatcherContent({ matcher }: HookMatcherContentProps) {
>
{hook.command}
</Pre>
- <div className="flex gap-4 mt-1 text-xs text-gray-400">
+ <div className="flex gap-4 mt-1 text-xs text-[var(--oh-muted)]">
<span>{t(I18nKey.HOOKS_MODAL$TYPE, { type: hook.type })}</span>
<span>
{t(I18nKey.HOOKS_MODAL$TIMEOUT, { timeout: hook.timeout })}
diff --git a/src/components/features/conversation-panel/hooks-empty-state.tsx b/src/components/features/conversation-panel/hooks-empty-state.tsx
index 0ca64a0fc8..bc14c25641 100644
--- a/src/components/features/conversation-panel/hooks-empty-state.tsx
+++ b/src/components/features/conversation-panel/hooks-empty-state.tsx
@@ -11,7 +11,7 @@ export function HooksEmptyState({ isError }: HooksEmptyStateProps) {
return (
<div className="flex items-center justify-center h-full p-4">
- <Typography.Text className="text-gray-400">
+ <Typography.Text className="text-[var(--oh-muted)]">
{isError
? t(I18nKey.COMMON$FETCH_ERROR)
: t(I18nKey.CONVERSATION$NO_HOOKS)}
diff --git a/src/components/features/conversation-panel/hooks-loading-state.tsx b/src/components/features/conversation-panel/hooks-loading-state.tsx
index 2a915a3677..50f467c27c 100644
--- a/src/components/features/conversation-panel/hooks-loading-state.tsx
+++ b/src/components/features/conversation-panel/hooks-loading-state.tsx
@@ -1,7 +1,7 @@
export function HooksLoadingState() {
return (
<div className="flex justify-center items-center py-8">
- <div className="animate-spin rounded-full h-8 w-8 border-t-2 border-b-2 border-primary" />
+ <div className="animate-spin rounded-full h-8 w-8 border-t-2 border-b-2 border-white" />
</div>
);
}
diff --git a/src/components/features/conversation-panel/hooks-modal.tsx b/src/components/features/conversation-panel/hooks-modal.tsx
index a80b069cc6..040d32a9bf 100644
--- a/src/components/features/conversation-panel/hooks-modal.tsx
+++ b/src/components/features/conversation-panel/hooks-modal.tsx
@@ -56,7 +56,7 @@ export function HooksModal({ onClose }: HooksModalProps) {
/>
{isAgentReady && (
- <Typography.Text className="text-sm text-gray-400">
+ <Typography.Text className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.HOOKS_MODAL$WARNING)}
</Typography.Text>
)}
diff --git a/src/components/features/conversation-panel/new-conversation-button-cloud.tsx b/src/components/features/conversation-panel/new-conversation-button-cloud.tsx
index b5c4387c61..db4fb2476c 100644
--- a/src/components/features/conversation-panel/new-conversation-button-cloud.tsx
+++ b/src/components/features/conversation-panel/new-conversation-button-cloud.tsx
@@ -171,7 +171,7 @@ export function CloudNewConversationButton({
const itemClass = cn(
"flex items-center gap-2 w-full px-2 py-2 text-sm text-white text-left cursor-pointer",
- "hover:bg-[#5C5D62] rounded-md transition-colors duration-150 font-normal",
+ "hover:bg-[var(--oh-interactive-hover)] rounded-md transition-colors duration-150 font-normal",
"disabled:opacity-60 disabled:cursor-not-allowed",
);
@@ -209,8 +209,8 @@ export function CloudNewConversationButton({
aria-label={compact ? newConversationLabel : undefined}
className={cn(
"flex items-center rounded-md cursor-pointer transition-colors",
- "text-sm font-medium text-white bg-[#1f1f1f99] hover:bg-[#2a2a2a]",
- "border border-[#525252]",
+ "text-sm font-medium text-white bg-[var(--oh-surface)]/60 hover:bg-[var(--oh-surface-raised)]",
+ "border border-[var(--oh-border)]",
compact
? "justify-center w-10 h-10 p-0 mx-auto"
: "gap-1.5 w-full px-3 py-2",
@@ -239,7 +239,7 @@ export function CloudNewConversationButton({
data-testid="new-conversation-popover"
className={cn(
"absolute z-30 top-full mt-2 p-1",
- "bg-[#26282D] border border-[#727987] rounded-lg shadow-xl",
+ "bg-[var(--oh-surface)] border border-[var(--oh-border-input)] rounded-lg shadow-xl",
"flex flex-col gap-1",
compact ? "left-0 w-[260px]" : "left-0 right-0",
)}
@@ -261,8 +261,8 @@ export function CloudNewConversationButton({
"flex items-center gap-1 px-2 py-1 rounded text-xs",
"border transition-colors",
isActive
- ? "bg-[#5C5D62] border-[#727987] text-white"
- : "border-transparent text-[#B7BDC2] hover:text-white",
+ ? "bg-[var(--oh-interactive-hover)] border-[var(--oh-border-input)] text-white"
+ : "border-transparent text-[var(--oh-text-secondary)] hover:text-white",
)}
>
<GitProviderIcon gitProvider={provider} />
@@ -283,9 +283,9 @@ export function CloudNewConversationButton({
disabled={!selectedProvider}
className={cn(
"w-full px-2 py-1.5 text-sm rounded-md",
- "bg-[#1f1f1f] border border-[#525252] text-white",
- "placeholder:text-[#A3A3A3] outline-none",
- "focus:border-[#727987]",
+ "bg-[var(--oh-surface)] border border-[var(--oh-border)] text-white",
+ "placeholder:text-[var(--oh-muted)] outline-none",
+ "focus:border-[var(--oh-border-input)]",
"disabled:opacity-60 disabled:cursor-not-allowed",
)}
/>
@@ -294,7 +294,7 @@ export function CloudNewConversationButton({
<ul className="flex flex-col max-h-[40vh] sm:max-h-[280px] overflow-y-auto">
{isListLoading && repositories.length === 0 && (
<li
- className="px-2 py-2 text-sm text-[#A3A3A3] italic"
+ className="px-2 py-2 text-sm text-[var(--oh-muted)] italic"
data-testid="cloud-repo-loading"
>
{t(I18nKey.HOME$LOADING_REPOSITORIES)}
@@ -313,7 +313,7 @@ export function CloudNewConversationButton({
repositories.length === 0 &&
!!selectedProvider && (
<li
- className="px-2 py-2 text-sm text-[#A3A3A3] italic"
+ className="px-2 py-2 text-sm text-[var(--oh-muted)] italic"
data-testid="cloud-repo-empty"
>
{t(I18nKey.GITHUB$NO_RESULTS)}
@@ -337,7 +337,7 @@ export function CloudNewConversationButton({
onClick={() => fetchNextPage()}
className={itemClass}
>
- <span className="text-[#B7BDC2]">
+ <span className="text-[var(--oh-text-secondary)]">
{isFetchingNextPage
? t(I18nKey.HOME$LOADING_MORE_REPOSITORIES)
: t(I18nKey.CONVERSATION$LOAD_MORE)}
diff --git a/src/components/features/conversation-panel/new-conversation-button-local.tsx b/src/components/features/conversation-panel/new-conversation-button-local.tsx
index 947314e107..5759b43053 100644
--- a/src/components/features/conversation-panel/new-conversation-button-local.tsx
+++ b/src/components/features/conversation-panel/new-conversation-button-local.tsx
@@ -102,7 +102,7 @@ export function LocalNewConversationButton({
const itemClass = cn(
"flex items-center gap-2 w-full px-2 py-2 text-sm text-white text-left cursor-pointer",
- "hover:bg-[#5C5D62] rounded-md transition-colors duration-150 font-normal",
+ "hover:bg-[var(--oh-interactive-hover)] rounded-md transition-colors duration-150 font-normal",
"disabled:opacity-60 disabled:cursor-not-allowed",
);
@@ -125,8 +125,8 @@ export function LocalNewConversationButton({
aria-label={compact ? newConversationLabel : undefined}
className={cn(
"flex items-center rounded-md cursor-pointer transition-colors",
- "text-sm font-medium text-white bg-[#1f1f1f99] hover:bg-[#2a2a2a]",
- "border border-[#525252]",
+ "text-sm font-medium text-white bg-[var(--oh-surface)]/60 hover:bg-[var(--oh-surface-raised)]",
+ "border border-[var(--oh-border)]",
compact
? "justify-center w-10 h-10 p-0 mx-auto"
: "gap-1.5 w-full px-3 py-2",
@@ -155,7 +155,7 @@ export function LocalNewConversationButton({
data-testid="new-conversation-popover"
className={cn(
"absolute z-30 top-full mt-2 p-1",
- "bg-[#26282D] border border-[#727987] rounded-lg shadow-xl",
+ "bg-[var(--oh-surface)] border border-[var(--oh-border-input)] rounded-lg shadow-xl",
"flex flex-col",
compact ? "left-0 w-[260px]" : "left-0 right-0",
)}
@@ -169,7 +169,7 @@ export function LocalNewConversationButton({
onClick={() => launch()}
className={itemClass}
>
- <span className="italic text-[#A3A3A3]">
+ <span className="italic text-[var(--oh-muted)]">
{t(I18nKey.HOME$NO_WORKSPACE_OPTION)}
</span>
</button>
@@ -191,7 +191,7 @@ export function LocalNewConversationButton({
))}
</ul>
- <div className="flex flex-col border-t border-[#525252] mt-1 pt-1">
+ <div className="flex flex-col border-t border-[var(--oh-border)] mt-1 pt-1">
<button
type="button"
data-testid="add-workspaces-button"
diff --git a/src/components/features/conversation-panel/skill-content.tsx b/src/components/features/conversation-panel/skill-content.tsx
index 4043f6fe3d..5528899594 100644
--- a/src/components/features/conversation-panel/skill-content.tsx
+++ b/src/components/features/conversation-panel/skill-content.tsx
@@ -12,7 +12,7 @@ export function SkillContent({ content }: SkillContentProps) {
return (
<div className="mt-2">
- <Typography.Text className="text-sm font-semibold text-gray-300 mb-2">
+ <Typography.Text className="text-sm font-semibold text-[var(--oh-text-tertiary)] mb-2">
{t(I18nKey.COMMON$CONTENT)}
</Typography.Text>
<Pre
diff --git a/src/components/features/conversation-panel/skill-item.tsx b/src/components/features/conversation-panel/skill-item.tsx
index 3c20c43eba..b7fd44f4ea 100644
--- a/src/components/features/conversation-panel/skill-item.tsx
+++ b/src/components/features/conversation-panel/skill-item.tsx
@@ -25,18 +25,18 @@ export function SkillItem({ skill, isExpanded, onToggle }: SkillItemProps) {
<button
type="button"
onClick={() => onToggle(skill.name)}
- className="w-full py-3 px-2 text-left flex items-center justify-between hover:bg-gray-700 transition-colors"
+ className="w-full py-3 px-2 text-left flex items-center justify-between hover:bg-tertiary transition-colors"
>
<div className="flex items-center">
- <Typography.Text className="font-bold text-gray-100">
+ <Typography.Text className="font-bold text-content-2">
{skill.name}
</Typography.Text>
</div>
<div className="flex items-center">
- <Typography.Text className="px-2 py-1 text-xs rounded-full bg-gray-800 mr-2">
+ <Typography.Text className="px-2 py-1 text-xs rounded-full bg-[var(--oh-surface)] mr-2">
{skillTypeLabel}
</Typography.Text>
- <Typography.Text className="text-gray-300">
+ <Typography.Text className="text-[var(--oh-text-tertiary)]">
{isExpanded ? (
<ChevronDown size={18} />
) : (
diff --git a/src/components/features/conversation-panel/skill-triggers.tsx b/src/components/features/conversation-panel/skill-triggers.tsx
index 24ec43531b..359b91d5b1 100644
--- a/src/components/features/conversation-panel/skill-triggers.tsx
+++ b/src/components/features/conversation-panel/skill-triggers.tsx
@@ -15,7 +15,7 @@ export function SkillTriggers({ triggers }: SkillTriggersProps) {
return (
<div className="mt-2 mb-3">
- <Typography.Text className="text-sm font-semibold text-gray-300 mb-2">
+ <Typography.Text className="text-sm font-semibold text-[var(--oh-text-tertiary)] mb-2">
{t(I18nKey.COMMON$TRIGGERS)}
</Typography.Text>
<div className="flex flex-wrap gap-1">
diff --git a/src/components/features/conversation-panel/skills-empty-state.tsx b/src/components/features/conversation-panel/skills-empty-state.tsx
index d9d0aff5e9..79b3dbec90 100644
--- a/src/components/features/conversation-panel/skills-empty-state.tsx
+++ b/src/components/features/conversation-panel/skills-empty-state.tsx
@@ -11,7 +11,7 @@ export function SkillsEmptyState({ isError }: SkillsEmptyStateProps) {
return (
<div className="flex items-center justify-center h-full p-4">
- <Typography.Text className="text-gray-400">
+ <Typography.Text className="text-[var(--oh-muted)]">
{isError
? t(I18nKey.COMMON$FETCH_ERROR)
: t(I18nKey.CONVERSATION$NO_SKILLS)}
diff --git a/src/components/features/conversation-panel/skills-loading-state.tsx b/src/components/features/conversation-panel/skills-loading-state.tsx
index 29ea6c9754..3119a1e663 100644
--- a/src/components/features/conversation-panel/skills-loading-state.tsx
+++ b/src/components/features/conversation-panel/skills-loading-state.tsx
@@ -1,7 +1,7 @@
export function SkillsLoadingState() {
return (
<div className="flex justify-center items-center py-8">
- <div className="animate-spin rounded-full h-8 w-8 border-t-2 border-b-2 border-primary" />
+ <div className="animate-spin rounded-full h-8 w-8 border-t-2 border-b-2 border-white" />
</div>
);
}
diff --git a/src/components/features/conversation-panel/skills-modal.tsx b/src/components/features/conversation-panel/skills-modal.tsx
index f60db596a8..01f5ccd3a8 100644
--- a/src/components/features/conversation-panel/skills-modal.tsx
+++ b/src/components/features/conversation-panel/skills-modal.tsx
@@ -56,7 +56,7 @@ export function SkillsModal({ onClose }: SkillsModalProps) {
/>
{isAgentReady && (
- <Typography.Text className="text-sm text-gray-400">
+ <Typography.Text className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.SKILLS_MODAL$WARNING)}
</Typography.Text>
)}
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-card-footer.tsx b/src/components/features/conversation-panel/start-task-card/start-task-card-footer.tsx
index 3b1f8c3806..dabd2d173c 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-card-footer.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-card-footer.tsx
@@ -29,7 +29,7 @@ export function StartTaskCardFooter({
<NoRepository />
)}
{createdAt && (
- <p className="text-xs text-[#A3A3A3] flex-1 text-right">
+ <p className="text-xs text-[var(--oh-muted)] flex-1 text-right">
<time>
{`${formatTimeDelta(createdAt)} ${t(I18nKey.CONVERSATION$AGO)}`}
</time>
@@ -39,7 +39,9 @@ export function StartTaskCardFooter({
{/* Task Detail */}
{detail && (
- <div className="text-xs text-neutral-500 truncate">{detail}</div>
+ <div className="text-xs text-[var(--oh-text-subtle)] truncate">
+ {detail}
+ </div>
)}
</div>
);
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx b/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx
index 5fc3214d10..4ca74d749a 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx
@@ -19,7 +19,7 @@ export function StartTaskCardHeader({
</div>
{/* Title */}
- <h3 className="text-sm font-medium text-neutral-100 truncate flex-1">
+ <h3 className="text-sm font-medium text-content-2 truncate flex-1">
{title}
</h3>
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-card.tsx b/src/components/features/conversation-panel/start-task-card/start-task-card.tsx
index 5664eadd2e..a956471a04 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-card.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-card.tsx
@@ -30,8 +30,8 @@ export function StartTaskCard({ task, onClick }: StartTaskCardProps) {
data-testid="start-task-card"
onClick={onClick}
className={cn(
- "relative h-auto w-full p-3.5 border-b border-neutral-600 cursor-pointer",
- "hover:bg-[#454545]",
+ "relative h-auto w-full p-3.5 border-b border-[var(--oh-border)] cursor-pointer",
+ "hover:bg-tertiary",
)}
>
<div className="flex items-center justify-between w-full">
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx b/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx
index 19254cb131..c260e2cd33 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx
@@ -23,7 +23,7 @@ export function StartTaskStatusIndicator({
case "STARTING_CONVERSATION":
return "bg-yellow-500 animate-pulse";
default:
- return "bg-gray-500";
+ return "bg-[var(--oh-interactive-selected)]";
}
};
diff --git a/src/components/features/conversation-panel/system-message-modal/empty-tools-state.tsx b/src/components/features/conversation-panel/system-message-modal/empty-tools-state.tsx
index adddc544f8..b44247076f 100644
--- a/src/components/features/conversation-panel/system-message-modal/empty-tools-state.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/empty-tools-state.tsx
@@ -6,7 +6,7 @@ export function EmptyToolsState() {
return (
<div className="flex items-center justify-center h-full p-4">
- <Typography.Text className="text-gray-400">
+ <Typography.Text className="text-[var(--oh-muted)]">
{t("SYSTEM_MESSAGE_MODAL$NO_TOOLS")}
</Typography.Text>
</div>
diff --git a/src/components/features/conversation-panel/system-message-modal/system-message-header.tsx b/src/components/features/conversation-panel/system-message-modal/system-message-header.tsx
index 9199383134..108373d1d6 100644
--- a/src/components/features/conversation-panel/system-message-modal/system-message-header.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/system-message-header.tsx
@@ -25,20 +25,20 @@ export function SystemMessageHeader({
<div className="flex flex-col gap-2">
{agentClass && (
<div className="text-sm">
- <Typography.Text className="font-semibold text-gray-300">
+ <Typography.Text className="font-semibold text-[var(--oh-text-tertiary)]">
{t("SYSTEM_MESSAGE_MODAL$AGENT_CLASS")}
</Typography.Text>{" "}
- <Typography.Text className="font-medium text-gray-100">
+ <Typography.Text className="font-medium text-content-2">
{agentClass}
</Typography.Text>
</div>
)}
{openhandsVersion && (
<div className="text-sm">
- <Typography.Text className="font-semibold text-gray-300">
+ <Typography.Text className="font-semibold text-[var(--oh-text-tertiary)]">
{t("SYSTEM_MESSAGE_MODAL$OPENHANDS_VERSION")}
</Typography.Text>{" "}
- <Typography.Text className="text-gray-100">
+ <Typography.Text className="text-content-2">
{openhandsVersion}
</Typography.Text>
</div>
diff --git a/src/components/features/conversation-panel/system-message-modal/tab-button.tsx b/src/components/features/conversation-panel/system-message-modal/tab-button.tsx
index f2fb3360c8..8223e62f9a 100644
--- a/src/components/features/conversation-panel/system-message-modal/tab-button.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/tab-button.tsx
@@ -22,8 +22,8 @@ export function TabButton({
className={cn(
"px-4 py-2 font-medium border-b-2 transition-colors",
isActive
- ? "border-primary text-gray-100"
- : "border-transparent hover:text-gray-700 dark:hover:text-gray-300",
+ ? "border-primary text-content-2"
+ : "border-transparent hover:text-[var(--oh-border-subtle)] dark:hover:text-[var(--oh-text-tertiary)]",
disabled && "opacity-50 cursor-not-allowed",
className,
)}
diff --git a/src/components/features/conversation-panel/system-message-modal/toggle-button.tsx b/src/components/features/conversation-panel/system-message-modal/toggle-button.tsx
index eff4ed4a4f..b9ba89234f 100644
--- a/src/components/features/conversation-panel/system-message-modal/toggle-button.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/toggle-button.tsx
@@ -19,14 +19,14 @@ export function ToggleButton({
type="button"
data-testid="toggle-button"
onClick={onClick}
- className={`w-full py-3 px-2 text-left flex items-center justify-between hover:bg-gray-700 transition-colors ${className || ""}`}
+ className={`w-full py-3 px-2 text-left flex items-center justify-between hover:bg-tertiary transition-colors ${className || ""}`}
>
<div className="flex items-center">
- <Typography.Text className="font-bold text-gray-100">
+ <Typography.Text className="font-bold text-content-2">
{title}
</Typography.Text>
</div>
- <Typography.Text className="text-gray-300">
+ <Typography.Text className="text-[var(--oh-text-tertiary)]">
{isExpanded ? <ChevronDown size={18} /> : <ChevronRight size={18} />}
</Typography.Text>
</button>
diff --git a/src/components/features/conversation-panel/system-message-modal/tool-item.tsx b/src/components/features/conversation-panel/system-message-modal/tool-item.tsx
index 3593d770c5..edf673af7d 100644
--- a/src/components/features/conversation-panel/system-message-modal/tool-item.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/tool-item.tsx
@@ -74,7 +74,7 @@ export function ToolItem({ tool, index, isExpanded, onToggle }: ToolItemProps) {
{isExpanded && (
<div className="px-2 pb-3 pt-1">
- <div className="mt-2 mb-3 text-sm text-gray-300 leading-relaxed">
+ <div className="mt-2 mb-3 text-sm text-[var(--oh-text-tertiary)] leading-relaxed">
<MarkdownRenderer>{String(description)}</MarkdownRenderer>
</div>
diff --git a/src/components/features/conversation-panel/system-message-modal/tool-parameters.tsx b/src/components/features/conversation-panel/system-message-modal/tool-parameters.tsx
index 8352e6c3d4..72c7860c8b 100644
--- a/src/components/features/conversation-panel/system-message-modal/tool-parameters.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/tool-parameters.tsx
@@ -12,10 +12,10 @@ export function ToolParameters({ parameters }: ToolParametersProps) {
return (
<div className="mt-2" data-testid="tool-parameters">
- <Typography.Text className="text-sm font-semibold text-gray-300">
+ <Typography.Text className="text-sm font-semibold text-[var(--oh-text-tertiary)]">
{t("SYSTEM_MESSAGE_MODAL$PARAMETERS")}
</Typography.Text>
- <div className="text-sm mt-2 p-3 bg-gray-900 rounded-md overflow-auto text-gray-300 max-h-[400px] shadow-inner">
+ <div className="text-sm mt-2 p-3 bg-base rounded-md overflow-auto text-[var(--oh-text-tertiary)] max-h-[400px] shadow-inner">
<ReactJsonView name={false} src={parameters} theme={JSON_VIEW_THEME} />
</div>
</div>
diff --git a/src/components/features/conversation/conversation-loading.tsx b/src/components/features/conversation/conversation-loading.tsx
index d63efd7bf3..d272400f44 100644
--- a/src/components/features/conversation/conversation-loading.tsx
+++ b/src/components/features/conversation/conversation-loading.tsx
@@ -13,7 +13,7 @@ export function ConversationLoading({ className }: ConversationLoadingProps) {
return (
<div
className={cn(
- "bg-[#25272D] flex flex-col items-center justify-center h-full w-full",
+ "bg-[var(--oh-surface)] flex flex-col items-center justify-center h-full w-full",
className,
)}
>
diff --git a/src/components/features/conversation/conversation-main/conversation-main.tsx b/src/components/features/conversation/conversation-main/conversation-main.tsx
index da054ea9cf..883a275372 100644
--- a/src/components/features/conversation/conversation-main/conversation-main.tsx
+++ b/src/components/features/conversation/conversation-main/conversation-main.tsx
@@ -118,10 +118,10 @@ export function ConversationMain() {
: "flex flex-col h-full w-full",
)}
>
- <div className="flex flex-col flex-1 min-h-0 bg-[#25272D] border border-[#525252] overflow-hidden">
+ <div className="flex flex-col flex-1 min-h-0 bg-[var(--oh-surface)] border border-[var(--oh-border)] overflow-hidden">
<div
data-testid="tabs-pane-header"
- className="flex items-center min-h-9 px-3 py-1.5 border-b border-[#474A54]"
+ className="flex items-center min-h-9 px-3 py-1.5 border-b border-[var(--oh-border)]"
>
<ConversationTabs />
</div>
diff --git a/src/components/features/conversation/conversation-name-context-menu-icon-text.tsx b/src/components/features/conversation/conversation-name-context-menu-icon-text.tsx
index 4f3ecab65c..66e7283d1e 100644
--- a/src/components/features/conversation/conversation-name-context-menu-icon-text.tsx
+++ b/src/components/features/conversation/conversation-name-context-menu-icon-text.tsx
@@ -14,7 +14,7 @@ export function ConversationNameContextMenuIconText({
return (
<div
className={cn(
- "flex items-center gap-2 p-2 hover:bg-[#5C5D62] rounded",
+ "flex items-center gap-2 p-2 hover:bg-[var(--oh-interactive-hover)] rounded",
className,
)}
>
diff --git a/src/components/features/conversation/conversation-name-context-menu.tsx b/src/components/features/conversation/conversation-name-context-menu.tsx
index 3e6f0fa42b..db10a8ae61 100644
--- a/src/components/features/conversation/conversation-name-context-menu.tsx
+++ b/src/components/features/conversation/conversation-name-context-menu.tsx
@@ -248,7 +248,7 @@ export function ConversationNameContextMenu({
type="button"
data-testid="copy-share-link-button"
onClick={onCopyShareLink}
- className="p-1 hover:bg-[#717888] rounded cursor-pointer"
+ className="p-1 hover:bg-[var(--oh-interactive-selected)] rounded cursor-pointer"
title={t(I18nKey.BUTTON$COPY_TO_CLIPBOARD)}
>
<CopyIcon width={16} height={16} />
@@ -259,7 +259,7 @@ export function ConversationNameContextMenu({
target="_blank"
rel="noopener noreferrer"
onClick={(e) => e.stopPropagation()}
- className="p-1 hover:bg-[#717888] rounded cursor-pointer"
+ className="p-1 hover:bg-[var(--oh-interactive-selected)] rounded cursor-pointer"
title={t(I18nKey.BUTTON$OPEN_IN_NEW_TAB)}
>
<LinkIcon width={16} height={16} />
diff --git a/src/components/features/conversation/conversation-tabs/conversation-tab-nav.tsx b/src/components/features/conversation/conversation-tabs/conversation-tab-nav.tsx
index 96c9a91a9e..3219951049 100644
--- a/src/components/features/conversation/conversation-tabs/conversation-tab-nav.tsx
+++ b/src/components/features/conversation/conversation-tabs/conversation-tab-nav.tsx
@@ -28,12 +28,14 @@ export function ConversationTabNav({
className={cn(
"flex items-center gap-2 rounded-md cursor-pointer",
"pl-1.5 pr-2 py-1 lg:py-1.5",
- "text-[#9299AA] bg-transparent",
- isActive && "bg-[#0D0F11] text-white",
+ "text-[var(--oh-muted)] bg-transparent",
+ isActive && "bg-base text-white",
isActive
- ? "hover:text-white hover:bg-[#0D0F11]"
+ ? "hover:text-white hover:bg-base"
: "hover:text-white hover:bg-white/5",
- isActive ? "focus-within:text-white" : "focus-within:text-[#9299AA]",
+ isActive
+ ? "focus-within:text-white"
+ : "focus-within:text-[var(--oh-muted)]",
className,
)}
>
diff --git a/src/components/features/conversation/conversation-tabs/conversation-tabs-context-menu.tsx b/src/components/features/conversation/conversation-tabs/conversation-tabs-context-menu.tsx
index 7c48d6a72f..e9a82fe7ac 100644
--- a/src/components/features/conversation/conversation-tabs/conversation-tabs-context-menu.tsx
+++ b/src/components/features/conversation/conversation-tabs/conversation-tabs-context-menu.tsx
@@ -112,7 +112,7 @@ export function ConversationTabsContextMenu({
<ContextMenuListItem
key={tab}
onClick={() => handleTabClick(tab)}
- className="flex items-center gap-2 p-2 hover:bg-[#5C5D62] rounded h-[30px]"
+ className="flex items-center gap-2 p-2 hover:bg-[var(--oh-interactive-hover)] rounded h-[30px]"
>
<Icon className="w-4 h-4" />
<span className="text-white text-sm">{t(i18nKey)}</span>
diff --git a/src/components/features/conversation/metrics-modal/context-window-section.tsx b/src/components/features/conversation/metrics-modal/context-window-section.tsx
index 2d3845844f..4c8331fd86 100644
--- a/src/components/features/conversation/metrics-modal/context-window-section.tsx
+++ b/src/components/features/conversation/metrics-modal/context-window-section.tsx
@@ -23,14 +23,14 @@ export function ContextWindowSection({
{t(I18nKey.CONVERSATION$CONTEXT_WINDOW)}
</span>
</div>
- <div className="w-full h-1.5 bg-neutral-700 rounded-full overflow-hidden">
+ <div className="w-full h-1.5 bg-tertiary rounded-full overflow-hidden">
<div
className="h-full bg-blue-500 transition-all duration-300"
style={{ width: `${progressWidth}%` }}
/>
</div>
<div className="flex justify-end">
- <span className="text-xs text-neutral-400">
+ <span className="text-xs text-[var(--oh-muted)]">
{perTurnToken.toLocaleString()} / {contextWindow.toLocaleString()} (
{usagePercentage.toFixed(2)}% {t(I18nKey.CONVERSATION$USED)})
</span>
diff --git a/src/components/features/conversation/metrics-modal/empty-state.tsx b/src/components/features/conversation/metrics-modal/empty-state.tsx
index 20edbb894a..d2b5521758 100644
--- a/src/components/features/conversation/metrics-modal/empty-state.tsx
+++ b/src/components/features/conversation/metrics-modal/empty-state.tsx
@@ -6,7 +6,9 @@ export function EmptyState() {
return (
<div className="rounded-md p-4 text-center">
- <p className="text-neutral-400">{t(I18nKey.CONVERSATION$NO_METRICS)}</p>
+ <p className="text-[var(--oh-muted)]">
+ {t(I18nKey.CONVERSATION$NO_METRICS)}
+ </p>
</div>
);
}
diff --git a/src/components/features/conversation/metrics-modal/metric-row.tsx b/src/components/features/conversation/metrics-modal/metric-row.tsx
index 6aef40f872..bb1e134c0b 100644
--- a/src/components/features/conversation/metrics-modal/metric-row.tsx
+++ b/src/components/features/conversation/metrics-modal/metric-row.tsx
@@ -14,7 +14,7 @@ export function MetricRow({
valueClassName = "font-semibold",
}: MetricRowProps) {
return (
- <div className="flex justify-between items-center border-b border-neutral-700 pb-2">
+ <div className="flex justify-between items-center border-b border-[var(--oh-border-subtle)] pb-2">
<span className={labelClassName}>{label}</span>
<span className={valueClassName}>{value}</span>
</div>
diff --git a/src/components/features/conversation/metrics-modal/metrics-modal.tsx b/src/components/features/conversation/metrics-modal/metrics-modal.tsx
index 7427ea4266..b149ed1838 100644
--- a/src/components/features/conversation/metrics-modal/metrics-modal.tsx
+++ b/src/components/features/conversation/metrics-modal/metrics-modal.tsx
@@ -67,7 +67,7 @@ export function MetricsModal({ isOpen, onOpenChange }: MetricsModalProps) {
return (
<ModalBackdrop onClose={() => onOpenChange(false)}>
- <ModalBody className="items-start border border-tertiary">
+ <ModalBody className="items-start border border-[var(--oh-border)]">
<BaseModalTitle title={t(I18nKey.CONVERSATION$METRICS_INFO)} />
<div className="space-y-4 w-full">
{(metrics?.cost !== null || metrics?.usage !== null) && (
diff --git a/src/components/features/conversation/metrics-modal/usage-section.tsx b/src/components/features/conversation/metrics-modal/usage-section.tsx
index d10f3e0341..91d133cb20 100644
--- a/src/components/features/conversation/metrics-modal/usage-section.tsx
+++ b/src/components/features/conversation/metrics-modal/usage-section.tsx
@@ -22,13 +22,13 @@ export function UsageSection({ usage }: UsageSectionProps) {
/>
<div className="grid grid-cols-2 gap-2 pl-4 text-sm">
- <span className="text-neutral-400">
+ <span className="text-[var(--oh-muted)]">
{t(I18nKey.CONVERSATION$CACHE_HIT)}
</span>
<span className="text-right">
{usage.cache_read_tokens.toLocaleString()}
</span>
- <span className="text-neutral-400">
+ <span className="text-[var(--oh-muted)]">
{t(I18nKey.CONVERSATION$CACHE_WRITE)}
</span>
<span className="text-right">
diff --git a/src/components/features/conversation/right-panel-toggle.tsx b/src/components/features/conversation/right-panel-toggle.tsx
index a74f6ccd3f..2294000813 100644
--- a/src/components/features/conversation/right-panel-toggle.tsx
+++ b/src/components/features/conversation/right-panel-toggle.tsx
@@ -45,7 +45,7 @@ export function RightPanelToggle({ className }: RightPanelToggleProps) {
onClick={handleToggle}
className={cn(
"p-1 rounded-md cursor-pointer transition-colors",
- "text-[#9299AA] hover:text-white hover:bg-white/10",
+ "text-[var(--oh-muted)] hover:text-white hover:bg-white/10",
isRightPanelShown && "text-white bg-white/10",
className,
)}
diff --git a/src/components/features/diff-viewer/editor-container.tsx b/src/components/features/diff-viewer/editor-container.tsx
index 228ca7b7c2..cac0e78dc3 100644
--- a/src/components/features/diff-viewer/editor-container.tsx
+++ b/src/components/features/diff-viewer/editor-container.tsx
@@ -9,7 +9,7 @@ export function EditorContainer({ height, children }: EditorContainerProps) {
return (
<div
data-testid="editor-container"
- className="w-full border-b border-[#474A54] overflow-hidden h-[var(--editor-height)]"
+ className="w-full border-b border-[var(--oh-border)] overflow-hidden h-[var(--editor-height)]"
style={{ "--editor-height": `${height}px` } as React.CSSProperties}
>
{children}
diff --git a/src/components/features/diff-viewer/empty-changes-message.tsx b/src/components/features/diff-viewer/empty-changes-message.tsx
index 8706ba19e3..7a9cfc5dbc 100644
--- a/src/components/features/diff-viewer/empty-changes-message.tsx
+++ b/src/components/features/diff-viewer/empty-changes-message.tsx
@@ -7,8 +7,8 @@ export function EmptyChangesMessage() {
return (
<div className="flex flex-col items-center justify-center w-full h-full p-10 gap-4">
- <FaCodeCompare size={100} className="text-[#A1A1A1]" />
- <span className="text-[#8D95A9] text-[19px] font-normal leading-5">
+ <FaCodeCompare size={100} className="text-[var(--oh-muted)]" />
+ <span className="text-[var(--oh-text-dim)] text-[19px] font-normal leading-5">
{t(I18nKey.DIFF_VIEWER$NO_CHANGES)}
</span>
</div>
diff --git a/src/components/features/diff-viewer/file-diff-viewer.tsx b/src/components/features/diff-viewer/file-diff-viewer.tsx
index e0cfb130be..2ac84fc245 100644
--- a/src/components/features/diff-viewer/file-diff-viewer.tsx
+++ b/src/components/features/diff-viewer/file-diff-viewer.tsx
@@ -62,9 +62,9 @@ const beforeMount = (monaco: Monaco) => {
"diffEditor.removedTextBackground": "#750000AA",
"diffEditor.insertedLineBackground": "#003f00AA",
"diffEditor.removedLineBackground": "#5a0000AA",
- "diffEditor.border": "#444444",
+ "diffEditor.border": "var(--oh-border-subtle)",
"editorUnnecessaryCode.border": "#00000000",
- "editorUnnecessaryCode.opacity": "#00000077",
+ "editorUnnecessaryCode.opacity": "rgba(0, 0, 0, 0.467)",
},
});
};
@@ -177,7 +177,7 @@ export function FileDiffViewer({ path, type }: FileDiffViewerProps) {
if (isMarkdownFile) {
return (
<div
- className="w-full border-b border-[#474A54] overflow-auto p-4 bg-neutral-900 prose prose-invert max-w-none"
+ className="w-full border-b border-[var(--oh-border)] overflow-auto p-4 bg-base prose prose-invert max-w-none"
data-testid="markdown-preview"
>
<MarkdownRenderer
@@ -208,7 +208,7 @@ export function FileDiffViewer({ path, type }: FileDiffViewerProps) {
return (
<div data-testid="file-diff-viewer-outer" className="w-full flex flex-col">
<div
- className="flex justify-between items-center px-3 py-2.5 border-b border-[#474A54] hover:cursor-pointer"
+ className="flex justify-between items-center px-3 py-2.5 border-b border-[var(--oh-border)] hover:cursor-pointer"
onClick={() => setIsCollapsed((prev) => !prev)}
>
<span className="text-sm w-full text-content flex items-center gap-2">
@@ -228,8 +228,8 @@ export function FileDiffViewer({ path, type }: FileDiffViewerProps) {
className={cn(
"p-1 rounded transition-colors cursor-pointer",
viewMode === mode
- ? "bg-[#474A54] text-white"
- : "text-[#9099ac] hover:bg-[#474A54] hover:text-white",
+ ? "bg-[var(--oh-interactive-hover)] text-white"
+ : "text-[var(--oh-muted)] hover:bg-[var(--oh-interactive-hover)] hover:text-white",
)}
>
<Icon className="w-4 h-4" />
@@ -251,7 +251,7 @@ export function FileDiffViewer({ path, type }: FileDiffViewerProps) {
{!isCollapsed && isDeleted && (
<div
data-testid="file-deleted-message"
- className="w-full border-b border-[#474A54] p-4 bg-neutral-900 text-[#8D95A9] text-sm"
+ className="w-full border-b border-[var(--oh-border)] p-4 bg-base text-[var(--oh-text-dim)] text-sm"
>
{t(I18nKey.DIFF_VIEWER$FILE_DELETED)}
</div>
diff --git a/src/components/features/diff-viewer/loading-spinner.tsx b/src/components/features/diff-viewer/loading-spinner.tsx
index 29ea58def7..f91b45bc60 100644
--- a/src/components/features/diff-viewer/loading-spinner.tsx
+++ b/src/components/features/diff-viewer/loading-spinner.tsx
@@ -9,7 +9,7 @@ export function LoadingSpinner({ className }: LoadingSpinnerProps) {
<div className="flex items-center justify-center">
<div
className={cn(
- "animate-spin rounded-full border-4 border-gray-200 border-t-blue-500",
+ "animate-spin rounded-full border-4 border-[var(--oh-border)] border-t-white",
className,
)}
role="status"
diff --git a/src/components/features/files-tab/file-content-viewer.tsx b/src/components/features/files-tab/file-content-viewer.tsx
index f18d9381dc..bc0322ddb7 100644
--- a/src/components/features/files-tab/file-content-viewer.tsx
+++ b/src/components/features/files-tab/file-content-viewer.tsx
@@ -31,7 +31,7 @@ export function FileContentViewer({ path, viewMode }: FileContentViewerProps) {
if (query.isLoading) {
return (
- <div className="flex h-full w-full items-center justify-center text-sm text-[#9299AA]">
+ <div className="flex h-full w-full items-center justify-center text-sm text-[var(--oh-muted)]">
{t(I18nKey.FILES$LOADING_FILES)}
</div>
);
@@ -46,7 +46,7 @@ export function FileContentViewer({ path, viewMode }: FileContentViewerProps) {
// we have one; fall back to the generic translated string otherwise.
return (
<div
- className="flex h-full w-full items-center justify-center text-sm text-[#9299AA]"
+ className="flex h-full w-full items-center justify-center text-sm text-[var(--oh-muted)]"
data-testid="file-content-viewer-error"
>
{(query.error as Error | undefined)?.message ??
@@ -73,7 +73,7 @@ export function FileContentViewer({ path, viewMode }: FileContentViewerProps) {
}
return (
<div
- className="flex h-full w-full items-center justify-center text-sm text-[#9299AA]"
+ className="flex h-full w-full items-center justify-center text-sm text-[var(--oh-muted)]"
data-testid="file-content-viewer-binary-fallback"
>
{t(I18nKey.FILES$BINARY_FALLBACK)}
@@ -85,7 +85,7 @@ export function FileContentViewer({ path, viewMode }: FileContentViewerProps) {
if (kind === "image") {
return (
<div
- className="flex h-full w-full items-center justify-center bg-[#1F2125] p-4"
+ className="flex h-full w-full items-center justify-center bg-[var(--oh-surface)] p-4"
data-testid="file-content-viewer-image"
>
<img
@@ -120,7 +120,7 @@ export function FileContentViewer({ path, viewMode }: FileContentViewerProps) {
if (kind === "binary") {
return (
<div
- className="flex h-full w-full items-center justify-center text-sm text-[#9299AA]"
+ className="flex h-full w-full items-center justify-center text-sm text-[var(--oh-muted)]"
data-testid="file-content-viewer-binary-fallback"
>
{t(I18nKey.FILES$BINARY_FALLBACK)}
@@ -158,9 +158,9 @@ export function FileContentViewer({ path, viewMode }: FileContentViewerProps) {
return (
<div
data-testid="file-content-viewer-markdown"
- className="h-full w-full overflow-auto bg-[#25272D] text-white custom-scrollbar-always"
+ className="h-full w-full overflow-auto bg-[var(--oh-surface)] text-white custom-scrollbar-always"
>
- <div className="prose prose-sm prose-invert max-w-none p-6 [--tw-prose-body:#fff] [--tw-prose-bold:#fff] [--tw-prose-headings:#fff] [--tw-prose-lead:#fff] [--tw-prose-counters:#fff] [--tw-prose-quotes:#fff] [--tw-prose-quote-borders:#3A3D44] [--tw-prose-bullets:#9299AA] [--tw-prose-hr:#3A3D44] [--tw-prose-captions:#9299AA] [--tw-prose-kbd:#fff]">
+ <div className="prose prose-sm prose-invert max-w-none p-6 [--tw-prose-body:#fff] [--tw-prose-bold:#fff] [--tw-prose-headings:#fff] [--tw-prose-lead:#fff] [--tw-prose-counters:#fff] [--tw-prose-quotes:#fff] [--tw-prose-quote-borders:var(--oh-border-subtle)] [--tw-prose-bullets:var(--oh-muted)] [--tw-prose-hr:var(--oh-border-subtle)] [--tw-prose-captions:var(--oh-muted)] [--tw-prose-kbd:#fff]">
<MarkdownRenderer
content={text ?? ""}
includeStandard
@@ -191,7 +191,7 @@ export function FileContentViewer({ path, viewMode }: FileContentViewerProps) {
// blank.
return (
<div
- className="flex h-full w-full items-center justify-center text-sm text-[#9299AA]"
+ className="flex h-full w-full items-center justify-center text-sm text-[var(--oh-muted)]"
data-testid="file-content-viewer-binary-fallback"
>
{t(I18nKey.FILES$BINARY_FALLBACK)}
diff --git a/src/components/features/files-tab/file-quick-row.tsx b/src/components/features/files-tab/file-quick-row.tsx
index 01f3175f91..a30a4a9f06 100644
--- a/src/components/features/files-tab/file-quick-row.tsx
+++ b/src/components/features/files-tab/file-quick-row.tsx
@@ -37,7 +37,7 @@ export function FileQuickRow({
return (
<div
- className="flex items-center gap-1.5 border-b border-[#3A3D44] px-2 py-1.5 min-h-[34px]"
+ className="flex items-center gap-1.5 border-b border-[var(--oh-border)] px-2 py-1.5 min-h-[34px]"
data-testid="file-quick-row"
>
<button
@@ -57,8 +57,8 @@ export function FileQuickRow({
)}
className={cn(
"shrink-0 inline-flex items-center justify-center w-6 h-6 rounded-md cursor-pointer",
- "text-[#D6D6D6] hover:bg-[#3A3D44]",
- isTreeVisible && "bg-[#2F3137]",
+ "text-[var(--oh-text-tertiary)] hover:bg-tertiary",
+ isTreeVisible && "bg-[var(--oh-surface-raised)]",
)}
>
{isTreeVisible ? (
@@ -82,8 +82,8 @@ export function FileQuickRow({
className={cn(
"inline-flex items-center px-2 py-0.5 text-xs whitespace-nowrap rounded-md cursor-pointer",
isSelected
- ? "bg-[#474A54] text-white"
- : "bg-[#2F3137] text-[#D6D6D6] hover:bg-[#3A3D44]",
+ ? "bg-[var(--oh-interactive-hover)] text-white"
+ : "bg-[var(--oh-surface-raised)] text-[var(--oh-text-tertiary)] hover:bg-tertiary",
)}
>
{path}
diff --git a/src/components/features/files-tab/file-tree-view.tsx b/src/components/features/files-tab/file-tree-view.tsx
index 7dc362182b..37cdc3dace 100644
--- a/src/components/features/files-tab/file-tree-view.tsx
+++ b/src/components/features/files-tab/file-tree-view.tsx
@@ -34,14 +34,14 @@ function TreeNode({ node, depth, selectedPath, onSelectFile }: TreeNodeProps) {
data-testid={`file-tree-dir-${node.path}`}
className={cn(
"flex w-full items-center gap-1.5 py-1 pr-2 text-left text-sm text-white",
- "hover:bg-[#3A3D44] cursor-pointer",
+ "hover:bg-tertiary cursor-pointer",
)}
style={{ paddingLeft: `${indentPx}px` }}
>
<span
aria-hidden
className={cn(
- "inline-block w-3 text-[10px] text-[#9299AA] transition-transform",
+ "inline-block w-3 text-[10px] text-[var(--oh-muted)] transition-transform",
isOpen ? "rotate-90" : "rotate-0",
)}
>
@@ -76,8 +76,10 @@ function TreeNode({ node, depth, selectedPath, onSelectFile }: TreeNodeProps) {
data-testid={`file-tree-file-${node.path}`}
className={cn(
"flex w-full items-center gap-1.5 py-1 pr-2 text-left text-sm",
- "hover:bg-[#3A3D44] cursor-pointer",
- isSelected ? "bg-[#474A54] text-white" : "text-[#D6D6D6]",
+ "hover:bg-tertiary cursor-pointer",
+ isSelected
+ ? "bg-[var(--oh-interactive-hover)] text-white"
+ : "text-[var(--oh-text-tertiary)]",
)}
style={{ paddingLeft: `${indentPx + 16}px` }}
>
@@ -98,7 +100,7 @@ export function FileTreeView({
if (root.children.length === 0) {
return (
- <div className="px-3 py-4 text-sm text-[#9299AA]">
+ <div className="px-3 py-4 text-sm text-[var(--oh-muted)]">
{t(I18nKey.FILES$NO_FILES)}
</div>
);
diff --git a/src/components/features/files-tab/highlighted-source-view.tsx b/src/components/features/files-tab/highlighted-source-view.tsx
index 161166cde4..310978d38b 100644
--- a/src/components/features/files-tab/highlighted-source-view.tsx
+++ b/src/components/features/files-tab/highlighted-source-view.tsx
@@ -34,7 +34,7 @@ export function HighlightedSourceView({
return (
<pre
data-testid="file-content-viewer-plain"
- className="h-full w-full overflow-auto whitespace-pre-wrap break-words bg-[#25272D] p-4 text-xs leading-5 text-white custom-scrollbar-always"
+ className="h-full w-full overflow-auto whitespace-pre-wrap break-words bg-[var(--oh-surface)] p-4 text-xs leading-5 text-white custom-scrollbar-always"
>
{text}
</pre>
@@ -45,7 +45,7 @@ export function HighlightedSourceView({
<div
data-testid="file-content-viewer-highlighted"
data-language={language}
- className="h-full w-full overflow-auto bg-[#25272D] custom-scrollbar-always"
+ className="h-full w-full overflow-auto bg-[var(--oh-surface)] custom-scrollbar-always"
>
<SyntaxHighlighter
language={language}
@@ -67,7 +67,7 @@ export function HighlightedSourceView({
style: { background: "transparent", fontFamily: "inherit" },
}}
lineNumberStyle={{
- color: "#5C5D62",
+ color: "var(--oh-border)",
minWidth: "2.5em",
paddingRight: "1em",
userSelect: "none",
diff --git a/src/components/features/files-tab/segmented-toggle.tsx b/src/components/features/files-tab/segmented-toggle.tsx
index a2b604fd45..ec2fa4459d 100644
--- a/src/components/features/files-tab/segmented-toggle.tsx
+++ b/src/components/features/files-tab/segmented-toggle.tsx
@@ -30,7 +30,7 @@ export function SegmentedToggle<T extends string>({
role="radiogroup"
aria-label={ariaLabel}
data-testid={testId}
- className="inline-flex items-center rounded-md bg-[#2F3137] p-0.5 text-xs"
+ className="inline-flex items-center rounded-md bg-[var(--oh-surface-raised)] p-0.5 text-xs"
>
{options.map((option) => {
const isActive = option.value === value;
@@ -47,8 +47,8 @@ export function SegmentedToggle<T extends string>({
className={cn(
"px-2 py-0.5 rounded cursor-pointer transition-colors",
isActive
- ? "bg-[#5C5D62] text-white"
- : "text-[#9299AA] hover:text-white",
+ ? "bg-[var(--oh-interactive-hover)] text-white"
+ : "text-[var(--oh-muted)] hover:text-white",
)}
>
{option.label}
diff --git a/src/components/features/home/git-branch-dropdown/git-branch-dropdown.tsx b/src/components/features/home/git-branch-dropdown/git-branch-dropdown.tsx
index 8a6d5352a5..45f72916ee 100644
--- a/src/components/features/home/git-branch-dropdown/git-branch-dropdown.tsx
+++ b/src/components/features/home/git-branch-dropdown/git-branch-dropdown.tsx
@@ -186,7 +186,7 @@ export function GitBranchDropdown({
<div className="relative">
<div className="absolute left-2 top-1/2 transform -translate-y-1/2 z-10">
{isLoadingState ? (
- <div className="animate-spin h-4 w-4 border-2 border-blue-500 border-t-transparent rounded-full" />
+ <div className="animate-spin h-4 w-4 border-2 border-white/20 border-t-white rounded-full" />
) : (
<BranchIcon width={16} height={16} />
)}
@@ -196,10 +196,10 @@ export function GitBranchDropdown({
disabled: disabled || !repository,
placeholder,
className: cn(
- "w-full px-3 py-2 border border-[#727987] rounded-sm shadow-none h-[42px] min-h-[42px] max-h-[42px]",
- "bg-[#454545] text-[#A3A3A3] placeholder:text-[#A3A3A3]",
- "focus:outline-none focus:ring-0 focus:border-[#727987]",
- "disabled:bg-[#363636] disabled:cursor-not-allowed disabled:opacity-60",
+ "w-full px-3 py-2 border border-[var(--oh-border-input)] rounded-sm shadow-none h-[42px] min-h-[42px] max-h-[42px]",
+ "bg-tertiary text-[var(--oh-muted)] placeholder:text-[var(--oh-muted)]",
+ "focus:outline-none focus:ring-0 focus:border-[var(--oh-border-input)]",
+ "disabled:bg-tertiary disabled:cursor-not-allowed disabled:opacity-60",
"pl-7 pr-16 text-sm font-normal leading-5", // Space for clear and toggle buttons
),
// Direct onChange for cursor position preservation
diff --git a/src/components/features/home/git-provider-dropdown/git-provider-dropdown.tsx b/src/components/features/home/git-provider-dropdown/git-provider-dropdown.tsx
index e3ec9253e6..023cfa062b 100644
--- a/src/components/features/home/git-provider-dropdown/git-provider-dropdown.tsx
+++ b/src/components/features/home/git-provider-dropdown/git-provider-dropdown.tsx
@@ -173,10 +173,10 @@ export function GitProviderDropdown({
placeholder,
readOnly: true, // Make it non-searchable like the original
className: cn(
- "w-29.5 h-6 py-0 border border-[#727987] rounded shadow-none h-6 min-h-6 max-h-6 ",
- "bg-[#454545] text-[#A3A3A3] placeholder:text-[#A3A3A3]",
- "focus:outline-none focus:ring-0 focus:border-[#727987]",
- "disabled:bg-[#363636] disabled:cursor-not-allowed disabled:opacity-60",
+ "w-29.5 h-6 py-0 border border-[var(--oh-border-input)] rounded shadow-none h-6 min-h-6 max-h-6 ",
+ "bg-tertiary text-[var(--oh-muted)] placeholder:text-[var(--oh-muted)]",
+ "focus:outline-none focus:ring-0 focus:border-[var(--oh-border-input)]",
+ "disabled:bg-tertiary disabled:cursor-not-allowed disabled:opacity-60",
"pl-1.5 pr-[1px] cursor-pointer text-xs font-normal leading-5", // Space for toggle button and pointer cursor
selectedItem && "pl-6",
inputClassName,
diff --git a/src/components/features/home/git-repo-dropdown/git-repo-dropdown.tsx b/src/components/features/home/git-repo-dropdown/git-repo-dropdown.tsx
index 03a1ee4383..27e5657c06 100644
--- a/src/components/features/home/git-repo-dropdown/git-repo-dropdown.tsx
+++ b/src/components/features/home/git-repo-dropdown/git-repo-dropdown.tsx
@@ -277,7 +277,7 @@ export function GitRepoDropdown({
return (
<div>
- <Typography.Text className="text-xs text-[#FAFAFA] font-semibold leading-4 pl-2">
+ <Typography.Text className="text-xs text-content-2 font-semibold leading-4 pl-2">
{t(I18nKey.COMMON$MOST_RECENT)}
</Typography.Text>
</div>
@@ -289,7 +289,7 @@ export function GitRepoDropdown({
<div className="relative">
<div className="absolute left-2 top-1/2 transform -translate-y-1/2 z-10">
{isLoadingState ? (
- <div className="animate-spin h-4 w-4 border-2 border-blue-500 border-t-transparent rounded-full" />
+ <div className="animate-spin h-4 w-4 border-2 border-white/20 border-t-white rounded-full" />
) : (
<RepoIcon width={16} height={16} />
)}
@@ -299,10 +299,10 @@ export function GitRepoDropdown({
disabled,
placeholder,
className: cn(
- "w-full px-3 py-2 border border-[#727987] rounded-sm shadow-none h-[42px] min-h-[42px] max-h-[42px]",
- "bg-[#454545] text-[#A3A3A3] placeholder:text-[#A3A3A3]",
- "focus:outline-none focus:ring-0 focus:border-[#727987]",
- "disabled:bg-[#363636] disabled:cursor-not-allowed disabled:opacity-60",
+ "w-full px-3 py-2 border border-[var(--oh-border-input)] rounded-sm shadow-none h-[42px] min-h-[42px] max-h-[42px]",
+ "bg-tertiary text-[var(--oh-muted)] placeholder:text-[var(--oh-muted)]",
+ "focus:outline-none focus:ring-0 focus:border-[var(--oh-border-input)]",
+ "disabled:bg-tertiary disabled:cursor-not-allowed disabled:opacity-60",
"pl-7 pr-16 text-sm font-normal leading-5", // Space for clear and toggle buttons
),
// Direct onChange for cursor position preservation
diff --git a/src/components/features/home/home-header/guide-message.tsx b/src/components/features/home/home-header/guide-message.tsx
index d643048dd7..4549a9abcf 100644
--- a/src/components/features/home/home-header/guide-message.tsx
+++ b/src/components/features/home/home-header/guide-message.tsx
@@ -4,7 +4,7 @@ export function GuideMessage() {
const { t } = useTranslation("openhands");
return (
- <div className="w-fit flex flex-col md:flex-row items-start md:items-center justify-center gap-1 rounded-[12px] bg-[#454545] leading-5 text-white text-[15px] font-normal m-1 md:h-9.5 px-4 pb-1 md:px-[15px] md:py-0">
+ <div className="w-fit flex flex-col md:flex-row items-start md:items-center justify-center gap-1 rounded-[12px] bg-tertiary leading-5 text-white text-[15px] font-normal m-1 md:h-9.5 px-4 pb-1 md:px-[15px] md:py-0">
<span className="">{t("HOME$GUIDE_MESSAGE_TITLE")} </span>
<a
href="https://docs.all-hands.dev/usage/getting-started"
diff --git a/src/components/features/home/new-conversation.tsx b/src/components/features/home/new-conversation.tsx
index 3673d9d6e5..0c508b26da 100644
--- a/src/components/features/home/new-conversation.tsx
+++ b/src/components/features/home/new-conversation.tsx
@@ -23,7 +23,7 @@ export function NewConversation() {
isPending || isSuccess || isCreatingConversationElsewhere;
return (
- <section className="w-full min-h-[286px] md:min-h-auto flex flex-col rounded-[12px] p-[20px] gap-[10px] border border-[#727987] bg-[#26282D] relative">
+ <section className="w-full min-h-[286px] md:min-h-auto flex flex-col rounded-[12px] p-[20px] gap-[10px] border border-[var(--oh-border)] bg-[var(--oh-surface)] relative">
<div className="flex items-center justify-between">
<div className="flex items-center gap-[10px]">
<PlusIcon width={17} height={14} />
diff --git a/src/components/features/home/repo-connector.tsx b/src/components/features/home/repo-connector.tsx
index 7fe9d6df36..00d09ced30 100644
--- a/src/components/features/home/repo-connector.tsx
+++ b/src/components/features/home/repo-connector.tsx
@@ -15,7 +15,7 @@ export function RepoConnector() {
return (
<section
data-testid="repo-connector"
- className="w-full flex flex-col gap-6 rounded-[12px] p-[20px] border border-[#727987] bg-[#26282D] min-h-[263.5px] relative"
+ className="w-full flex flex-col gap-6 rounded-[12px] p-[20px] border border-[var(--oh-border)] bg-[var(--oh-surface)] min-h-[263.5px] relative"
>
{isCloud ? (
<RepositorySelectionForm isLoadingSettings={isLoadingSettings} />
diff --git a/src/components/features/home/repository-selection/branch-error-state.tsx b/src/components/features/home/repository-selection/branch-error-state.tsx
index 96ba4164ba..defa4873b1 100644
--- a/src/components/features/home/repository-selection/branch-error-state.tsx
+++ b/src/components/features/home/repository-selection/branch-error-state.tsx
@@ -11,7 +11,7 @@ export function BranchErrorState({ wrapperClassName }: BranchErrorStateProps) {
<div
data-testid="branch-dropdown-error"
className={cn(
- "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm text-red-500",
+ "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[var(--oh-border-input)] rounded-sm text-red-500",
wrapperClassName,
)}
>
diff --git a/src/components/features/home/repository-selection/branch-loading-state.tsx b/src/components/features/home/repository-selection/branch-loading-state.tsx
index 24b2cc29e9..6359aacc2d 100644
--- a/src/components/features/home/repository-selection/branch-loading-state.tsx
+++ b/src/components/features/home/repository-selection/branch-loading-state.tsx
@@ -14,7 +14,7 @@ export function BranchLoadingState({
<div
data-testid="branch-dropdown-loading"
className={cn(
- "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm",
+ "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[var(--oh-border-input)] rounded-sm",
wrapperClassName,
)}
>
diff --git a/src/components/features/home/repository-selection/repository-error-state.tsx b/src/components/features/home/repository-selection/repository-error-state.tsx
index f6b9e294a1..1d4c8f556a 100644
--- a/src/components/features/home/repository-selection/repository-error-state.tsx
+++ b/src/components/features/home/repository-selection/repository-error-state.tsx
@@ -13,7 +13,7 @@ export function RepositoryErrorState({
<div
data-testid="repo-dropdown-error"
className={cn(
- "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm text-red-500",
+ "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[var(--oh-border-input)] rounded-sm text-red-500",
wrapperClassName,
)}
>
diff --git a/src/components/features/home/repository-selection/repository-loading-state.tsx b/src/components/features/home/repository-selection/repository-loading-state.tsx
index 4e1069d5be..e26de2f196 100644
--- a/src/components/features/home/repository-selection/repository-loading-state.tsx
+++ b/src/components/features/home/repository-selection/repository-loading-state.tsx
@@ -14,7 +14,7 @@ export function RepositoryLoadingState({
<div
data-testid="repo-dropdown-loading"
className={cn(
- "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[#717888] rounded-sm",
+ "flex items-center gap-2 max-w-[500px] h-10 px-3 bg-tertiary border border-[var(--oh-border-input)] rounded-sm",
wrapperClassName,
)}
>
diff --git a/src/components/features/home/shared/dropdown-item.tsx b/src/components/features/home/shared/dropdown-item.tsx
index 97cb18cc15..c39fc94a7b 100644
--- a/src/components/features/home/shared/dropdown-item.tsx
+++ b/src/components/features/home/shared/dropdown-item.tsx
@@ -33,9 +33,8 @@ export function DropdownItem<T>({
: "px-2 py-2 cursor-pointer text-sm rounded-md mx-0 my-0.5",
"text-white focus:outline-none font-normal",
{
- "bg-[#C9B974] text-black": isSelected,
- "hover:bg-[#5C5D62]": !isSelected,
- "hover:bg-[#C9B974] hover:text-black": isSelected,
+ "bg-[var(--oh-interactive-selected)] text-white": isSelected,
+ "hover:bg-[var(--oh-interactive-hover)]": !isSelected,
},
itemClassName,
),
diff --git a/src/components/features/home/shared/empty-state.tsx b/src/components/features/home/shared/empty-state.tsx
index 9e65d23fe3..86fcb57601 100644
--- a/src/components/features/home/shared/empty-state.tsx
+++ b/src/components/features/home/shared/empty-state.tsx
@@ -15,7 +15,7 @@ export function EmptyState({
}: EmptyStateProps) {
return (
<li
- className="px-3 py-2 text-[#B7BDC2] text-sm rounded-lg mx-0.5 my-0.5"
+ className="px-3 py-2 text-[var(--oh-text-secondary)] text-sm rounded-lg mx-0.5 my-0.5"
data-testid={testId}
>
{inputValue ? searchMessage : emptyMessage}
diff --git a/src/components/features/home/shared/generic-dropdown-menu.tsx b/src/components/features/home/shared/generic-dropdown-menu.tsx
index fa1e575b17..62841805cd 100644
--- a/src/components/features/home/shared/generic-dropdown-menu.tsx
+++ b/src/components/features/home/shared/generic-dropdown-menu.tsx
@@ -77,7 +77,7 @@ export function GenericDropdownMenu<T>({
<div className="relative">
<div
className={cn(
- "absolute z-10 w-full bg-[#454545] border border-[#727987] rounded-lg shadow-none",
+ "absolute z-10 w-full bg-tertiary border border-[var(--oh-border-input)] rounded-lg shadow-none",
"focus:outline-none mt-1 z-[9999]",
stickyTopItem || stickyFooterItem ? "max-h-60" : "max-h-60",
)}
@@ -113,7 +113,7 @@ export function GenericDropdownMenu<T>({
)}
{numberOfRecentItems > 0 &&
index === numberOfRecentItems - 1 && (
- <div className="border-b border-[#727987] bg-[#454545] pb-1 mb-1 h-[1px]" />
+ <div className="border-b border-[var(--oh-border-input)] bg-tertiary pb-1 mb-1 h-[1px]" />
)}
</React.Fragment>
);
@@ -122,7 +122,7 @@ export function GenericDropdownMenu<T>({
)}
</ul>
{stickyFooterItem && (
- <div className="border-t border-[#727987] bg-[#454545] p-1 rounded-b-lg">
+ <div className="border-t border-[var(--oh-border-input)] bg-tertiary p-1 rounded-b-lg">
{stickyFooterItem}
</div>
)}
diff --git a/src/components/features/home/shared/loading-spinner.tsx b/src/components/features/home/shared/loading-spinner.tsx
index 4b79c54417..c0050f818e 100644
--- a/src/components/features/home/shared/loading-spinner.tsx
+++ b/src/components/features/home/shared/loading-spinner.tsx
@@ -18,7 +18,7 @@ export function LoadingSpinner({
)}
>
<div
- className="animate-spin h-4 w-4 border-2 border-blue-500 border-t-transparent rounded-full"
+ className="animate-spin h-4 w-4 border-2 border-white/20 border-t-white rounded-full"
data-testid={testId}
/>
</div>
diff --git a/src/components/features/home/tasks/task-card.tsx b/src/components/features/home/tasks/task-card.tsx
index f9b8e0c11d..e6aa8ac590 100644
--- a/src/components/features/home/tasks/task-card.tsx
+++ b/src/components/features/home/tasks/task-card.tsx
@@ -82,7 +82,7 @@ export function TaskCard({ task }: TaskCardProps) {
type="button"
data-testid="task-launch-button"
className={cn(
- "w-full p-[14px] text-left flex items-center justify-between cursor-pointer hover:bg-[#5C5D62] transition-all duration-300 rounded-lg",
+ "w-full p-[14px] text-left flex items-center justify-between cursor-pointer hover:bg-[var(--oh-interactive-hover)] transition-all duration-300 rounded-lg",
isCreatingConversation && "cursor-not-allowed",
)}
disabled={isCreatingConversation}
@@ -96,7 +96,7 @@ export function TaskCard({ task }: TaskCardProps) {
{getTaskTypeMap(t)[task.task_type]}
</span>
<span
- className="text-xs text-[#A3A3A3] leading-4 font-normal max-w-70 truncate"
+ className="text-xs text-[var(--oh-muted)] leading-4 font-normal max-w-70 truncate"
title={task.title}
>
{task.title}
diff --git a/src/components/features/home/tasks/task-group.tsx b/src/components/features/home/tasks/task-group.tsx
index 2db01679c6..ad5b2fd429 100644
--- a/src/components/features/home/tasks/task-group.tsx
+++ b/src/components/features/home/tasks/task-group.tsx
@@ -13,7 +13,7 @@ export function TaskGroup({ title, tasks }: TaskGroupProps) {
return (
<div className="text-content-2 px-[14px]">
- <div className="flex items-center gap-2 border-b-1 border-[#717888] mb-2">
+ <div className="flex items-center gap-2 border-b-1 border-[var(--oh-border-input)] mb-2">
{gitProvider === "github" && <FaGithub size={14} />}
{gitProvider === "gitlab" && <FaGitlab />}
{gitProvider === "bitbucket" && <FaBitbucket />}
diff --git a/src/components/features/home/tasks/task-issue-number.tsx b/src/components/features/home/tasks/task-issue-number.tsx
index c6480339cb..55c7454996 100644
--- a/src/components/features/home/tasks/task-issue-number.tsx
+++ b/src/components/features/home/tasks/task-issue-number.tsx
@@ -11,7 +11,7 @@ export function TaskIssueNumber({ href, issueNumber }: TaskIssueNumberProps) {
rel="noopener noreferrer"
data-testid="task-id"
>
- <span className="text-xs text-[#A3A3A3] leading-4 font-normal">
+ <span className="text-xs text-[var(--oh-muted)] leading-4 font-normal">
#{issueNumber}
</span>
</a>
diff --git a/src/components/features/home/tasks/task-suggestions-skeleton.tsx b/src/components/features/home/tasks/task-suggestions-skeleton.tsx
index 0d34f9c9ff..2044c9a199 100644
--- a/src/components/features/home/tasks/task-suggestions-skeleton.tsx
+++ b/src/components/features/home/tasks/task-suggestions-skeleton.tsx
@@ -22,7 +22,7 @@ interface TaskGroupSkeletonProps {
function TaskGroupSkeleton({ items = 3 }: TaskGroupSkeletonProps) {
return (
<div data-testid="task-group-skeleton">
- <div className="py-3 border-b border-[#717888] pt-3.5">
+ <div className="py-3 border-b border-[var(--oh-border-input)] pt-3.5">
<div className="h-3 w-40 skeleton !rounded-sm" />
</div>
diff --git a/src/components/features/home/tasks/task-suggestions.tsx b/src/components/features/home/tasks/task-suggestions.tsx
index 3e27a4b913..f09c14b42a 100644
--- a/src/components/features/home/tasks/task-suggestions.tsx
+++ b/src/components/features/home/tasks/task-suggestions.tsx
@@ -99,7 +99,7 @@ export function TaskSuggestions({ filterFor }: TaskSuggestionsProps) {
<button
type="button"
onClick={handleToggle}
- className="text-xs leading-4 text-[#FAFAFA] font-normal cursor-pointer hover:underline"
+ className="text-xs leading-4 text-content-2 font-normal cursor-pointer hover:underline"
>
{isExpanded
? t(I18nKey.COMMON$VIEW_LESS)
diff --git a/src/components/features/home/workspace-dropdown/folder-browser-modal.tsx b/src/components/features/home/workspace-dropdown/folder-browser-modal.tsx
index 26ea0aa3fe..10f01351dc 100644
--- a/src/components/features/home/workspace-dropdown/folder-browser-modal.tsx
+++ b/src/components/features/home/workspace-dropdown/folder-browser-modal.tsx
@@ -45,7 +45,7 @@ function SidebarSection({
if (entries.length === 0) return null;
return (
<div className="px-2 pb-3">
- <div className="px-2 pb-1 text-[11px] uppercase tracking-wide text-[#A3A3A3] font-semibold">
+ <div className="px-2 pb-1 text-[11px] uppercase tracking-wide text-[var(--oh-muted)] font-semibold">
{label}
</div>
<ul>
@@ -60,8 +60,8 @@ function SidebarSection({
className={cn(
"flex items-center gap-2 w-full px-2 py-1 rounded text-sm cursor-pointer",
isActive
- ? "bg-[#3A3D44] text-white"
- : "text-[#D6D6D6] hover:bg-[#2F3137]",
+ ? "bg-tertiary text-white"
+ : "text-[var(--oh-text-tertiary)] hover:bg-[var(--oh-surface-raised)]",
)}
>
<FolderIcon width={14} height={14} className="shrink-0" />
@@ -207,12 +207,12 @@ export function FolderBrowserModal({
<div
data-testid="folder-browser-modal"
className={cn(
- "flex flex-col bg-[#26282D] border border-[#727987] rounded-xl",
+ "flex flex-col bg-[var(--oh-surface)] border border-[var(--oh-border-input)] rounded-xl",
"w-[720px] max-w-[90vw] h-[480px]",
)}
>
{/* Title bar */}
- <div className="flex items-center justify-between px-5 py-3 border-b border-[#727987]">
+ <div className="flex items-center justify-between px-5 py-3 border-b border-[var(--oh-border-input)]">
<span className="text-sm font-semibold text-white">
{t(I18nKey.HOME$ADD_WORKSPACES_TITLE)}
</span>
@@ -223,7 +223,7 @@ export function FolderBrowserModal({
{/* Sidebar */}
<aside
data-testid="folder-browser-sidebar"
- className="w-[180px] shrink-0 border-r border-[#727987] bg-[#1F2125] py-3 overflow-y-auto"
+ className="w-[180px] shrink-0 border-r border-[var(--oh-border-input)] bg-[var(--oh-surface)] py-3 overflow-y-auto"
>
<SidebarSection
label={t(I18nKey.HOME$FAVORITES)}
@@ -242,19 +242,19 @@ export function FolderBrowserModal({
{/* Main */}
<div className="flex-1 flex flex-col min-w-0">
{/* Nav row */}
- <div className="flex items-center gap-2 px-4 py-2 border-b border-[#727987]">
+ <div className="flex items-center gap-2 px-4 py-2 border-b border-[var(--oh-border-input)]">
<button
type="button"
data-testid="folder-browser-up"
onClick={() => parent && setCurrentPath(parent)}
disabled={!parent}
aria-label="Up"
- className="p-1 rounded hover:bg-[#5C5D62] text-white disabled:opacity-40 disabled:cursor-not-allowed cursor-pointer"
+ className="p-1 rounded hover:bg-[var(--oh-interactive-hover)] text-white disabled:opacity-40 disabled:cursor-not-allowed cursor-pointer"
>
<ChevronLeft width={16} height={16} />
</button>
<span
- className="text-xs text-[#A3A3A3] truncate"
+ className="text-xs text-[var(--oh-muted)] truncate"
data-testid="folder-browser-current-path"
>
{currentPath ?? ""}
@@ -262,7 +262,7 @@ export function FolderBrowserModal({
</div>
{/* Column headers */}
- <div className="grid grid-cols-[1fr_120px] px-4 py-1 border-b border-[#727987] text-xs text-[#B7BDC2] font-semibold">
+ <div className="grid grid-cols-[1fr_120px] px-4 py-1 border-b border-[var(--oh-border-input)] text-xs text-[var(--oh-text-secondary)] font-semibold">
<span>{t(I18nKey.HOME$NAME)}</span>
<span>{t(I18nKey.HOME$KIND)}</span>
</div>
@@ -273,7 +273,7 @@ export function FolderBrowserModal({
data-testid="folder-browser-list"
>
{isLoading && (
- <li className="px-4 py-2 text-sm text-[#B7BDC2]">
+ <li className="px-4 py-2 text-sm text-[var(--oh-text-secondary)]">
{t(I18nKey.HOME$LOADING)}
</li>
)}
@@ -287,7 +287,7 @@ export function FolderBrowserModal({
)}
{!isLoading && !isError && subdirs.length === 0 && (
<li
- className="px-4 py-2 text-sm text-[#B7BDC2]"
+ className="px-4 py-2 text-sm text-[var(--oh-text-secondary)]"
data-testid={
showHostHomeHint
? "folder-browser-host-home-hint"
@@ -304,14 +304,14 @@ export function FolderBrowserModal({
<button
type="button"
onClick={() => setCurrentPath(entry.path)}
- className="grid grid-cols-[1fr_120px] items-center w-full text-left px-4 py-1.5 text-sm text-white hover:bg-[#5C5D62] cursor-pointer"
+ className="grid grid-cols-[1fr_120px] items-center w-full text-left px-4 py-1.5 text-sm text-white hover:bg-[var(--oh-interactive-hover)] cursor-pointer"
data-testid={`folder-browser-entry-${entry.name}`}
>
<span className="flex items-center gap-2 min-w-0">
<FolderIcon width={16} height={16} className="shrink-0" />
<span className="truncate">{entry.name}</span>
</span>
- <span className="text-[#B7BDC2] text-xs">
+ <span className="text-[var(--oh-text-secondary)] text-xs">
{t(I18nKey.HOME$FOLDER)}
</span>
</button>
@@ -322,7 +322,7 @@ export function FolderBrowserModal({
</div>
{/* Footer */}
- <div className="flex items-center justify-end gap-2 px-5 py-3 border-t border-[#727987]">
+ <div className="flex items-center justify-end gap-2 px-5 py-3 border-t border-[var(--oh-border-input)]">
<BrandButton
type="button"
variant="secondary"
diff --git a/src/components/features/home/workspace-dropdown/manage-workspaces-modal.tsx b/src/components/features/home/workspace-dropdown/manage-workspaces-modal.tsx
index df78d3d112..fedf724622 100644
--- a/src/components/features/home/workspace-dropdown/manage-workspaces-modal.tsx
+++ b/src/components/features/home/workspace-dropdown/manage-workspaces-modal.tsx
@@ -70,11 +70,11 @@ export function ManageWorkspacesModal({
<div
data-testid="manage-workspaces-modal"
className={cn(
- "flex flex-col bg-[#26282D] border border-[#727987] rounded-xl",
+ "flex flex-col bg-[var(--oh-surface)] border border-[var(--oh-border-input)] rounded-xl",
"w-[560px] max-w-[90vw] max-h-[70vh]",
)}
>
- <div className="flex items-center justify-between px-5 py-3 border-b border-[#727987]">
+ <div className="flex items-center justify-between px-5 py-3 border-b border-[var(--oh-border-input)]">
<span className="text-sm font-semibold text-white">
{t(I18nKey.HOME$MANAGE_WORKSPACES)}
</span>
@@ -85,7 +85,7 @@ export function ManageWorkspacesModal({
data-testid="manage-workspaces-list"
>
{!hasContent && (
- <p className="px-5 py-6 text-sm text-[#B7BDC2] text-center">
+ <p className="px-5 py-6 text-sm text-[var(--oh-text-secondary)] text-center">
{t(I18nKey.HOME$MANAGE_WORKSPACES_EMPTY)}
</p>
)}
@@ -95,7 +95,7 @@ export function ManageWorkspacesModal({
{staticWorkspaces.map((workspace) => (
<li
key={workspace.id}
- className="flex items-center gap-3 px-5 py-2 border-b border-[#363840] last:border-b-0"
+ className="flex items-center gap-3 px-5 py-2 border-b border-[var(--oh-border-subtle)] last:border-b-0"
data-testid={`manage-workspaces-row-${workspace.name}`}
>
<FolderIcon width={16} height={16} className="shrink-0" />
@@ -103,7 +103,7 @@ export function ManageWorkspacesModal({
<span className="text-sm text-white truncate">
{workspace.name}
</span>
- <span className="text-xs text-[#A3A3A3] truncate">
+ <span className="text-xs text-[var(--oh-muted)] truncate">
{workspace.path}
</span>
</div>
@@ -120,7 +120,7 @@ export function ManageWorkspacesModal({
}
aria-label={t(I18nKey.HOME$REMOVE_WORKSPACE)}
data-testid={`manage-workspaces-remove-${workspace.name}`}
- className="flex items-center gap-1 px-2 py-1 rounded text-xs text-[#D6D6D6] hover:bg-[#5C5D62] hover:text-white cursor-pointer"
+ className="flex items-center gap-1 px-2 py-1 rounded text-xs text-[var(--oh-text-tertiary)] hover:bg-[var(--oh-interactive-hover)] hover:text-white cursor-pointer"
>
<CloseIcon width={12} height={12} />
<span>{t(I18nKey.HOME$REMOVE_WORKSPACE)}</span>
@@ -132,7 +132,7 @@ export function ManageWorkspacesModal({
{workspaceParents.length > 0 && (
<div data-testid="manage-workspaces-parents-section">
- <div className="px-5 pt-3 pb-1 text-[11px] uppercase tracking-wide text-[#A3A3A3] font-semibold">
+ <div className="px-5 pt-3 pb-1 text-[11px] uppercase tracking-wide text-[var(--oh-muted)] font-semibold">
{t(I18nKey.HOME$WORKSPACE_PARENTS)}
</div>
<ul>
@@ -142,7 +142,7 @@ export function ManageWorkspacesModal({
return (
<li
key={parent.id}
- className="border-b border-[#363840] last:border-b-0"
+ className="border-b border-[var(--oh-border-subtle)] last:border-b-0"
data-testid={`manage-workspaces-parent-row-${parent.name}`}
>
<div className="flex items-center gap-3 px-5 py-2">
@@ -155,7 +155,7 @@ export function ManageWorkspacesModal({
<span className="text-sm text-white truncate">
{parent.name}
</span>
- <span className="text-xs text-[#A3A3A3] truncate">
+ <span className="text-xs text-[var(--oh-muted)] truncate">
{parent.path}
</span>
</div>
@@ -179,7 +179,7 @@ export function ManageWorkspacesModal({
I18nKey.HOME$REMOVE_WORKSPACE_PARENT,
)}
data-testid={`manage-workspaces-remove-parent-${parent.name}`}
- className="flex items-center gap-1 px-2 py-1 rounded text-xs text-[#D6D6D6] hover:bg-[#5C5D62] hover:text-white cursor-pointer"
+ className="flex items-center gap-1 px-2 py-1 rounded text-xs text-[var(--oh-text-tertiary)] hover:bg-[var(--oh-interactive-hover)] hover:text-white cursor-pointer"
>
<CloseIcon width={12} height={12} />
<span>
@@ -193,7 +193,7 @@ export function ManageWorkspacesModal({
{children.map((child) => (
<li
key={child.id}
- className="flex items-center gap-3 px-5 pl-10 py-1 text-xs text-[#B7BDC2]"
+ className="flex items-center gap-3 px-5 pl-10 py-1 text-xs text-[var(--oh-text-secondary)]"
data-testid={`manage-workspaces-child-${child.name}`}
>
<FolderIcon
@@ -214,7 +214,7 @@ export function ManageWorkspacesModal({
)}
</div>
- <div className="flex justify-end gap-2 px-5 py-3 border-t border-[#727987]">
+ <div className="flex justify-end gap-2 px-5 py-3 border-t border-[var(--oh-border-input)]">
<BrandButton
type="button"
variant="primary"
diff --git a/src/components/features/home/workspace-dropdown/workspace-dropdown.tsx b/src/components/features/home/workspace-dropdown/workspace-dropdown.tsx
index cc72531e98..3868803b7b 100644
--- a/src/components/features/home/workspace-dropdown/workspace-dropdown.tsx
+++ b/src/components/features/home/workspace-dropdown/workspace-dropdown.tsx
@@ -128,7 +128,7 @@ export function WorkspaceDropdown({
<button
type="button"
data-testid="add-workspaces-button"
- className="flex items-center w-full px-2 py-2 text-sm text-white hover:bg-[#5C5D62] rounded-md transition-colors duration-150 font-normal"
+ className="flex items-center w-full px-2 py-2 text-sm text-white hover:bg-[var(--oh-interactive-hover)] rounded-md transition-colors duration-150 font-normal"
onMouseDown={(e) => {
e.preventDefault();
e.stopPropagation();
@@ -146,7 +146,7 @@ export function WorkspaceDropdown({
<button
type="button"
data-testid="manage-workspaces-button"
- className="flex items-center w-full px-2 py-2 text-sm text-white hover:bg-[#5C5D62] rounded-md transition-colors duration-150 font-normal"
+ className="flex items-center w-full px-2 py-2 text-sm text-white hover:bg-[var(--oh-interactive-hover)] rounded-md transition-colors duration-150 font-normal"
onMouseDown={(e) => {
e.preventDefault();
e.stopPropagation();
@@ -177,10 +177,10 @@ export function WorkspaceDropdown({
disabled,
placeholder: placeholder ?? t(I18nKey.HOME$WORKSPACE_PLACEHOLDER),
className: cn(
- "w-full px-3 py-2 border border-[#727987] rounded-sm shadow-none h-[42px] min-h-[42px] max-h-[42px]",
- "bg-[#454545] text-[#A3A3A3] placeholder:text-[#A3A3A3]",
- "focus:outline-none focus:ring-0 focus:border-[#727987]",
- "disabled:bg-[#363636] disabled:cursor-not-allowed disabled:opacity-60",
+ "w-full px-3 py-2 border border-[var(--oh-border-input)] rounded-sm shadow-none h-[42px] min-h-[42px] max-h-[42px]",
+ "bg-tertiary text-[var(--oh-muted)] placeholder:text-[var(--oh-muted)]",
+ "focus:outline-none focus:ring-0 focus:border-[var(--oh-border-input)]",
+ "disabled:bg-tertiary disabled:cursor-not-allowed disabled:opacity-60",
"pl-7 pr-16 text-sm font-normal leading-5",
),
onChange: (e: React.ChangeEvent<HTMLInputElement>) => {
diff --git a/src/components/features/home/workspace-selection-form.tsx b/src/components/features/home/workspace-selection-form.tsx
index 7533b2c5d5..068a330ecd 100644
--- a/src/components/features/home/workspace-selection-form.tsx
+++ b/src/components/features/home/workspace-selection-form.tsx
@@ -95,7 +95,7 @@ export function WorkspaceSelectionForm({
{showWorkspaceStatus && workspaceStatusText && (
<p
- className="px-1 text-xs text-[#B7BDC2]"
+ className="px-1 text-xs text-[var(--oh-text-secondary)]"
data-testid="workspace-status-message"
>
{workspaceStatusText}
diff --git a/src/components/features/launch/plugin-launch-modal.tsx b/src/components/features/launch/plugin-launch-modal.tsx
index fdd23bc60e..48a2e174c9 100644
--- a/src/components/features/launch/plugin-launch-modal.tsx
+++ b/src/components/features/launch/plugin-launch-modal.tsx
@@ -126,7 +126,7 @@ export function PluginLaunchModal({
<ModalBackdrop onClose={onClose}>
<div
data-testid="plugin-launch-modal"
- className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-tertiary w-[500px] max-w-[90vw] max-h-[80vh]"
+ className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-[var(--oh-border)] w-[500px] max-w-[90vw] max-h-[80vh]"
>
<div className="flex w-full items-center justify-between">
<Typography.H2>
@@ -194,7 +194,7 @@ export function PluginLaunchModal({
)}
</div>
- <div className="pt-4 border-t border-tertiary">
+ <div className="pt-4 border-t border-[var(--oh-border-subtle)]">
<div className="flex items-start gap-3 mb-4">
<input
id="trust-checkbox"
diff --git a/src/components/features/launch/plugin-launch-plugin-section.tsx b/src/components/features/launch/plugin-launch-plugin-section.tsx
index fb5ee368be..c0e8dd4593 100644
--- a/src/components/features/launch/plugin-launch-plugin-section.tsx
+++ b/src/components/features/launch/plugin-launch-plugin-section.tsx
@@ -35,7 +35,7 @@ export function PluginLaunchPluginSection({
}
return (
- <div className="rounded-lg border border-tertiary bg-tertiary">
+ <div className="rounded-lg border border-[var(--oh-border)] bg-tertiary">
<button
type="button"
onClick={onToggle}
@@ -53,7 +53,7 @@ export function PluginLaunchPluginSection({
</button>
{isExpanded && (
- <div className="border-t border-tertiary px-4 pb-3">
+ <div className="border-t border-[var(--oh-border-subtle)] px-4 pb-3">
{plugin.ref && (
<div className="mb-2 text-sm text-white">
{t(I18nKey.LAUNCH$PLUGIN_REF)} {plugin.ref}
diff --git a/src/components/features/markdown/code.tsx b/src/components/features/markdown/code.tsx
index 34bce0add6..903aa56734 100644
--- a/src/components/features/markdown/code.tsx
+++ b/src/components/features/markdown/code.tsx
@@ -26,11 +26,11 @@ export function code({
<code
className={className}
style={{
- backgroundColor: "#2a3038",
+ backgroundColor: "var(--oh-surface-raised)",
padding: "0.2em 0.4em",
borderRadius: "4px",
- color: "#e6edf3",
- border: "1px solid #30363d",
+ color: "var(--oh-foreground)",
+ border: "1px solid var(--oh-surface-raised)",
}}
>
{children}
@@ -42,11 +42,11 @@ export function code({
<CopyableContentWrapper text={codeString}>
<pre
style={{
- backgroundColor: "#2a3038",
+ backgroundColor: "var(--oh-surface-raised)",
padding: "1em",
borderRadius: "4px",
- color: "#e6edf3",
- border: "1px solid #30363d",
+ color: "var(--oh-foreground)",
+ border: "1px solid var(--oh-surface-raised)",
overflow: "auto",
}}
>
diff --git a/src/components/features/markdown/headings.tsx b/src/components/features/markdown/headings.tsx
index f3c73bed28..308f2a09a8 100644
--- a/src/components/features/markdown/headings.tsx
+++ b/src/components/features/markdown/headings.tsx
@@ -60,7 +60,7 @@ export function h5({
React.HTMLAttributes<HTMLHeadingElement> &
ExtraProps) {
return (
- <h5 className="text-sm font-normal text-[#D5D9E5] mb-1.5 mt-2.5 first:mt-0">
+ <h5 className="text-sm font-normal text-[var(--oh-text-tertiary)] mb-1.5 mt-2.5 first:mt-0">
{children}
</h5>
);
@@ -73,7 +73,7 @@ export function h6({
React.HTMLAttributes<HTMLHeadingElement> &
ExtraProps) {
return (
- <h6 className="text-sm font-normal text-gray-300 mb-1.5 mt-2.5 first:mt-0">
+ <h6 className="text-sm font-normal text-[var(--oh-text-tertiary)] mb-1.5 mt-2.5 first:mt-0">
{children}
</h6>
);
diff --git a/src/components/features/markdown/horizontal-rule.tsx b/src/components/features/markdown/horizontal-rule.tsx
index 457cdf9098..d4bd00ce57 100644
--- a/src/components/features/markdown/horizontal-rule.tsx
+++ b/src/components/features/markdown/horizontal-rule.tsx
@@ -7,5 +7,10 @@ export function hr({
}: React.ClassAttributes<HTMLHRElement> &
React.HTMLAttributes<HTMLHRElement> &
ExtraProps) {
- return <hr {...props} className="my-4 border-0 border-t border-[#4B505F]" />;
+ return (
+ <hr
+ {...props}
+ className="my-4 border-0 border-t border-[var(--oh-border)]"
+ />
+ );
}
diff --git a/src/components/features/markdown/plan-components.tsx b/src/components/features/markdown/plan-components.tsx
index 7522d9c378..9cabf722da 100644
--- a/src/components/features/markdown/plan-components.tsx
+++ b/src/components/features/markdown/plan-components.tsx
@@ -78,7 +78,7 @@ export function createPlanComponents(extraClassName?: string) {
h6: ({ children, className }: ElementProps) => (
<h6
className={cn(
- "text-xs font-medium text-gray-300 mb-0.5 mt-1.5 first:mt-0",
+ "text-xs font-medium text-[var(--oh-text-tertiary)] mb-0.5 mt-1.5 first:mt-0",
className,
extraClassName,
)}
@@ -136,7 +136,7 @@ export function createPlanComponents(extraClassName?: string) {
code: ({ children, className }: ElementProps) => (
<code
className={cn(
- "bg-[#2a3038] px-1.5 py-0.5 rounded text-[#e6edf3] border border-[#30363d]",
+ "bg-[var(--oh-surface-raised)] px-1.5 py-0.5 rounded text-[var(--oh-foreground)] border border-[var(--oh-border-subtle)]",
className,
extraClassName,
)}
diff --git a/src/components/features/markdown/table.tsx b/src/components/features/markdown/table.tsx
index 0cb7c51bbd..615d1c189e 100644
--- a/src/components/features/markdown/table.tsx
+++ b/src/components/features/markdown/table.tsx
@@ -9,7 +9,7 @@ export function table({
ExtraProps) {
return (
<div className="my-4 w-full overflow-x-auto">
- <table className="w-full border-collapse border border-neutral-600 text-sm">
+ <table className="w-full border-collapse border border-[var(--oh-border)] text-sm">
{children}
</table>
</div>
@@ -23,7 +23,7 @@ export function th({
React.ThHTMLAttributes<HTMLTableCellElement> &
ExtraProps) {
return (
- <th className="border border-neutral-600 bg-neutral-800 px-3 py-2 text-left font-semibold text-white">
+ <th className="border border-[var(--oh-border)] bg-[var(--oh-surface)] px-3 py-2 text-left font-semibold text-white">
{children}
</th>
);
@@ -36,7 +36,7 @@ export function td({
React.TdHTMLAttributes<HTMLTableCellElement> &
ExtraProps) {
return (
- <td className="border border-neutral-600 px-3 py-2 align-top">
+ <td className="border border-[var(--oh-border)] px-3 py-2 align-top">
{children}
</td>
);
diff --git a/src/components/features/mcp-page/custom-server-editor.tsx b/src/components/features/mcp-page/custom-server-editor.tsx
index ab167ea068..ac64b5b02e 100644
--- a/src/components/features/mcp-page/custom-server-editor.tsx
+++ b/src/components/features/mcp-page/custom-server-editor.tsx
@@ -69,7 +69,7 @@ export function CustomServerEditor({
>
<div
data-testid="mcp-custom-editor"
- className="bg-base-secondary p-6 rounded-xl border border-tertiary w-[680px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar"
+ className="bg-base-secondary p-6 rounded-xl border border-[var(--oh-border)] w-[680px] max-w-[90vw] max-h-[90vh] overflow-y-auto custom-scrollbar"
>
<h2 className="text-lg font-semibold mb-4">
{isEditing
diff --git a/src/components/features/mcp-page/install-server-modal.tsx b/src/components/features/mcp-page/install-server-modal.tsx
index 75ae5549be..ec1f2e31dc 100644
--- a/src/components/features/mcp-page/install-server-modal.tsx
+++ b/src/components/features/mcp-page/install-server-modal.tsx
@@ -264,7 +264,7 @@ export function InstallServerModal({
data-testid="mcp-install-modal"
data-marketplace-id={entry.id}
onSubmit={handleSubmit}
- className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-tertiary w-[520px] max-w-[90vw] max-h-[85vh] overflow-y-auto custom-scrollbar"
+ className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-[var(--oh-border)] w-[520px] max-w-[90vw] max-h-[85vh] overflow-y-auto custom-scrollbar"
>
<div className="flex items-start gap-3">
<span
@@ -292,7 +292,7 @@ export function InstallServerModal({
href={entry.docsUrl}
target="_blank"
rel="noreferrer"
- className="text-xs text-primary hover:underline self-start"
+ className="text-xs text-[var(--oh-muted)] hover:text-white hover:underline self-start transition-colors"
>
{t(I18nKey.MCP$VIEW_DOCS)}
</a>
diff --git a/src/components/features/mcp-page/installed-server-card.tsx b/src/components/features/mcp-page/installed-server-card.tsx
index 216e0592f9..390ab97093 100644
--- a/src/components/features/mcp-page/installed-server-card.tsx
+++ b/src/components/features/mcp-page/installed-server-card.tsx
@@ -62,14 +62,14 @@ export function InstalledServerCard({
data-server-id={server.id}
className={cn(
"flex items-start gap-3 rounded-xl",
- "border border-tertiary bg-base-secondary p-4",
+ "border border-[var(--oh-border)] bg-base-secondary p-4",
)}
>
<span
aria-hidden="true"
className="shrink-0 inline-flex items-center justify-center h-10 w-10 rounded-lg"
style={{
- backgroundColor: catalog?.iconBg ?? "#3F4452",
+ backgroundColor: catalog?.iconBg ?? "var(--oh-color-tertiary)",
color: catalog?.iconColor ?? "#FFFFFF",
}}
>
diff --git a/src/components/features/mcp-page/installed-servers-section.tsx b/src/components/features/mcp-page/installed-servers-section.tsx
index d5ad2b36bd..04e7dba28b 100644
--- a/src/components/features/mcp-page/installed-servers-section.tsx
+++ b/src/components/features/mcp-page/installed-servers-section.tsx
@@ -37,7 +37,7 @@ export function InstalledServersSection({
return (
<div
data-testid="mcp-installed-empty-search"
- className="rounded-xl border border-dashed border-tertiary p-6 text-center"
+ className="rounded-xl border border-dashed border-[var(--oh-border)] p-6 text-center"
>
<p className="text-xs text-tertiary-alt">
{t(I18nKey.MCP$SEARCH_EMPTY)}
@@ -48,7 +48,7 @@ export function InstalledServersSection({
return (
<div
data-testid="mcp-installed-empty"
- className="rounded-xl border border-dashed border-tertiary p-8 text-center"
+ className="rounded-xl border border-dashed border-[var(--oh-border)] p-8 text-center"
>
<p className="text-sm text-content-2">
{t(I18nKey.MCP$INSTALLED_EMPTY_TITLE)}
diff --git a/src/components/features/mcp-page/marketplace-card.tsx b/src/components/features/mcp-page/marketplace-card.tsx
index 01b873b040..468e4d59b1 100644
--- a/src/components/features/mcp-page/marketplace-card.tsx
+++ b/src/components/features/mcp-page/marketplace-card.tsx
@@ -36,10 +36,10 @@ export function MarketplaceCard({
data-testid={`mcp-marketplace-card-${entry.id}`}
className={cn(
"group flex flex-col text-left",
- "rounded-xl border border-tertiary bg-base-secondary",
+ "rounded-xl border border-[var(--oh-border)] bg-base-secondary",
"p-4 gap-3 cursor-pointer",
- "hover:border-white/40 hover:bg-base-tertiary/30 transition-colors",
- "focus:outline-none focus:ring-2 focus:ring-primary/60",
+ "hover:border-[var(--cool-grey-500)] hover:bg-base-tertiary/30 transition-colors",
+ "focus:outline-none focus:ring-2 focus:ring-[var(--oh-border)]",
)}
>
<div className="flex items-start gap-3">
diff --git a/src/components/features/mcp-page/marketplace-search.tsx b/src/components/features/mcp-page/marketplace-search.tsx
index 1afb42233a..4b2310c4c7 100644
--- a/src/components/features/mcp-page/marketplace-search.tsx
+++ b/src/components/features/mcp-page/marketplace-search.tsx
@@ -20,7 +20,7 @@ export function MarketplaceSearch({ value, onChange }: MarketplaceSearchProps) {
data-testid="mcp-search"
className={cn(
"relative flex items-center w-1/2",
- "rounded-lg border border-tertiary bg-base-secondary",
+ "rounded-lg border border-[var(--oh-border)] bg-base-secondary",
"focus-within:border-white/40 focus-within:ring-1 focus-within:ring-white/20",
"transition-colors",
)}
diff --git a/src/components/features/mcp-page/marketplace-section.tsx b/src/components/features/mcp-page/marketplace-section.tsx
index 31e32fda8c..3eaedf9982 100644
--- a/src/components/features/mcp-page/marketplace-section.tsx
+++ b/src/components/features/mcp-page/marketplace-section.tsx
@@ -41,7 +41,7 @@ export function MarketplaceSection({
{visibleEntries.length === 0 ? (
<div
data-testid="mcp-marketplace-empty"
- className="rounded-xl border border-dashed border-tertiary p-6 text-center"
+ className="rounded-xl border border-dashed border-[var(--oh-border)] p-6 text-center"
>
<p className="text-xs text-tertiary-alt">
{t(I18nKey.MCP$SEARCH_EMPTY)}
diff --git a/src/components/features/onboarding/onboarding-modal.tsx b/src/components/features/onboarding/onboarding-modal.tsx
index ccff56b3bf..31f54c8fc5 100644
--- a/src/components/features/onboarding/onboarding-modal.tsx
+++ b/src/components/features/onboarding/onboarding-modal.tsx
@@ -107,7 +107,7 @@ export function OnboardingModal({ onClose }: OnboardingModalProps) {
>
<header className="flex flex-col gap-3 px-7 pt-7 shrink-0">
<div className="flex items-center justify-between gap-3">
- <p className="text-sm text-gray-400">
+ <p className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.ONBOARDING$STEP_LABEL, {
current: currentStep + 1,
total: TOTAL_STEPS,
@@ -117,7 +117,7 @@ export function OnboardingModal({ onClose }: OnboardingModalProps) {
type="button"
data-testid="onboarding-skip"
onClick={onClose}
- className="flex items-center gap-1 rounded-md px-2 py-1 text-xs text-gray-400 cursor-pointer hover:bg-white/5 hover:text-white"
+ className="flex items-center gap-1 rounded-md px-2 py-1 text-xs text-[var(--oh-muted)] hover:bg-white/5 hover:text-white cursor-pointer"
>
<span>{t(I18nKey.ONBOARDING$SKIP)}</span>
<X className="size-3.5" aria-hidden />
diff --git a/src/components/features/onboarding/steps/check-backend-step.tsx b/src/components/features/onboarding/steps/check-backend-step.tsx
index 0ba6b66b57..265ea10cc6 100644
--- a/src/components/features/onboarding/steps/check-backend-step.tsx
+++ b/src/components/features/onboarding/steps/check-backend-step.tsx
@@ -64,8 +64,8 @@ function ConnectionBanner({ isConnected }: { isConnected: boolean | null }) {
data-testid="onboarding-backend-checking"
className="flex items-start gap-3 rounded-xl border border-white/10 bg-white/5 px-4 py-3"
>
- <Loader2 className="mt-0.5 size-5 shrink-0 animate-spin text-gray-300" />
- <span className="text-sm text-gray-200">
+ <Loader2 className="mt-0.5 size-5 shrink-0 animate-spin text-[var(--oh-text-tertiary)]" />
+ <span className="text-sm text-[var(--oh-text-tertiary)]">
{t(I18nKey.ONBOARDING$BACKEND_CHECKING)}
</span>
</div>
@@ -93,7 +93,7 @@ export function CheckBackendStep({ onBack, onNext }: CheckBackendStepProps) {
<h2 className="text-2xl font-semibold text-white">
{t(I18nKey.ONBOARDING$BACKEND_TITLE)}
</h2>
- <p className="text-sm text-gray-400">
+ <p className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.ONBOARDING$BACKEND_SUBTITLE)}
</p>
</header>
diff --git a/src/components/features/onboarding/steps/choose-agent-step.tsx b/src/components/features/onboarding/steps/choose-agent-step.tsx
index e783aa2912..ef89374f2d 100644
--- a/src/components/features/onboarding/steps/choose-agent-step.tsx
+++ b/src/components/features/onboarding/steps/choose-agent-step.tsx
@@ -57,7 +57,7 @@ export function ChooseAgentStep({
<h2 className="text-2xl font-semibold text-white">
{t(I18nKey.ONBOARDING$AGENT_TITLE)}
</h2>
- <p className="text-sm text-gray-400">
+ <p className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.ONBOARDING$AGENT_SUBTITLE)}
</p>
</header>
@@ -107,7 +107,7 @@ export function ChooseAgentStep({
<span className="text-base font-medium text-white">
{option.label}
</span>
- <span className="text-xs text-gray-400">
+ <span className="text-xs text-[var(--oh-muted)]">
{t(option.descriptionKey)}
</span>
</div>
diff --git a/src/components/features/onboarding/steps/say-hello-step.tsx b/src/components/features/onboarding/steps/say-hello-step.tsx
index 18a04932b4..5ccf809ca0 100644
--- a/src/components/features/onboarding/steps/say-hello-step.tsx
+++ b/src/components/features/onboarding/steps/say-hello-step.tsx
@@ -62,7 +62,7 @@ export function SayHelloStep({ onBack, onLaunched }: SayHelloStepProps) {
<h2 className="text-2xl font-semibold text-white">
{t(I18nKey.ONBOARDING$HELLO_TITLE)}
</h2>
- <p className="text-sm text-gray-400">
+ <p className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.ONBOARDING$HELLO_SUBTITLE)}
</p>
</header>
@@ -75,7 +75,7 @@ export function SayHelloStep({ onBack, onLaunched }: SayHelloStepProps) {
onChange={(event) => setMessage(event.target.value)}
placeholder={defaultMessage}
disabled={isLaunching}
- className="w-full rounded-xl border border-white/10 bg-base-secondary px-4 py-3 text-base text-white placeholder:text-gray-500 focus:border-primary focus:outline-none disabled:opacity-60"
+ className="w-full rounded-xl border border-white/10 bg-base-secondary px-4 py-3 text-base text-white placeholder:text-[var(--oh-text-subtle)] focus:border-primary focus:outline-none disabled:opacity-60"
/>
<div className="sticky bottom-0 flex items-center justify-between gap-2 bg-base-secondary pt-4 pb-7">
diff --git a/src/components/features/onboarding/steps/setup-llm-step.tsx b/src/components/features/onboarding/steps/setup-llm-step.tsx
index 9381eb318f..fdf9c2213b 100644
--- a/src/components/features/onboarding/steps/setup-llm-step.tsx
+++ b/src/components/features/onboarding/steps/setup-llm-step.tsx
@@ -110,7 +110,7 @@ export function SetupLlmStep({ onBack, onNext }: SetupLlmStepProps) {
<h2 className="text-2xl font-semibold text-white">
{t(I18nKey.ONBOARDING$LLM_TITLE)}
</h2>
- <p className="text-sm text-gray-400">
+ <p className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.ONBOARDING$LLM_SUBTITLE)}
</p>
</header>
diff --git a/src/components/features/settings/agent-server-onboarding.tsx b/src/components/features/settings/agent-server-onboarding.tsx
index 2970c44d0c..7d2494ab7a 100644
--- a/src/components/features/settings/agent-server-onboarding.tsx
+++ b/src/components/features/settings/agent-server-onboarding.tsx
@@ -107,7 +107,7 @@ export function AgentServerConnectionForm({
className={cn(
"flex flex-col gap-5",
isOnboarding &&
- "rounded-3xl border border-white/10 bg-neutral-950/80 p-6 shadow-2xl",
+ "rounded-3xl border border-white/10 bg-[var(--oh-surface-deep)]/80 p-6 shadow-2xl",
formClassName,
)}
>
@@ -116,7 +116,7 @@ export function AgentServerConnectionForm({
<p className="text-sm font-medium uppercase tracking-[0.24em] text-primary">
{t("SETTINGS$AGENT_SERVER_CONNECTION_DETAILS_TITLE")}
</p>
- <p className="mt-3 max-w-[680px] text-sm leading-7 text-gray-400">
+ <p className="mt-3 max-w-[680px] text-sm leading-7 text-[var(--oh-muted)]">
{t("SETTINGS$AGENT_SERVER_CONNECTION_DETAILS_DESCRIPTION")}
</p>
</div>
@@ -145,7 +145,7 @@ export function AgentServerConnectionForm({
className="w-full max-w-[680px]"
/>
- <p className="max-w-[680px] text-xs leading-6 text-gray-500">
+ <p className="max-w-[680px] text-xs leading-6 text-[var(--oh-text-subtle)]">
{t("SETTINGS$AGENT_SERVER_BROWSER_ONLY_NOTE")}
</p>
</div>
diff --git a/src/components/features/settings/api-key-modal-base.tsx b/src/components/features/settings/api-key-modal-base.tsx
index cc4fb14f8e..0e8d48af38 100644
--- a/src/components/features/settings/api-key-modal-base.tsx
+++ b/src/components/features/settings/api-key-modal-base.tsx
@@ -79,7 +79,7 @@ export function ApiKeyModalBase({
role="dialog"
aria-modal="true"
aria-labelledby="modal-title"
- className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-tertiary"
+ className="bg-base-secondary p-6 rounded-xl flex flex-col gap-4 border border-[var(--oh-border)]"
style={{ width }}
>
<h3 id="modal-title" className="text-xl font-bold">
diff --git a/src/components/features/settings/app-settings/theme-input.tsx b/src/components/features/settings/app-settings/theme-input.tsx
new file mode 100644
index 0000000000..d1d5ea5833
--- /dev/null
+++ b/src/components/features/settings/app-settings/theme-input.tsx
@@ -0,0 +1,38 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import { SettingsDropdownInput } from "../settings-dropdown-input";
+import {
+ AVAILABLE_COLOR_THEMES,
+ type ColorThemeKey,
+ applyColorTheme,
+ persistColorTheme,
+ readPersistedColorTheme,
+} from "#/themes/color-themes";
+
+export function ThemeInput() {
+ const { t } = useTranslation("openhands");
+
+ const handleSelectionChange = React.useCallback((key: React.Key | null) => {
+ if (!key) return;
+ const next = key as ColorThemeKey;
+ applyColorTheme(next);
+ persistColorTheme(next);
+ }, []);
+
+ return (
+ <SettingsDropdownInput
+ testId="color-theme-input"
+ name="color-theme-input"
+ label={t(I18nKey.SETTINGS$COLOR_THEME)}
+ items={AVAILABLE_COLOR_THEMES.map((theme) => ({
+ key: theme.key,
+ label: theme.label,
+ }))}
+ defaultSelectedKey={readPersistedColorTheme()}
+ onSelectionChange={handleSelectionChange}
+ isClearable={false}
+ wrapperClassName="w-full max-w-[680px]"
+ />
+ );
+}
diff --git a/src/components/features/settings/backend-synced-settings-badge.tsx b/src/components/features/settings/backend-synced-settings-badge.tsx
index 5538b49128..1251f17b46 100644
--- a/src/components/features/settings/backend-synced-settings-badge.tsx
+++ b/src/components/features/settings/backend-synced-settings-badge.tsx
@@ -37,7 +37,7 @@ export function BackendSyncedSettingsBadge() {
data-testid="backend-synced-settings-badge"
className="flex items-center"
>
- <Typography.Text className="text-[11px] font-medium text-[#8c8c8c] leading-5">
+ <Typography.Text className="text-[11px] font-medium text-[var(--oh-text-dim)] leading-5">
{t(I18nKey.SETTINGS$BACKEND_SYNCED_BADGE, {
name,
host: active.backend.host,
diff --git a/src/components/features/settings/brand-button.tsx b/src/components/features/settings/brand-button.tsx
index 3d4fc88993..48ddaff670 100644
--- a/src/components/features/settings/brand-button.tsx
+++ b/src/components/features/settings/brand-button.tsx
@@ -48,10 +48,13 @@ export const BrandButton = forwardRef<
aria-label={ariaLabel}
aria-busy={ariaBusy}
className={cn(
- "w-fit px-3 py-2 text-sm rounded-sm disabled:opacity-30 disabled:cursor-not-allowed hover:opacity-80 cursor-pointer",
- variant === "primary" && "bg-primary text-[#0D0F11]",
- variant === "secondary" && "border border-primary text-primary",
- variant === "tertiary" && "bg-neutral-600 text-white",
+ "w-fit p-2 text-sm rounded-sm disabled:opacity-30 disabled:cursor-not-allowed cursor-pointer",
+ variant === "primary" &&
+ "bg-primary text-[var(--oh-color-base)] hover:opacity-80",
+ variant === "secondary" &&
+ "border border-[var(--oh-border)] text-white hover:bg-surface-raised",
+ variant === "tertiary" &&
+ "bg-[var(--oh-interactive-hover)] text-white hover:opacity-80",
variant === "danger" && "bg-red-600 text-white hover:bg-red-700",
variant === "ghost-danger" &&
"bg-transparent text-red-600 underline hover:text-red-700 hover:no-underline font-medium",
diff --git a/src/components/features/settings/llm-profiles/profile-actions-menu.tsx b/src/components/features/settings/llm-profiles/profile-actions-menu.tsx
index f2c9b6fdd9..78d7f8c502 100644
--- a/src/components/features/settings/llm-profiles/profile-actions-menu.tsx
+++ b/src/components/features/settings/llm-profiles/profile-actions-menu.tsx
@@ -128,7 +128,7 @@ export function ProfileActionsMenu({
return (
<div
ref={menuRef}
- className="absolute right-0 top-full mt-1 z-10 bg-base-secondary border border-tertiary rounded-md shadow-lg py-1 min-w-[160px]"
+ className="absolute right-0 top-full mt-1 z-10 bg-base-secondary border border-[var(--oh-border)] rounded-md shadow-lg py-1 min-w-[160px]"
role="menu"
aria-orientation="vertical"
data-testid="profile-actions-menu"
diff --git a/src/components/features/settings/llm-profiles/profile-name-input.tsx b/src/components/features/settings/llm-profiles/profile-name-input.tsx
index adb05c06bb..050cf74720 100644
--- a/src/components/features/settings/llm-profiles/profile-name-input.tsx
+++ b/src/components/features/settings/llm-profiles/profile-name-input.tsx
@@ -66,7 +66,7 @@ export const ProfileNameInput = forwardRef<
<p
id={describedById}
data-testid={ruleTestId}
- className={`text-xs ${isValid ? "text-gray-400" : "text-red-400"}`}
+ className={`text-xs ${isValid ? "text-[var(--oh-muted)]" : "text-red-400"}`}
>
{t(I18nKey.SETTINGS$PROFILE_NAME_RULE)}
</p>
diff --git a/src/components/features/settings/llm-profiles/profile-row.tsx b/src/components/features/settings/llm-profiles/profile-row.tsx
index 6b6aa538a0..3e87d558b1 100644
--- a/src/components/features/settings/llm-profiles/profile-row.tsx
+++ b/src/components/features/settings/llm-profiles/profile-row.tsx
@@ -42,7 +42,7 @@ export function ProfileRow({
</span>
{profile.model ? (
<span
- className="text-sm text-gray-400 truncate min-w-0 max-w-full"
+ className="text-sm text-[var(--oh-muted)] truncate min-w-0 max-w-full"
title={profile.model}
>
{profile.model}
diff --git a/src/components/features/settings/llm-profiles/profiles-body.tsx b/src/components/features/settings/llm-profiles/profiles-body.tsx
index 03c61397bd..5c0cc3c88d 100644
--- a/src/components/features/settings/llm-profiles/profiles-body.tsx
+++ b/src/components/features/settings/llm-profiles/profiles-body.tsx
@@ -47,14 +47,14 @@ export function ProfilesBody({
if (profiles.length === 0) {
return (
- <p className="text-sm text-gray-400 italic">
+ <p className="text-sm text-[var(--oh-muted)] italic">
{t(I18nKey.SETTINGS$PROFILES_EMPTY)}
</p>
);
}
return (
- <div className="border border-tertiary rounded-md divide-y divide-tertiary">
+ <div className="border border-[var(--oh-border)] rounded-md divide-y divide-[var(--oh-border-subtle)]">
{profiles.map((profile) => (
<ProfileRow
key={profile.name}
diff --git a/src/components/features/settings/mcp-settings/mcp-server-form.tsx b/src/components/features/settings/mcp-settings/mcp-server-form.tsx
index 19a7c7de9b..1feac2646f 100644
--- a/src/components/features/settings/mcp-settings/mcp-server-form.tsx
+++ b/src/components/features/settings/mcp-settings/mcp-server-form.tsx
@@ -376,8 +376,8 @@ export function MCPServerForm({
defaultValue={server?.args?.join("\n") || ""}
placeholder="arg1&#10;arg2&#10;arg3"
className={cn(
- "bg-tertiary border border-[#717888] w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt resize-none",
- "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+ "bg-tertiary border border-[var(--oh-border-input)] w-full rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt resize-none",
+ "disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",
)}
/>
<p className="text-xs text-tertiary-alt">
@@ -400,8 +400,8 @@ export function MCPServerForm({
placeholder="KEY1=value1&#10;KEY2=value2"
className={cn(
"resize-none",
- "bg-tertiary border border-[#717888] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
- "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+ "bg-tertiary border border-[var(--oh-border-input)] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
+ "disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",
)}
/>
</label>
diff --git a/src/components/features/settings/mcp-settings/mcp-server-list-item.tsx b/src/components/features/settings/mcp-settings/mcp-server-list-item.tsx
index b0a0d4afe9..751d492dc5 100644
--- a/src/components/features/settings/mcp-settings/mcp-server-list-item.tsx
+++ b/src/components/features/settings/mcp-settings/mcp-server-list-item.tsx
@@ -64,7 +64,7 @@ export function MCPServerListItem({
return (
<tr
data-testid="mcp-server-item"
- className="grid grid-cols-[minmax(0,0.25fr)_120px_minmax(0,1fr)_120px] gap-4 items-start border-t border-tertiary"
+ className="grid grid-cols-[minmax(0,0.25fr)_120px_minmax(0,1fr)_120px] gap-4 items-start border-t border-[var(--oh-border-subtle)]"
>
<td
className="p-3 text-sm text-content-2 truncate min-w-0"
diff --git a/src/components/features/settings/mcp-settings/mcp-server-list.tsx b/src/components/features/settings/mcp-settings/mcp-server-list.tsx
index 40e13a3a72..09c6a26c69 100644
--- a/src/components/features/settings/mcp-settings/mcp-server-list.tsx
+++ b/src/components/features/settings/mcp-settings/mcp-server-list.tsx
@@ -29,7 +29,7 @@ export function MCPServerList({
if (servers.length === 0) {
return (
- <div className="border border-tertiary rounded-md p-8 text-center">
+ <div className="border border-[var(--oh-border)] rounded-md p-8 text-center">
<p className="text-content-2 text-sm">
{t(I18nKey.SETTINGS$MCP_NO_SERVERS)}
</p>
@@ -38,7 +38,7 @@ export function MCPServerList({
}
return (
- <div className="border border-tertiary rounded-md overflow-hidden">
+ <div className="border border-[var(--oh-border)] rounded-md overflow-hidden">
<table className="w-full">
<thead className="bg-base-tertiary">
<tr className="grid grid-cols-[minmax(0,0.25fr)_120px_minmax(0,1fr)_120px] gap-4 items-start">
diff --git a/src/components/features/settings/mobile-header.tsx b/src/components/features/settings/mobile-header.tsx
index 98628067e2..e3a6942ac7 100644
--- a/src/components/features/settings/mobile-header.tsx
+++ b/src/components/features/settings/mobile-header.tsx
@@ -23,7 +23,7 @@ export function MobileHeader({
<button
type="button"
onClick={onToggleMenu}
- className="p-2 rounded-md bg-tertiary hover:bg-[#454545] transition-colors"
+ className="p-2 rounded-md bg-tertiary hover:bg-tertiary transition-colors"
aria-label="Toggle settings menu"
>
<svg
diff --git a/src/components/features/settings/pro-pill.tsx b/src/components/features/settings/pro-pill.tsx
index 500e342a15..f427fd6fb0 100644
--- a/src/components/features/settings/pro-pill.tsx
+++ b/src/components/features/settings/pro-pill.tsx
@@ -12,7 +12,7 @@ export function ProPill({ className }: ProPillProps) {
return (
<span
className={cn(
- "bg-[#3a3c45] border border-[#ffeeaa] text-[#ffeeaa] text-[8px] font-medium px-1.5 py-0.5 rounded-full whitespace-nowrap",
+ "bg-tertiary border border-[#ffeeaa] text-[#ffeeaa] text-[8px] font-medium px-1.5 py-0.5 rounded-full whitespace-nowrap",
className,
)}
>
diff --git a/src/components/features/settings/sdk-settings/schema-field.tsx b/src/components/features/settings/sdk-settings/schema-field.tsx
index 52d39a3f82..ff5361f8f9 100644
--- a/src/components/features/settings/sdk-settings/schema-field.tsx
+++ b/src/components/features/settings/sdk-settings/schema-field.tsx
@@ -167,9 +167,9 @@ export function SchemaField({
disabled={isDisabled}
onChange={(event) => onChange(event.target.value)}
className={cn(
- "bg-tertiary border border-[#717888] min-h-32 w-full rounded-sm p-2 font-mono text-sm",
+ "bg-tertiary border border-[var(--oh-border-input)] min-h-32 w-full rounded-sm p-2 font-mono text-sm",
"placeholder:italic placeholder:text-tertiary-alt",
- "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+ "disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",
)}
/>
<FieldHelp field={field} />
diff --git a/src/components/features/settings/secrets-settings/secret-form.tsx b/src/components/features/settings/secrets-settings/secret-form.tsx
index 3f2c975e4b..a57caae86f 100644
--- a/src/components/features/settings/secrets-settings/secret-form.tsx
+++ b/src/components/features/settings/secrets-settings/secret-form.tsx
@@ -138,8 +138,8 @@ export function SecretForm({
required
className={cn(
"resize-none",
- "bg-tertiary border border-[#717888] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
- "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+ "bg-tertiary border border-[var(--oh-border-input)] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
+ "disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",
)}
rows={8}
/>
@@ -157,8 +157,8 @@ export function SecretForm({
defaultValue={secretDescription}
className={cn(
"resize-none",
- "bg-tertiary border border-[#717888] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
- "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+ "bg-tertiary border border-[var(--oh-border-input)] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
+ "disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",
)}
/>
</label>
diff --git a/src/components/features/settings/secrets-settings/secret-list-item.tsx b/src/components/features/settings/secrets-settings/secret-list-item.tsx
index 2944988e89..ae9118963f 100644
--- a/src/components/features/settings/secrets-settings/secret-list-item.tsx
+++ b/src/components/features/settings/secrets-settings/secret-list-item.tsx
@@ -2,7 +2,7 @@ import { FaPencil, FaTrash } from "react-icons/fa6";
export function SecretListItemSkeleton() {
return (
- <div className="border-t border-[#717888] last-of-type:border-b max-w-[830px] pr-2.5 py-[13px] flex items-center justify-between">
+ <div className="border-t border-[var(--oh-border-input)] last-of-type:border-b max-w-[830px] pr-2.5 py-[13px] flex items-center justify-between">
<div className="flex items-center justify-between w-1/3">
<span className="skeleton h-4 w-1/2" />
<span className="skeleton h-4 w-1/4" />
@@ -30,7 +30,10 @@ export function SecretListItem({
onDelete,
}: SecretListItemProps) {
return (
- <tr data-testid="secret-item" className="border-t border-tertiary">
+ <tr
+ data-testid="secret-item"
+ className="border-t border-[var(--oh-border)]"
+ >
<td className="p-3 text-sm text-content-2 truncate" title={title}>
{title}
</td>
diff --git a/src/components/features/settings/settings-dropdown-input.tsx b/src/components/features/settings/settings-dropdown-input.tsx
index db7c7ca6f2..325cdd4290 100644
--- a/src/components/features/settings/settings-dropdown-input.tsx
+++ b/src/components/features/settings/settings-dropdown-input.tsx
@@ -76,12 +76,15 @@ export function SettingsDropdownInput({
isRequired={required}
className="w-full"
classNames={{
- popoverContent: "bg-tertiary rounded-xl",
+ popoverContent: "bg-content1 rounded-xl",
+ selectorButton:
+ "!rounded-none !bg-transparent data-[hover=true]:!bg-transparent !min-w-0 !w-auto !h-auto px-1",
}}
+ selectorButtonProps={{ disableRipple: true }}
inputProps={{
classNames: {
inputWrapper: cn(
- "bg-tertiary border border-[#717888] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic",
+ "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic",
inputWrapperClassName,
),
input: inputClassName,
diff --git a/src/components/features/settings/settings-input.tsx b/src/components/features/settings/settings-input.tsx
index 185bc77263..d99e324b93 100644
--- a/src/components/features/settings/settings-input.tsx
+++ b/src/components/features/settings/settings-input.tsx
@@ -85,8 +85,8 @@ export const SettingsInput = forwardRef<HTMLInputElement, SettingsInputProps>(
aria-describedby={ariaDescribedBy}
aria-invalid={ariaInvalid}
className={cn(
- "bg-tertiary border border-[#717888] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
- "disabled:bg-[#2D2F36] disabled:border-[#2D2F36] disabled:cursor-not-allowed",
+ "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full max-w-[680px] rounded-sm p-2 placeholder:italic placeholder:text-tertiary-alt",
+ "disabled:bg-[var(--oh-surface-raised)] disabled:border-[var(--oh-border-subtle)] disabled:cursor-not-allowed",
)}
/>
</label>
diff --git a/src/components/features/settings/settings-nav-divider.tsx b/src/components/features/settings/settings-nav-divider.tsx
index d843d89e8c..5aa2c48cad 100644
--- a/src/components/features/settings/settings-nav-divider.tsx
+++ b/src/components/features/settings/settings-nav-divider.tsx
@@ -5,5 +5,12 @@ type SettingsNavDividerProps = {
};
export function SettingsNavDivider({ className }: SettingsNavDividerProps) {
- return <div className={cn("border-t border-[#242424] w-full", className)} />;
+ return (
+ <div
+ className={cn(
+ "border-t border-[var(--oh-border-subtle)] w-full",
+ className,
+ )}
+ />
+ );
}
diff --git a/src/components/features/settings/settings-nav-header.tsx b/src/components/features/settings/settings-nav-header.tsx
index ebd0d70e1a..92e0d6e9b3 100644
--- a/src/components/features/settings/settings-nav-header.tsx
+++ b/src/components/features/settings/settings-nav-header.tsx
@@ -13,7 +13,7 @@ export function SettingsNavHeader({ text, className }: SettingsNavHeaderProps) {
return (
<div className={cn("px-3.5", className)}>
- <Typography.Text className="text-[11px] font-medium text-[#8c8c8c] uppercase tracking-wide leading-5">
+ <Typography.Text className="text-[11px] font-medium text-[var(--oh-text-dim)] uppercase tracking-wide leading-5">
{t(text)}
</Typography.Text>
</div>
diff --git a/src/components/features/settings/settings-nav-link.tsx b/src/components/features/settings/settings-nav-link.tsx
index fe29209e93..e1db88962a 100644
--- a/src/components/features/settings/settings-nav-link.tsx
+++ b/src/components/features/settings/settings-nav-link.tsx
@@ -22,18 +22,18 @@ export function SettingsNavLink({ item, onClick }: SettingsNavLinkProps) {
className={({ isActive }) =>
cn(
"group flex items-center gap-3 p-1 sm:px-3.5 sm:py-2 rounded transition-all duration-200",
- isActive ? "bg-[#1f1f1f99]" : "hover:bg-[#1f1f1f99]",
+ isActive ? "bg-tertiary" : "hover:bg-[var(--oh-surface-raised)]",
isActive ? "[&_*]:text-white" : "",
)
}
>
- <Typography.Text className="flex h-5 w-5 shrink-0 items-center justify-center text-[#8C8C8C] group-hover:text-white transition-colors duration-200">
+ <Typography.Text className="flex h-5 w-5 shrink-0 items-center justify-center text-[var(--oh-muted)] group-hover:text-white transition-colors duration-200">
{icon}
</Typography.Text>
<div className="min-w-0 flex-1 overflow-hidden">
<Typography.Text
className={cn(
- "block truncate whitespace-nowrap text-[#8C8C8C] transition-all duration-300",
+ "block truncate whitespace-nowrap text-[var(--oh-muted)] transition-all duration-300",
"group-hover:translate-x-1 group-hover:text-white",
)}
>
diff --git a/src/components/features/settings/settings-navigation.tsx b/src/components/features/settings/settings-navigation.tsx
index f739938b78..80b351046f 100644
--- a/src/components/features/settings/settings-navigation.tsx
+++ b/src/components/features/settings/settings-navigation.tsx
@@ -33,7 +33,7 @@ export function SettingsNavigation({
data-testid="settings-navbar-desktop"
className="hidden md:flex md:w-[260px] md:shrink-0 md:flex-col md:gap-2"
>
- <Typography.Text className="px-3 text-xs font-semibold uppercase tracking-wider text-[#A3A3A3]">
+ <Typography.Text className="px-3 text-xs font-semibold uppercase tracking-wider text-[var(--oh-muted)]">
{t(I18nKey.SETTINGS$TITLE)}
</Typography.Text>
<div className="flex flex-col gap-0.5 pt-0.5">
@@ -60,7 +60,7 @@ export function SettingsNavigation({
data-testid="settings-navbar"
className={cn(
"flex flex-col gap-6 transition-transform duration-300 ease-in-out",
- "fixed inset-0 z-50 w-full bg-[#050505] p-4 transform md:hidden",
+ "fixed inset-0 z-50 w-full bg-[var(--oh-surface-deep)] p-4 transform md:hidden",
isMobileMenuOpen ? "translate-x-0" : "-translate-x-full",
)}
>
diff --git a/src/components/features/settings/settings-switch.tsx b/src/components/features/settings/settings-switch.tsx
index 7804a5f953..ba2177ee8e 100644
--- a/src/components/features/settings/settings-switch.tsx
+++ b/src/components/features/settings/settings-switch.tsx
@@ -57,7 +57,7 @@ export function SettingsSwitch({
<div className="flex items-center gap-1">
<span className="text-sm">{children}</span>
{isBeta && (
- <span className="text-[11px] leading-4 text-[#0D0F11] font-[500] tracking-tighter bg-primary px-1 rounded-full">
+ <span className="text-[11px] leading-4 text-base font-[500] tracking-tighter bg-primary px-1 rounded-full">
{t(I18nKey.BADGE$BETA)}
</span>
)}
diff --git a/src/components/features/settings/styled-switch-component.tsx b/src/components/features/settings/styled-switch-component.tsx
index 9299b08b30..d2ca80f605 100644
--- a/src/components/features/settings/styled-switch-component.tsx
+++ b/src/components/features/settings/styled-switch-component.tsx
@@ -13,7 +13,7 @@ export function StyledSwitchComponent({
"w-12 h-6 rounded-xl flex items-center p-1.5 cursor-pointer",
isToggled && "justify-end bg-primary",
!isToggled &&
- "justify-start bg-base-secondary border border-tertiary-light",
+ "justify-start bg-base-secondary border border-[var(--oh-border)]",
)}
>
<div
diff --git a/src/components/features/settings/upgrade-banner-with-backdrop.tsx b/src/components/features/settings/upgrade-banner-with-backdrop.tsx
index 1e3c78bba7..bbd88e91bb 100644
--- a/src/components/features/settings/upgrade-banner-with-backdrop.tsx
+++ b/src/components/features/settings/upgrade-banner-with-backdrop.tsx
@@ -22,7 +22,7 @@ export function UpgradeBannerWithBackdrop({
/>
<div
data-testid="settings-backdrop"
- className="absolute inset-0 z-20 opacity-50 bg-[#26282D]"
+ className="absolute inset-0 z-20 opacity-50 bg-[var(--oh-surface)]"
/>
</>
);
diff --git a/src/components/features/settings/upgrade-button.tsx b/src/components/features/settings/upgrade-button.tsx
index 936e7ab732..aa5b0f5ac1 100644
--- a/src/components/features/settings/upgrade-button.tsx
+++ b/src/components/features/settings/upgrade-button.tsx
@@ -20,7 +20,7 @@ export function UpgradeButton({
onClick={onClick}
disabled={isDisabled}
className={cn(
- "bg-neutral-500 text-white text-[9px] font-medium w-16 h-4 rounded-[100px] mix-blend-multiply hover:opacity-80 transition-opacity cursor-pointer",
+ "bg-[var(--oh-interactive-selected)] text-white text-[9px] font-medium w-16 h-4 rounded-[100px] mix-blend-multiply hover:opacity-80 transition-opacity cursor-pointer",
className,
)}
>
diff --git a/src/components/features/sidebar/sidebar-nav-link.tsx b/src/components/features/sidebar/sidebar-nav-link.tsx
index 2067b41ac2..e1f9a62493 100644
--- a/src/components/features/sidebar/sidebar-nav-link.tsx
+++ b/src/components/features/sidebar/sidebar-nav-link.tsx
@@ -66,8 +66,8 @@ export function SidebarNavLink({
"text-sm leading-5 truncate",
getLayoutClasses(collapsed, indent),
isActive || forceActive
- ? "bg-[#1f1f1f99] text-white font-medium"
- : "text-[#8C8C8C] hover:text-white hover:bg-[#1f1f1f99]",
+ ? "bg-tertiary text-white font-medium"
+ : "text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
disabled && "pointer-events-none opacity-50",
)
}
@@ -87,9 +87,7 @@ export function SidebarNavLink({
<StyledTooltip
content={hoverContent ?? label}
placement="right"
- tooltipClassName={
- hoverContent ? "p-0 bg-[#1f2228] text-white" : undefined
- }
+ tooltipClassName={hoverContent ? "p-0 bg-tertiary text-white" : undefined}
>
{link}
</StyledTooltip>
diff --git a/src/components/features/sidebar/sidebar.tsx b/src/components/features/sidebar/sidebar.tsx
index 89ede719ac..11eb22a240 100644
--- a/src/components/features/sidebar/sidebar.tsx
+++ b/src/components/features/sidebar/sidebar.tsx
@@ -162,7 +162,7 @@ export function Sidebar() {
}}
className={cn(
"bg-base flex flex-col transition-[width,min-width] duration-200",
- "md:border-r md:border-[#242424]",
+ "md:border-r md:border-[var(--oh-border)]",
// Mobile: top bar; Desktop: vertical column. Width responds to
// the collapsed state on md+ screens.
"h-[54px] md:h-full",
@@ -201,7 +201,7 @@ export function Sidebar() {
onClick={() => setCollapsed(false)}
className={cn(
"absolute inset-0 hidden md:inline-flex items-center justify-center",
- "rounded-md text-[#8C8C8C] hover:text-white hover:bg-[#1f1f1f99]",
+ "rounded-md text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
"transition-colors cursor-pointer",
showCollapsedExpandButton
? "opacity-100 pointer-events-auto"
@@ -225,7 +225,7 @@ export function Sidebar() {
onClick={() => setCollapsed(true)}
className={cn(
"hidden md:inline-flex items-center justify-center shrink-0",
- "w-7 h-7 rounded-md text-[#8C8C8C] hover:text-white hover:bg-[#1f1f1f99]",
+ "w-7 h-7 rounded-md text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
"transition-colors cursor-pointer",
// Keep the collapse button right-aligned while preserving a
// small gutter from the rail edge.
@@ -308,7 +308,7 @@ export function Sidebar() {
<SidebarConversationList />
{collapsed && (
- <div className="hidden md:flex md:flex-col md:items-center mt-auto gap-2 pb-2">
+ <div className="hidden md:flex md:flex-col md:items-center mt-auto gap-2 pb-2 cursor-pointer">
<button
type="button"
data-testid="collapsed-settings-link"
@@ -317,8 +317,8 @@ export function Sidebar() {
className={cn(
"inline-flex items-center justify-center w-10 h-10 p-0 mx-auto rounded-md transition-colors cursor-pointer",
currentPath.startsWith("/settings")
- ? "bg-[#1f1f1f99] text-white font-medium"
- : "text-[#8C8C8C] hover:text-white hover:bg-[#1f1f1f99]",
+ ? "bg-tertiary text-white font-medium"
+ : "text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
)}
>
<Settings width={16} height={16} />
@@ -348,8 +348,8 @@ export function Sidebar() {
className={cn(
"relative inline-flex items-center justify-center w-10 h-10 p-0 mx-auto rounded-md transition-colors",
collapsedBackendPopoverOpen
- ? "bg-[#1f1f1f99] text-white font-medium"
- : "text-[#8C8C8C] hover:text-white hover:bg-[#1f1f1f99]",
+ ? "bg-tertiary text-white font-medium"
+ : "text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
)}
>
<BackendStatusDot
@@ -388,7 +388,7 @@ export function Sidebar() {
visual separator above it. Hidden in collapsed mode because the
control needs full-width space. */}
{!collapsed && (
- <div className="hidden md:flex md:flex-col md:items-stretch pt-2 border-t border-[#242424] md:-mx-2 md:px-2">
+ <div className="hidden md:flex md:flex-col md:items-stretch pt-2 border-t border-[var(--oh-border)] md:-mx-2 md:px-2">
<BackendSelector openUpward />
</div>
)}
diff --git a/src/components/features/sidebar/user-avatar.tsx b/src/components/features/sidebar/user-avatar.tsx
index b9224f12fd..738971b63a 100644
--- a/src/components/features/sidebar/user-avatar.tsx
+++ b/src/components/features/sidebar/user-avatar.tsx
@@ -28,7 +28,7 @@ export function UserAvatar({ avatarUrl, isLoading }: UserAvatarProps) {
aria-label={t(I18nKey.USER$AVATAR_PLACEHOLDER)}
width={28}
height={28}
- className="text-[#9099AC]"
+ className="text-[var(--oh-muted)]"
/>
)}
{isLoading && <LoadingSpinner size="small" />}
diff --git a/src/components/features/skills/extensions-navigation.tsx b/src/components/features/skills/extensions-navigation.tsx
index 32553b52fe..e9e8532587 100644
--- a/src/components/features/skills/extensions-navigation.tsx
+++ b/src/components/features/skills/extensions-navigation.tsx
@@ -79,7 +79,7 @@ export function ExtensionsNavigation() {
data-testid="extensions-navbar-desktop"
className="hidden md:flex md:w-[260px] md:shrink-0 md:flex-col md:gap-2 md:sticky md:top-8 md:self-start md:pl-[14px]"
>
- <span className="px-3 text-xs font-semibold uppercase tracking-wider text-[#A3A3A3]">
+ <span className="px-3 text-xs font-semibold uppercase tracking-wider text-[var(--oh-muted)]">
{t(I18nKey.NAV$EXTENSIONS)}
</span>
<div className="flex flex-col gap-0.5 pt-0.5">
@@ -93,8 +93,8 @@ export function ExtensionsNavigation() {
cn(
"flex items-center gap-2 rounded-md transition-colors text-sm leading-5 truncate px-2 py-2 w-full",
isActive
- ? "bg-[#1f1f1f99] text-white font-medium"
- : "text-[#8C8C8C] hover:text-white hover:bg-[#1f1f1f99]",
+ ? "bg-tertiary text-white font-medium"
+ : "text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
)
}
>
@@ -103,7 +103,7 @@ export function ExtensionsNavigation() {
</span>
<span className="truncate">{item.label}</span>
{item.comingSoon && (
- <span className="ml-auto shrink-0 rounded-full border border-white/20 bg-white/5 px-1.5 py-0.5 text-[10px] font-medium text-[#8C8C8C]">
+ <span className="ml-auto shrink-0 rounded-full border border-white/20 bg-white/5 px-1.5 py-0.5 text-[10px] font-medium text-[var(--oh-text-dim)]">
{t(I18nKey.NAV$COMING_SOON)}
</span>
)}
diff --git a/src/components/features/skills/skill-card.tsx b/src/components/features/skills/skill-card.tsx
index 023a071f19..1c22f35e47 100644
--- a/src/components/features/skills/skill-card.tsx
+++ b/src/components/features/skills/skill-card.tsx
@@ -55,7 +55,7 @@ export function SkillCard({ skill, enabled, onToggle }: SkillCardProps) {
<article
data-testid={`skill-card-${skill.name}`}
className={cn(
- "flex flex-col gap-3 rounded-xl border border-tertiary bg-base-secondary p-4 transition-colors hover:border-white/40 hover:bg-base-tertiary/30",
+ "flex flex-col gap-3 rounded-xl border border-[var(--oh-border)] bg-base-secondary p-4 transition-colors hover:border-[var(--cool-grey-500)] hover:bg-base-tertiary/30",
!enabled && "opacity-70",
)}
>
@@ -73,7 +73,7 @@ export function SkillCard({ skill, enabled, onToggle }: SkillCardProps) {
{skill.version && (
<span
data-testid={`skill-version-${skill.name}`}
- className="inline-flex items-center rounded-full border border-tertiary px-2 py-0.5 text-[11px] font-medium text-tertiary-light"
+ className="inline-flex items-center rounded-full border border-[var(--oh-border)] px-2 py-0.5 text-[11px] font-medium text-tertiary-light"
>
{t(I18nKey.SETTINGS$SKILLS_VERSION, { version: skill.version })}
</span>
@@ -111,7 +111,7 @@ export function SkillCard({ skill, enabled, onToggle }: SkillCardProps) {
type="button"
onClick={() => setShowFullDescription((prev) => !prev)}
data-testid={`skill-show-more-${skill.name}`}
- className="mt-1 text-xs font-medium text-primary hover:underline"
+ className="mt-1 text-xs font-medium text-[var(--oh-muted)] hover:text-white hover:underline transition-colors"
>
{showFullDescription
? t(I18nKey.SETTINGS$SKILLS_SHOW_LESS)
@@ -128,7 +128,7 @@ export function SkillCard({ skill, enabled, onToggle }: SkillCardProps) {
{skill.triggers.map((trigger) => (
<span
key={trigger}
- className="inline-flex items-center rounded-md border border-tertiary bg-[rgba(255,255,255,0.04)] px-1.5 py-0.5 text-[11px] text-tertiary-light"
+ className="inline-flex items-center rounded-md border border-[var(--oh-border)] bg-[rgba(255,255,255,0.04)] px-1.5 py-0.5 text-[11px] text-tertiary-light"
>
{trigger}
</span>
@@ -209,7 +209,7 @@ export function SkillCard({ skill, enabled, onToggle }: SkillCardProps) {
{skill.allowed_tools.map((tool) => (
<span
key={tool}
- className="inline-flex items-center rounded-md border border-tertiary px-1.5 py-0.5 font-mono text-[11px] text-tertiary-light"
+ className="inline-flex items-center rounded-md border border-[var(--oh-border)] px-1.5 py-0.5 font-mono text-[11px] text-tertiary-light"
>
{tool}
</span>
diff --git a/src/components/features/skills/skills-toolbar.tsx b/src/components/features/skills/skills-toolbar.tsx
index e5c3fd8778..94c08adf5a 100644
--- a/src/components/features/skills/skills-toolbar.tsx
+++ b/src/components/features/skills/skills-toolbar.tsx
@@ -38,7 +38,7 @@ export function SkillsToolbar({
<div
className={cn(
"relative flex items-center w-1/2",
- "rounded-lg border border-tertiary bg-base-secondary",
+ "rounded-lg border border-[var(--oh-border)] bg-base-secondary",
"focus-within:border-white/40 focus-within:ring-1 focus-within:ring-white/20",
"transition-colors",
)}
@@ -90,7 +90,7 @@ export function SkillsToolbar({
"rounded-full border px-3 py-1 text-xs font-medium transition-colors cursor-pointer",
active
? "border-white/60 bg-white/10 text-white"
- : "border-tertiary bg-transparent text-tertiary-light hover:border-white/40 hover:text-white",
+ : "border-[var(--oh-border)] bg-transparent text-tertiary-light hover:border-[var(--cool-grey-500)] hover:text-white",
)}
>
{t(FILTER_LABEL_KEY[option])}
diff --git a/src/components/features/suggestions/suggestion-item.tsx b/src/components/features/suggestions/suggestion-item.tsx
index 10c4732059..ef2d92f0ff 100644
--- a/src/components/features/suggestions/suggestion-item.tsx
+++ b/src/components/features/suggestions/suggestion-item.tsx
@@ -34,13 +34,13 @@ export function SuggestionItem({ suggestion, onClick }: SuggestionItemProps) {
return (
<button
type="button"
- className="list-none border border-[#525252] rounded-[15px] hover:bg-tertiary flex-1 flex items-center justify-center cursor-pointer gap-[10px] h-[55px] px-4"
+ className="list-none border border-[var(--oh-border)] rounded-[15px] hover:bg-surface-raised hover:border-[var(--oh-interactive-hover)] transition-colors flex-1 flex items-center justify-center cursor-pointer gap-[10px] h-[55px] px-4"
onClick={() => onClick(suggestion.value)}
>
{itemIcon}
<span
data-testid="suggestion"
- className="text-[15px] font-normal leading-5 text-[#DEDFE0] text-center cursor-pointer"
+ className="text-[15px] font-normal leading-5 text-white text-center cursor-pointer"
>
{t(suggestion.label)}
</span>
diff --git a/src/components/shared/action-tooltip.tsx b/src/components/shared/action-tooltip.tsx
index 9059cab271..b59f3cf2e4 100644
--- a/src/components/shared/action-tooltip.tsx
+++ b/src/components/shared/action-tooltip.tsx
@@ -33,9 +33,7 @@ export function ActionTooltip({ type, onClick }: ActionTooltipProps) {
aria-label={ariaLabel}
className={cn(
"rounded px-2 h-6.5 text-sm font-medium leading-5 cursor-pointer hover:opacity-80",
- type === "confirm"
- ? "bg-tertiary text-white"
- : "bg-white text-[#0D0F11]",
+ type === "confirm" ? "bg-tertiary text-white" : "bg-white text-base",
)}
onClick={onClick}
>
diff --git a/src/components/shared/badge.tsx b/src/components/shared/badge.tsx
index c7e4eddd6b..8c915b8c79 100644
--- a/src/components/shared/badge.tsx
+++ b/src/components/shared/badge.tsx
@@ -8,7 +8,7 @@ export function BrandBadge({
return (
<span
className={cn(
- "text-sm leading-4 text-[#0D0F11] font-semibold tracking-tighter bg-primary p-1 rounded-full",
+ "text-sm leading-4 text-black font-semibold tracking-tighter bg-primary p-1 rounded-full",
className,
)}
{...rest}
diff --git a/src/components/shared/buttons/conversation-panel-button.tsx b/src/components/shared/buttons/conversation-panel-button.tsx
index 57781776fc..45a27c811d 100644
--- a/src/components/shared/buttons/conversation-panel-button.tsx
+++ b/src/components/shared/buttons/conversation-panel-button.tsx
@@ -34,7 +34,7 @@ export function ConversationPanelButton({
height={24}
className={cn(
"cursor-pointer",
- isOpen ? "text-white" : "text-[#B1B9D3]",
+ isOpen ? "text-white" : "text-[var(--oh-text-secondary)]",
disabled && "opacity-50",
)}
/>
diff --git a/src/components/shared/buttons/remove-button.tsx b/src/components/shared/buttons/remove-button.tsx
index 33590f64f9..12e4d61ae5 100644
--- a/src/components/shared/buttons/remove-button.tsx
+++ b/src/components/shared/buttons/remove-button.tsx
@@ -12,7 +12,7 @@ export function RemoveButton({ onClick, className }: RemoveButtonProps) {
type="button"
onClick={onClick}
className={cn(
- "bg-neutral-400 rounded-full w-5 h-5 flex items-center justify-center cursor-pointer",
+ "bg-[var(--oh-muted)] rounded-full w-5 h-5 flex items-center justify-center cursor-pointer",
className,
)}
>
diff --git a/src/components/shared/buttons/scroll-to-bottom-button.tsx b/src/components/shared/buttons/scroll-to-bottom-button.tsx
index efaac4be19..6253ceb188 100644
--- a/src/components/shared/buttons/scroll-to-bottom-button.tsx
+++ b/src/components/shared/buttons/scroll-to-bottom-button.tsx
@@ -10,7 +10,7 @@ export function ScrollToBottomButton({ onClick }: ScrollToBottomButtonProps) {
type="button"
onClick={onClick}
data-testid="scroll-to-bottom"
- className="flex items-center justify-center size-8 rounded-full bg-[#25272D] text-[#959CB2] hover:bg-[#3A3D46] hover:text-white rotate-180 cursor-pointer transition-colors"
+ className="flex items-center justify-center size-8 rounded-full bg-[var(--oh-surface)] text-[var(--oh-muted)] hover:bg-tertiary hover:text-white rotate-180 cursor-pointer transition-colors"
>
<ArrowSendIcon width={15} height={15} />
</button>
diff --git a/src/components/shared/buttons/trajectory-action-button.tsx b/src/components/shared/buttons/trajectory-action-button.tsx
index 6ed1ee3f43..1d4507e38d 100644
--- a/src/components/shared/buttons/trajectory-action-button.tsx
+++ b/src/components/shared/buttons/trajectory-action-button.tsx
@@ -18,7 +18,7 @@ export function TrajectoryActionButton({
type="button"
data-testid={testId}
onClick={onClick}
- className="flex items-center justify-center w-[26px] h-[26px] rounded-lg cursor-pointer bg-[#25272D] hover:bg-tertiary"
+ className="flex items-center justify-center w-[26px] h-[26px] rounded-lg cursor-pointer bg-[var(--oh-surface)] hover:bg-tertiary"
>
{icon}
</button>
diff --git a/src/components/shared/hook-execution-event-message.tsx b/src/components/shared/hook-execution-event-message.tsx
index 48f7d1bf4e..17446d2d33 100644
--- a/src/components/shared/hook-execution-event-message.tsx
+++ b/src/components/shared/hook-execution-event-message.tsx
@@ -77,7 +77,7 @@ export function HookExecutionEventMessage({
<span>
{icon} {t("HOOK$HOOK_LABEL")}: {event.hook_event_type}
{event.tool_name && (
- <span className="text-neutral-400 ml-2">({event.tool_name})</span>
+ <span className="text-[var(--oh-muted)] ml-2">({event.tool_name})</span>
)}
<span className={`ml-2 px-1 py-0.5 rounded text-xs ${statusClassName}`}>
{statusText}
@@ -86,46 +86,58 @@ export function HookExecutionEventMessage({
);
const details = (
- <div className="flex flex-col gap-2 text-neutral-400">
+ <div className="flex flex-col gap-2 text-[var(--oh-muted)]">
<div>
- <span className="text-neutral-500">{t("HOOK$COMMAND")}:</span>{" "}
- <code className="text-xs bg-neutral-800 px-1 py-0.5 rounded">
+ <span className="text-[var(--oh-text-subtle)]">
+ {t("HOOK$COMMAND")}:
+ </span>{" "}
+ <code className="text-xs bg-[var(--oh-surface)] px-1 py-0.5 rounded">
{formatHookCommand(event.hook_command)}
</code>
</div>
{event.exit_code !== null && (
<div>
- <span className="text-neutral-500">{t("HOOK$EXIT_CODE")}:</span>{" "}
+ <span className="text-[var(--oh-text-subtle)]">
+ {t("HOOK$EXIT_CODE")}:
+ </span>{" "}
{event.exit_code}
</div>
)}
{event.blocked && event.reason && (
<div className="text-amber-400">
- <span className="text-neutral-500">{t("HOOK$BLOCKED_REASON")}:</span>{" "}
+ <span className="text-[var(--oh-text-subtle)]">
+ {t("HOOK$BLOCKED_REASON")}:
+ </span>{" "}
{event.reason}
</div>
)}
{event.additional_context && (
<div>
- <span className="text-neutral-500">{t("HOOK$CONTEXT")}:</span>{" "}
+ <span className="text-[var(--oh-text-subtle)]">
+ {t("HOOK$CONTEXT")}:
+ </span>{" "}
{event.additional_context}
</div>
)}
{event.error && (
<div className="text-red-400">
- <span className="text-neutral-500">{t("HOOK$ERROR")}:</span>{" "}
+ <span className="text-[var(--oh-text-subtle)]">
+ {t("HOOK$ERROR")}:
+ </span>{" "}
{event.error}
</div>
)}
{event.stdout && (
<div>
- <span className="text-neutral-500">{t("HOOK$OUTPUT")}:</span>
- <pre className="text-xs bg-neutral-800 p-2 rounded mt-1 overflow-x-auto max-h-40 overflow-y-auto">
+ <span className="text-[var(--oh-text-subtle)]">
+ {t("HOOK$OUTPUT")}:
+ </span>
+ <pre className="text-xs bg-[var(--oh-surface)] p-2 rounded mt-1 overflow-x-auto max-h-40 overflow-y-auto">
{event.stdout}
</pre>
</div>
@@ -133,8 +145,10 @@ export function HookExecutionEventMessage({
{event.stderr && (
<div>
- <span className="text-neutral-500">{t("HOOK$STDERR")}:</span>
- <pre className="text-xs bg-neutral-800 p-2 rounded mt-1 overflow-x-auto max-h-40 overflow-y-auto text-amber-300">
+ <span className="text-[var(--oh-text-subtle)]">
+ {t("HOOK$STDERR")}:
+ </span>
+ <pre className="text-xs bg-[var(--oh-surface)] p-2 rounded mt-1 overflow-x-auto max-h-40 overflow-y-auto text-amber-300">
{event.stderr}
</pre>
</div>
diff --git a/src/components/shared/inputs/badge-input.tsx b/src/components/shared/inputs/badge-input.tsx
index cc34db4293..6fc285a8d1 100644
--- a/src/components/shared/inputs/badge-input.tsx
+++ b/src/components/shared/inputs/badge-input.tsx
@@ -47,14 +47,14 @@ export function BadgeInput({
return (
<div
className={cn(
- "bg-tertiary border border-[#717888] rounded w-full p-2 placeholder:italic placeholder:text-tertiary-alt",
+ "bg-tertiary border border-[var(--oh-border-input)] rounded w-full p-2 placeholder:italic placeholder:text-tertiary-alt",
"flex flex-wrap items-center gap-2",
className,
)}
>
{value.map((badge, index) => (
<div key={index}>
- <BrandBadge className="flex items-center gap-0.5 py-1 px-2.5 text-sm text-[#0D0F11] font-semibold leading-[16px]">
+ <BrandBadge className="flex items-center gap-0.5 py-1 px-2.5 text-sm text-base font-semibold leading-[16px]">
{badge}
<button
data-testid="remove-button"
diff --git a/src/components/shared/loading-spinner.tsx b/src/components/shared/loading-spinner.tsx
index d304dde2a4..564ef8a93f 100644
--- a/src/components/shared/loading-spinner.tsx
+++ b/src/components/shared/loading-spinner.tsx
@@ -24,7 +24,7 @@ export function LoadingSpinner({
>
<div
className={cn(
- "rounded-full border-4 border-[#525252] absolute",
+ "rounded-full border-4 border-[var(--oh-border)] absolute",
sizeStyle,
innerClassName,
)}
diff --git a/src/components/shared/modals/confirmation-modal.tsx b/src/components/shared/modals/confirmation-modal.tsx
index e0b0423730..5838006215 100644
--- a/src/components/shared/modals/confirmation-modal.tsx
+++ b/src/components/shared/modals/confirmation-modal.tsx
@@ -33,7 +33,7 @@ export function ConfirmationModal({
>
<div
data-testid="confirmation-modal"
- className="bg-base-secondary p-4 rounded-xl flex flex-col gap-4 border border-tertiary"
+ className="bg-base-secondary p-4 rounded-xl flex flex-col gap-4 border border-[var(--oh-border)]"
>
<p>{text}</p>
<div className="w-full flex gap-2">
diff --git a/src/components/shared/modals/confirmation-modals/danger-modal.tsx b/src/components/shared/modals/confirmation-modals/danger-modal.tsx
index 98f4a7155f..d74da8f867 100644
--- a/src/components/shared/modals/confirmation-modals/danger-modal.tsx
+++ b/src/components/shared/modals/confirmation-modals/danger-modal.tsx
@@ -32,7 +32,7 @@ export function DangerModal({
{
text: buttons.cancel.text,
onClick: buttons.cancel.onClick,
- className: "bg-neutral-500",
+ className: "bg-[var(--oh-interactive-selected)]",
},
]}
/>
diff --git a/src/components/shared/modals/settings/model-selector.tsx b/src/components/shared/modals/settings/model-selector.tsx
index 5487ad5056..ffb1a511ea 100644
--- a/src/components/shared/modals/settings/model-selector.tsx
+++ b/src/components/shared/modals/settings/model-selector.tsx
@@ -141,16 +141,23 @@ export function ModelSelector({
defaultSelectedKey={selectedProvider ?? undefined}
selectedKey={selectedProvider}
classNames={{
- popoverContent: "bg-tertiary rounded-xl border border-[#717888]",
+ popoverContent:
+ "bg-content1 rounded-xl border border-[var(--oh-border)]",
+ selectorButton:
+ "!rounded-none !bg-transparent data-[hover=true]:!bg-transparent !min-w-0 !w-auto !h-auto px-1",
}}
+ selectorButtonProps={{ disableRipple: true }}
inputProps={{
classNames: {
inputWrapper:
- "bg-tertiary border border-[#717888] h-10 w-full rounded-sm p-2 placeholder:italic",
+ "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full rounded-sm p-2 placeholder:italic",
},
}}
>
- <AutocompleteSection title={t(I18nKey.MODEL_SELECTOR$VERIFIED)}>
+ <AutocompleteSection
+ title={t(I18nKey.MODEL_SELECTOR$VERIFIED)}
+ classNames={{ heading: "text-[var(--oh-muted)]" }}
+ >
{verifiedProviders.map((provider) => (
<AutocompleteItem
data-testid={`provider-item-${provider.name}`}
@@ -161,7 +168,10 @@ export function ModelSelector({
))}
</AutocompleteSection>
{unverifiedProviders.length > 0 ? (
- <AutocompleteSection title={t(I18nKey.MODEL_SELECTOR$OTHERS)}>
+ <AutocompleteSection
+ title={t(I18nKey.MODEL_SELECTOR$OTHERS)}
+ classNames={{ heading: "text-[var(--oh-muted)]" }}
+ >
{unverifiedProviders.map((provider) => (
<AutocompleteItem key={provider.name}>
{mapProvider(provider.name)}
@@ -203,22 +213,32 @@ export function ModelSelector({
selectedKey={selectedModel}
defaultSelectedKey={selectedModel ?? undefined}
classNames={{
- popoverContent: "bg-tertiary rounded-xl border border-[#717888]",
+ popoverContent:
+ "bg-content1 rounded-xl border border-[var(--oh-border)]",
+ selectorButton:
+ "!rounded-none !bg-transparent data-[hover=true]:!bg-transparent !min-w-0 !w-auto !h-auto px-1",
}}
+ selectorButtonProps={{ disableRipple: true }}
inputProps={{
classNames: {
inputWrapper:
- "bg-tertiary border border-[#717888] h-10 w-full rounded-sm p-2 placeholder:italic",
+ "bg-tertiary border border-[var(--oh-border-input)] h-10 w-full rounded-sm p-2 placeholder:italic",
},
}}
>
- <AutocompleteSection title={t(I18nKey.MODEL_SELECTOR$VERIFIED)}>
+ <AutocompleteSection
+ title={t(I18nKey.MODEL_SELECTOR$VERIFIED)}
+ classNames={{ heading: "text-[var(--oh-muted)]" }}
+ >
{verifiedModels.map((model) => (
<AutocompleteItem key={model.name}>{model.name}</AutocompleteItem>
))}
</AutocompleteSection>
{unverifiedModels.length > 0 ? (
- <AutocompleteSection title={t(I18nKey.MODEL_SELECTOR$OTHERS)}>
+ <AutocompleteSection
+ title={t(I18nKey.MODEL_SELECTOR$OTHERS)}
+ classNames={{ heading: "text-[var(--oh-muted)]" }}
+ >
{unverifiedModels.map((model) => (
<AutocompleteItem
data-testid={`model-item-${model.name}`}
diff --git a/src/components/shared/modals/settings/settings-modal.tsx b/src/components/shared/modals/settings/settings-modal.tsx
index 3a9a1411fd..2b7f0593c7 100644
--- a/src/components/shared/modals/settings/settings-modal.tsx
+++ b/src/components/shared/modals/settings/settings-modal.tsx
@@ -18,7 +18,7 @@ export function SettingsModal({ onClose, settings }: SettingsModalProps) {
<ModalBackdrop>
<div
data-testid="ai-config-modal"
- className="bg-[#25272D] min-w-full max-w-[475px] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-tertiary api-configuration-modal"
+ className="bg-[var(--oh-surface)] min-w-full max-w-[475px] m-4 p-6 rounded-xl flex flex-col gap-[17px] border border-[var(--oh-border)] api-configuration-modal"
>
<span className="text-5 leading-6 font-semibold -tracking-[0.2px]">
{t(I18nKey.AI_SETTINGS$TITLE)}
diff --git a/src/constants/mcp-marketplace.tsx b/src/constants/mcp-marketplace.tsx
index 550acac363..934d9b76a9 100644
--- a/src/constants/mcp-marketplace.tsx
+++ b/src/constants/mcp-marketplace.tsx
@@ -150,7 +150,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl:
"https://github.com/modelcontextprotocol/servers/tree/main/src/github",
logo: <SiGithub className={LOGO} />,
- iconBg: "#24292F",
+ iconBg: "var(--oh-surface)",
keywords: ["git", "pr", "repo", "issues", "code"],
template: {
kind: "stdio",
@@ -407,7 +407,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
"Ask grounded questions about any public GitHub repository via Devin's DeepWiki MCP.",
docsUrl: "https://docs.devin.ai/work-with-devin/deepwiki-mcp",
logo: <BookOpen className={LOGO} />,
- iconBg: "#0B0E14",
+ iconBg: "var(--oh-color-base)",
keywords: ["devin", "code", "wiki", "github", "docs", "qa"],
template: {
kind: "sse",
@@ -517,7 +517,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
"Neural web search with semantic ranking, content extraction, and similar-page lookup.",
docsUrl: "https://docs.exa.ai/reference/exa-mcp",
logo: <Telescope className={LOGO} strokeWidth={2.25} />,
- iconBg: "#1F1F1F",
+ iconBg: "var(--oh-surface)",
keywords: ["search", "web", "research", "neural"],
template: {
kind: "stdio",
@@ -590,7 +590,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl:
"https://github.com/modelcontextprotocol/servers/tree/main/src/fetch",
logo: <Globe className={LOGO} strokeWidth={2.25} />,
- iconBg: "#4B5563",
+ iconBg: "var(--oh-interactive-hover)",
keywords: ["http", "web", "url", "scrape"],
template: {
kind: "stdio",
@@ -736,7 +736,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl: "https://neon.com/docs/ai/neon-mcp-server",
logo: <Database className={LOGO} strokeWidth={2.25} />,
iconBg: "#00E599",
- iconColor: "#0A0A0A",
+ iconColor: "var(--oh-surface-deep)",
keywords: ["database", "postgres", "serverless"],
template: {
kind: "stdio",
@@ -847,7 +847,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl:
"https://github.com/modelcontextprotocol/servers/tree/main/src/filesystem",
logo: <Folder className={LOGO} strokeWidth={2.25} />,
- iconBg: "#525B6F",
+ iconBg: "var(--oh-interactive-hover)",
availability: "local",
keywords: ["files", "local", "disk"],
installHint:
@@ -895,7 +895,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl:
"https://github.com/modelcontextprotocol/servers/tree/main/src/sequentialthinking",
logo: <ListTree className={LOGO} strokeWidth={2.25} />,
- iconBg: "#0F172A",
+ iconBg: "var(--oh-color-base)",
keywords: ["reasoning", "planning", "thoughts"],
template: {
kind: "stdio",
@@ -912,7 +912,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl:
"https://github.com/modelcontextprotocol/servers/tree/main/src/time",
logo: <Clock className={LOGO} strokeWidth={2.25} />,
- iconBg: "#1F2937",
+ iconBg: "var(--oh-surface)",
keywords: ["clock", "timezone", "date"],
template: {
kind: "stdio",
@@ -971,7 +971,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
"https://github.com/modelcontextprotocol/servers/tree/main/src/aws-kb-retrieval-server",
logo: <BookOpen className={LOGO} strokeWidth={2.25} />,
iconBg: "#FF9900",
- iconColor: "#0A0A0A",
+ iconColor: "var(--oh-surface-deep)",
keywords: ["aws", "bedrock", "rag", "knowledge"],
template: {
kind: "stdio",
@@ -1010,7 +1010,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
"Read Figma frames, components, and styles to ground UI work in your designs.",
docsUrl: "https://github.com/GLips/Figma-Context-MCP",
logo: <SiFigma className={LOGO} />,
- iconBg: "#1E1E1E",
+ iconBg: "var(--oh-surface)",
keywords: ["design", "ui", "frames", "components"],
template: {
kind: "stdio",
@@ -1035,7 +1035,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl: "https://github.com/domdomegg/airtable-mcp-server",
logo: <SiAirtable className={LOGO} />,
iconBg: "#FCB400",
- iconColor: "#0A0A0A",
+ iconColor: "var(--oh-surface-deep)",
keywords: ["spreadsheet", "database", "records", "bases"],
template: {
kind: "stdio",
@@ -1085,7 +1085,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
"Generate speech, clone voices, and transcribe audio via ElevenLabs.",
docsUrl: "https://elevenlabs.io/docs/api-reference/mcp",
logo: <SiElevenlabs className={LOGO} />,
- iconBg: "#0F0F0F",
+ iconBg: "var(--oh-color-base)",
keywords: ["tts", "speech", "voice", "audio"],
template: {
kind: "stdio",
@@ -1108,7 +1108,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
description: "Send transactional and marketing emails via the Resend API.",
docsUrl: "https://resend.com/docs/send-with-mcp",
logo: <SiResend className={LOGO} />,
- iconBg: "#0A0A0A",
+ iconBg: "var(--oh-surface-deep)",
keywords: ["email", "transactional", "smtp"],
template: {
kind: "stdio",
@@ -1170,7 +1170,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl: "https://help.kagi.com/kagi/api/mcp.html",
logo: <SiKagi className={LOGO} />,
iconBg: "#FFB319",
- iconColor: "#0A0A0A",
+ iconColor: "var(--oh-surface-deep)",
keywords: ["search", "web", "privacy"],
template: {
kind: "stdio",
@@ -1194,7 +1194,7 @@ export const MCP_MARKETPLACE: MarketplaceEntry[] = [
docsUrl: "https://github.com/ClickHouse/mcp-clickhouse",
logo: <SiClickhouse className={LOGO} />,
iconBg: "#FFFF00",
- iconColor: "#0A0A0A",
+ iconColor: "var(--oh-surface-deep)",
keywords: ["analytics", "olap", "database", "sql"],
template: {
kind: "stdio",
diff --git a/src/hooks/use-terminal.ts b/src/hooks/use-terminal.ts
index 676d7893c4..46f9b604dc 100644
--- a/src/hooks/use-terminal.ts
+++ b/src/hooks/use-terminal.ts
@@ -91,7 +91,7 @@ export const useTerminal = () => {
fastScrollSensitivity: 5,
disableStdin: true, // Make terminal read-only
theme: {
- background: "#25272D",
+ background: "var(--oh-surface)",
},
});
diff --git a/src/i18n/translation.json b/src/i18n/translation.json
index d885de73a8..c322cbd9cc 100644
--- a/src/i18n/translation.json
+++ b/src/i18n/translation.json
@@ -1886,6 +1886,23 @@
"uk": "Після цієї кількості подій конденсатор узагальнить історію. Мінімум 20.",
"ca": "Després d'aquest nombre d'esdeveniments, el condensador resumirà l'historial. Mínim 20."
},
+ "SETTINGS$COLOR_THEME": {
+ "en": "Color Theme",
+ "ja": "カラーテーマ",
+ "zh-CN": "颜色主题",
+ "zh-TW": "顏色主題",
+ "ko-KR": "색상 테마",
+ "no": "Fargetema",
+ "ar": "نسق الألوان",
+ "de": "Farbthema",
+ "fr": "Thème de couleurs",
+ "it": "Tema colore",
+ "pt": "Tema de cores",
+ "es": "Tema de color",
+ "ca": "Tema de color",
+ "tr": "Renk Teması",
+ "uk": "Кольорова тема"
+ },
"SETTINGS$LANGUAGE": {
"en": "Language",
"ja": "言語",
@@ -12377,20 +12394,20 @@
},
"STATUS$SETTING_UP_GIT_HOOKS": {
"en": "Adding git hooks",
- "zh-CN": "添加 git 钩子",
- "zh-TW": "新增 git 鉤子",
- "de": "Git-Hooks hinzufügen",
- "ko-KR": "git 훅 추가 중",
- "no": "Legger til git-hooks",
- "it": "Aggiunta hook git",
- "pt": "Adicionando hooks do git",
- "es": "Añadiendo hooks de git",
- "ar": "إضافة خطافات git",
- "fr": "Ajout des hooks git",
- "tr": "Git kancaları ekleniyor",
- "ja": "git フックを追加中",
- "uk": "Додавання git-хуків",
- "ca": "Afegint hooks de Git"
+ "zh-CN": "正在设置 git 钩子...",
+ "zh-TW": "正在設置 git 鉤子...",
+ "de": "Git-Hooks werden eingerichtet...",
+ "ko-KR": "git 훅을 설정하는 중...",
+ "no": "Setter opp git-hooks...",
+ "it": "Configurazione degli hook git...",
+ "pt": "Configurando hooks do git...",
+ "es": "Configurando hooks de git...",
+ "ar": "جاري إعداد خطافات git...",
+ "fr": "Configuration des hooks git...",
+ "tr": "Git kancaları ayarlanıyor...",
+ "ja": "git フックを設定中...",
+ "uk": "Налаштування git-хуків...",
+ "ca": "Configurant els hooks de Git..."
},
"STATUS$SETTING_UP_SKILLS": {
"en": "Adding skills",
diff --git a/src/icons/clipboard.svg b/src/icons/clipboard.svg
index abf4e5a315..8eb020eb50 100644
--- a/src/icons/clipboard.svg
+++ b/src/icons/clipboard.svg
@@ -7,25 +7,25 @@
fill="white" />
<path
d="M40.422 12.5062C39.4964 10.8141 37.6784 9.66328 35.5916 9.66328H31.399C31.7916 8.95781 32.0177 8.14922 32.0177 7.28672C32.0177 4.55625 29.7714 2.34375 26.9993 2.34375C24.2272 2.34375 21.981 4.55625 21.981 7.28672C21.981 8.14922 22.207 8.95781 22.5997 9.66328H18.407C16.3178 9.66328 14.5023 10.8141 13.5743 12.5062C13.1579 13.268 12.9199 14.1398 12.9199 15.068V20.107H41.0763V15.068C41.0763 14.1398 40.8384 13.268 40.422 12.5062ZM26.9993 5.11172C28.2176 5.11172 29.2075 6.08672 29.2075 7.28672C29.2075 8.48672 28.2176 9.46172 26.9993 9.46172C25.781 9.46172 24.7912 8.48672 24.7912 7.28672C24.7912 6.08672 25.781 5.11172 26.9993 5.11172Z"
- fill="#C9C7C7" />
+ fill="currentColor" />
<path
d="M27 2.34375C29.7721 2.34375 32.0183 4.55625 32.0183 7.28672C32.0183 8.14922 31.7923 8.95781 31.3997 9.66328H35.5923C37.6815 9.66328 39.497 10.8141 40.4227 12.5063H46.1334C49.1649 12.5063 51.6205 14.925 51.6205 17.9109V67.2516C51.6205 70.2375 49.1625 72.6562 46.1334 72.6562H7.86657C4.83749 72.6562 2.37948 70.2352 2.37948 67.2516V17.9109C2.37948 14.9273 4.83749 12.5063 7.86657 12.5063H13.5773C14.503 10.8141 16.3209 9.66328 18.4101 9.66328H22.6027C22.2101 8.95781 21.984 8.14922 21.984 7.28672C21.984 4.55625 24.2303 2.34375 27.0024 2.34375M27 0C22.9216 0 19.6022 3.26953 19.6022 7.28672C19.6022 7.29844 19.6022 7.30781 19.6022 7.31953H18.4077C16.0187 7.31953 13.7962 8.38125 12.3186 10.1625H7.86657C3.52877 10.1625 0 13.6383 0 17.9109V67.2516C0 71.5242 3.52877 75 7.86657 75H46.1334C50.4712 75 54 71.5242 54 67.2516V17.9109C54 13.6383 50.4712 10.1625 46.1334 10.1625H41.6814C40.2038 8.38125 37.9813 7.31953 35.5923 7.31953H34.3978C34.3978 7.31953 34.3978 7.29844 34.3978 7.28672C34.3978 3.26953 31.0784 0 27 0Z"
fill="black" />
<path
d="M39.7465 27.0066H14.2504C13.4604 27.0066 12.8203 26.3762 12.8203 25.598C12.8203 24.8199 13.4604 24.1895 14.2504 24.1895H39.7465C40.5365 24.1895 41.1766 24.8199 41.1766 25.598C41.1766 26.3762 40.5365 27.0066 39.7465 27.0066Z"
- fill="#C9C7C7" />
+ fill="currentColor" />
<path
d="M39.7465 35.6131H14.2504C13.4604 35.6131 12.8203 34.9826 12.8203 34.2045C12.8203 33.4264 13.4604 32.7959 14.2504 32.7959H39.7465C40.5365 32.7959 41.1766 33.4264 41.1766 34.2045C41.1766 34.9826 40.5365 35.6131 39.7465 35.6131Z"
- fill="#C9C7C7" />
+ fill="currentColor" />
<path
d="M39.7465 44.2195H14.2504C13.4604 44.2195 12.8203 43.5891 12.8203 42.8109C12.8203 42.0328 13.4604 41.4023 14.2504 41.4023H39.7465C40.5365 41.4023 41.1766 42.0328 41.1766 42.8109C41.1766 43.5891 40.5365 44.2195 39.7465 44.2195Z"
- fill="#C9C7C7" />
+ fill="currentColor" />
<path
d="M39.7465 52.826H14.2504C13.4604 52.826 12.8203 52.1955 12.8203 51.4174C12.8203 50.6393 13.4604 50.0088 14.2504 50.0088H39.7465C40.5365 50.0088 41.1766 50.6393 41.1766 51.4174C41.1766 52.1955 40.5365 52.826 39.7465 52.826Z"
- fill="#C9C7C7" />
+ fill="currentColor" />
<path
d="M39.7465 61.4324H14.2504C13.4604 61.4324 12.8203 60.802 12.8203 60.0238C12.8203 59.2457 13.4604 58.6152 14.2504 58.6152H39.7465C40.5365 58.6152 41.1766 59.2457 41.1766 60.0238C41.1766 60.802 40.5365 61.4324 39.7465 61.4324Z"
- fill="#C9C7C7" />
+ fill="currentColor" />
</g>
<defs>
<clipPath id="clip0_8467_33273">
diff --git a/src/icons/default-user.svg b/src/icons/default-user.svg
index bcaf762d67..793a6f8f60 100644
--- a/src/icons/default-user.svg
+++ b/src/icons/default-user.svg
@@ -1,5 +1,5 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M13.0919 10.5917C13.9089 9.94891 14.5052 9.06746 14.7979 8.06997C15.0906 7.07249 15.0652 6.00858 14.7251 5.02625C14.385 4.04391 13.7471 3.19202 12.9003 2.58907C12.0535 1.98612 11.0398 1.66211 10.0002 1.66211C8.9607 1.66211 7.947 1.98612 7.10018 2.58907C6.25336 3.19202 5.61553 4.04391 5.27542 5.02625C4.93531 6.00858 4.90984 7.07249 5.20254 8.06997C5.49525 9.06746 6.09158 9.94891 6.90858 10.5917C5.50864 11.1526 4.28715 12.0828 3.37432 13.2833C2.46149 14.4838 1.89154 15.9094 1.72524 17.4084C1.7132 17.5178 1.72284 17.6285 1.7536 17.7342C1.78435 17.8399 1.83563 17.9386 1.9045 18.0245C2.04359 18.1979 2.24589 18.309 2.46691 18.3334C2.68792 18.3577 2.90954 18.2932 3.08301 18.1541C3.25648 18.015 3.3676 17.8127 3.39191 17.5917C3.5749 15.9627 4.35165 14.4582 5.57376 13.3657C6.79587 12.2732 8.37766 11.6692 10.0169 11.6692C11.6562 11.6692 13.2379 12.2732 14.4601 13.3657C15.6822 14.4582 16.4589 15.9627 16.6419 17.5917C16.6646 17.7965 16.7623 17.9856 16.9162 18.1225C17.0701 18.2595 17.2692 18.3346 17.4752 18.3334H17.5669C17.7854 18.3082 17.985 18.1978 18.1224 18.0261C18.2597 17.8544 18.3237 17.6353 18.3002 17.4167C18.1332 15.9135 17.5601 14.4842 16.6426 13.2819C15.7251 12.0795 14.4977 11.1496 13.0919 10.5917ZM10.0002 10C9.34097 10 8.69651 9.80453 8.14834 9.43825C7.60018 9.07198 7.17294 8.55139 6.92064 7.9423C6.66835 7.33321 6.60234 6.66299 6.73096 6.01639C6.85957 5.36979 7.17704 4.77584 7.64322 4.30967C8.10939 3.84349 8.70334 3.52602 9.34994 3.39741C9.99654 3.26879 10.6668 3.3348 11.2759 3.58709C11.8849 3.83938 12.4055 4.26662 12.7718 4.81479C13.1381 5.36295 13.3336 6.00742 13.3336 6.66669C13.3336 7.55074 12.9824 8.39859 12.3573 9.02371C11.7321 9.64883 10.8843 10 10.0002 10Z"
- fill="#E4E7EB"/>
+ fill="currentColor"/>
</svg>
diff --git a/src/icons/docs.svg b/src/icons/docs.svg
index e82c7f7962..d3fefe4b90 100644
--- a/src/icons/docs.svg
+++ b/src/icons/docs.svg
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<svg data-name="Layer 1" id="Layer_1" viewBox="0 0 452.5 344" xmlns="http://www.w3.org/2000/svg">
-<path fill="#E4E7EB" d="M454,319,674,211,899,318,675,440Z" transform="translate(-454 -211)"/>
-<path fill="#E4E7EB" d="M330,267" transform="translate(-454 -211)"/>
-<rect fill="#E4E7EB" height="89" rx="6.5" ry="6.5" width="13" x="426" y="108"/>
-<circle fill="#E4E7EB" cx="432.75" cy="212.75" r="19.75"/>
-<path fill="#E4E7EB" d="M948,532" transform="translate(-454 -211)"/>
-<path fill="#E4E7EB" d="M552,397l120.61,66.05L795,397v70c-5.48,6.77-48.25,57.77-121,58-73.35.23-116.6-51.33-122-58Z" transform="translate(-454 -211)"/>
+<path fill="currentColor" d="M454,319,674,211,899,318,675,440Z" transform="translate(-454 -211)"/>
+<path fill="currentColor" d="M330,267" transform="translate(-454 -211)"/>
+<rect fill="currentColor" height="89" rx="6.5" ry="6.5" width="13" x="426" y="108"/>
+<circle fill="currentColor" cx="432.75" cy="212.75" r="19.75"/>
+<path fill="currentColor" d="M948,532" transform="translate(-454 -211)"/>
+<path fill="currentColor" d="M552,397l120.61,66.05L795,397v70c-5.48,6.77-48.25,57.77-121,58-73.35.23-116.6-51.33-122-58Z" transform="translate(-454 -211)"/>
</svg>
diff --git a/src/icons/external-link.svg b/src/icons/external-link.svg
index e554116711..b67e911517 100644
--- a/src/icons/external-link.svg
+++ b/src/icons/external-link.svg
@@ -1,7 +1,7 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13 3H8.33337V4H11.2929L7.31315 7.97978L8.02026 8.68689L12 4.70711V7.66667H13V3Z"
- fill="#EEEEEE" />
+ fill="currentColor" />
<path
d="M4.33333 3.66667C3.59695 3.66667 3 4.26362 3 5V11.6667C3 12.403 3.59695 13 4.33333 13H11C11.7364 13 12.3333 12.403 12.3333 11.6667V9.66667H11.3333V11.6667C11.3333 11.8508 11.1841 12 11 12H4.33333C4.14924 12 4 11.8508 4 11.6667V5C4 4.81591 4.14924 4.66667 4.33333 4.66667H6.33333V3.66667H4.33333Z"
- fill="#EEEEEE" />
+ fill="currentColor" />
</svg>
diff --git a/src/icons/folder.svg b/src/icons/folder.svg
index 361c62dcf1..4b533347d0 100644
--- a/src/icons/folder.svg
+++ b/src/icons/folder.svg
@@ -2,22 +2,22 @@
<g clip-path="url(#clip0_8760_4530)">
<path
d="M2.33496 6.99504C2.33496 5.70504 3.37496 4.66504 4.66496 4.66504H10.495C10.805 4.66504 11.105 4.78504 11.315 5.00504L13.305 6.99504H23.325C24.615 6.99504 25.655 8.03504 25.655 9.32504V20.995C25.655 22.285 24.615 23.325 23.325 23.325H4.66496C3.37496 23.325 2.33496 22.285 2.33496 20.995V6.99504ZM10.015 6.99504H4.66496V20.995H23.335V9.33504H12.835C12.525 9.33504 12.225 9.21504 12.015 8.99504L10.025 7.00504L10.015 6.99504Z"
- fill="#E4E7EB" />
+ fill="currentColor" />
<path
d="M8.40279 11.4871C8.28576 11.4871 8.16873 11.4403 8.0829 11.3545L6.67853 9.95013C6.49908 9.77068 6.49908 9.482 6.67853 9.30255C6.85798 9.12311 7.14666 9.12311 7.3261 9.30255L8.73048 10.7069C8.90992 10.8864 8.90992 11.1751 8.73048 11.3545C8.64465 11.4403 8.52762 11.4871 8.41059 11.4871H8.40279Z"
- fill="#E4E7EB" />
- <path d="M9.48901 12.5635H8.57617V16.7532H9.48901V12.5635Z" fill="#E4E7EB" />
+ fill="currentColor" />
+ <path d="M9.48901 12.5635H8.57617V16.7532H9.48901V12.5635Z" fill="currentColor" />
<path
d="M9.03627 13.0159C8.28727 13.0159 7.67871 12.4073 7.67871 11.6583C7.67871 10.9093 8.28727 10.3008 9.03627 10.3008C9.78527 10.3008 10.3938 10.9093 10.3938 11.6583C10.3938 12.4073 9.78527 13.0159 9.03627 13.0159ZM9.03627 11.2214C8.79441 11.2214 8.59936 11.4165 8.59936 11.6583C8.59936 11.9002 8.79441 12.0953 9.03627 12.0953C9.27814 12.0953 9.47319 11.9002 9.47319 11.6583C9.47319 11.4165 9.27814 11.2214 9.03627 11.2214Z"
- fill="#E4E7EB" />
+ fill="currentColor" />
<path
d="M12.0324 16.012C11.2834 16.012 10.6748 15.4034 10.6748 14.6544C10.6748 13.9054 11.2834 13.2969 12.0324 13.2969C12.7814 13.2969 13.3899 13.9054 13.3899 14.6544C13.3899 15.4034 12.7814 16.012 12.0324 16.012ZM12.0324 14.2175C11.7905 14.2175 11.5954 14.4126 11.5954 14.6544C11.5954 14.8963 11.7905 15.0914 12.0324 15.0914C12.2742 15.0914 12.4693 14.8963 12.4693 14.6544C12.4693 14.4126 12.2742 14.2175 12.0324 14.2175Z"
- fill="#E4E7EB" />
+ fill="currentColor" />
<path
d="M9.03627 19.0003C8.28727 19.0003 7.67871 18.3917 7.67871 17.6427C7.67871 16.8937 8.28727 16.2852 9.03627 16.2852C9.78527 16.2852 10.3938 16.8937 10.3938 17.6427C10.3938 18.3917 9.78527 19.0003 9.03627 19.0003ZM9.03627 17.2058C8.79441 17.2058 8.59936 17.4009 8.59936 17.6427C8.59936 17.8846 8.79441 18.0796 9.03627 18.0796C9.27814 18.0796 9.47319 17.8846 9.47319 17.6427C9.47319 17.4009 9.27814 17.2058 9.03627 17.2058Z"
- fill="#E4E7EB" />
+ fill="currentColor" />
<path d="M9.9902 11.9805L9.34473 12.626L11.066 14.3472L11.7115 13.7018L9.9902 11.9805Z"
- fill="#E4E7EB" />
+ fill="currentColor" />
</g>
<defs>
<clipPath id="clip0_8760_4530">
diff --git a/src/icons/new-project.svg b/src/icons/new-project.svg
index 4e55d62af3..30e1712bcd 100644
--- a/src/icons/new-project.svg
+++ b/src/icons/new-project.svg
@@ -1,5 +1,5 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
- <rect width="28" height="28" rx="14" fill="#E4E7EB" />
+ <rect width="28" height="28" rx="14" fill="currentColor" />
<path
d="M20.4165 13.0837H14.9165V7.58366C14.9165 7.34054 14.8199 7.10739 14.648 6.93548C14.4761 6.76357 14.243 6.66699 13.9998 6.66699C13.7567 6.66699 13.5236 6.76357 13.3517 6.93548C13.1797 7.10739 13.0832 7.34054 13.0832 7.58366V13.0837H7.58317C7.34006 13.0837 7.1069 13.1802 6.93499 13.3521C6.76308 13.5241 6.6665 13.7572 6.6665 14.0003C6.6665 14.2434 6.76308 14.4766 6.93499 14.6485C7.1069 14.8204 7.34006 14.917 7.58317 14.917H13.0832V20.417C13.0832 20.6601 13.1797 20.8933 13.3517 21.0652C13.5236 21.2371 13.7567 21.3337 13.9998 21.3337C14.243 21.3337 14.4761 21.2371 14.648 21.0652C14.8199 20.8933 14.9165 20.6601 14.9165 20.417V14.917H20.4165C20.6596 14.917 20.8928 14.8204 21.0647 14.6485C21.2366 14.4766 21.3332 14.2434 21.3332 14.0003C21.3332 13.7572 21.2366 13.5241 21.0647 13.3521C20.8928 13.1802 20.6596 13.0837 20.4165 13.0837Z"
fill="black" />
diff --git a/src/icons/play.svg b/src/icons/play.svg
index b147c9afd7..47fa9fbda2 100644
--- a/src/icons/play.svg
+++ b/src/icons/play.svg
@@ -2,7 +2,7 @@
<g clip-path="url(#clip0_8467_30872)">
<path
d="M6.26693 21.4874L6.25583 21.4951L6.24514 21.5033C5.95991 21.7227 5.5 21.5308 5.5 21.0996V2.89961C5.5 2.4684 5.95991 2.2765 6.24514 2.49592L6.25634 2.50452L6.26799 2.51249L19.518 11.5625L19.518 11.5625L19.5226 11.5656C19.8258 11.7677 19.8258 12.1815 19.5226 12.3836L19.5226 12.3835L19.5169 12.3874L6.26693 21.4874Z"
- fill="#FCFCFC" stroke="#FCFCFC" />
+ fill="currentColor" stroke="currentColor" />
</g>
<defs>
<clipPath id="clip0_8467_30872">
diff --git a/src/icons/stacked.svg b/src/icons/stacked.svg
index 3f15d38765..927e955d81 100644
--- a/src/icons/stacked.svg
+++ b/src/icons/stacked.svg
@@ -1,6 +1,6 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M33.334 3.33398H6.66732C4.82637 3.33398 3.33398 4.82637 3.33398 6.66732V13.334C3.33398 15.1749 4.82637 16.6673 6.66732 16.6673H33.334C35.1749 16.6673 36.6673 15.1749 36.6673 13.334V6.66732C36.6673 4.82637 35.1749 3.33398 33.334 3.33398Z" stroke="#8C8C8C" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M33.334 23.334H6.66732C4.82637 23.334 3.33398 24.8264 3.33398 26.6673V33.334C3.33398 35.1749 4.82637 36.6673 6.66732 36.6673H33.334C35.1749 36.6673 36.6673 35.1749 36.6673 33.334V26.6673C36.6673 24.8264 35.1749 23.334 33.334 23.334Z" stroke="#8C8C8C" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 10H10.0167" stroke="#8C8C8C" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 30H10.0167" stroke="#8C8C8C" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.334 3.33398H6.66732C4.82637 3.33398 3.33398 4.82637 3.33398 6.66732V13.334C3.33398 15.1749 4.82637 16.6673 6.66732 16.6673H33.334C35.1749 16.6673 36.6673 15.1749 36.6673 13.334V6.66732C36.6673 4.82637 35.1749 3.33398 33.334 3.33398Z" stroke="currentColor" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.334 23.334H6.66732C4.82637 23.334 3.33398 24.8264 3.33398 26.6673V33.334C3.33398 35.1749 4.82637 36.6673 6.66732 36.6673H33.334C35.1749 36.6673 36.6673 35.1749 36.6673 33.334V26.6673C36.6673 24.8264 35.1749 23.334 33.334 23.334Z" stroke="currentColor" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 10H10.0167" stroke="currentColor" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 30H10.0167" stroke="currentColor" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
diff --git a/src/index.css b/src/index.css
index 1aea4ef87e..766e7e9810 100644
--- a/src/index.css
+++ b/src/index.css
@@ -2,16 +2,16 @@
@import url("https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Outfit:[email protected]&display=swap");
:root {
- --oh-bg-dark: #0c0e10;
- --oh-bg-light: #292929;
- --oh-bg-input: #393939;
- --oh-bg-workspace: #1f2228;
- --oh-text-editor-base: #9099ac;
- --oh-text-editor-active: #c4cbda;
- --oh-bg-editor-sidebar: #24272e;
- --oh-bg-editor-active: #31343d;
- --oh-border-editor-sidebar: #3c3c4a;
- --oh-bg-neutral-muted: #afb8c133;
+ --oh-bg-dark: var(--cool-grey-950);
+ --oh-bg-light: var(--cool-grey-900);
+ --oh-bg-input: var(--cool-grey-800);
+ --oh-bg-workspace: var(--cool-grey-925);
+ --oh-text-editor-base: var(--cool-grey-400);
+ --oh-text-editor-active: var(--cool-grey-300);
+ --oh-bg-editor-sidebar: var(--cool-grey-925);
+ --oh-bg-editor-active: var(--cool-grey-900);
+ --oh-border-editor-sidebar: var(--cool-grey-800);
+ --oh-bg-neutral-muted: color-mix(in srgb, var(--cool-grey-300) 20%, transparent);
--bg-dark: var(--oh-bg-dark);
--bg-light: var(--oh-bg-light);
--bg-input: var(--oh-bg-input);
@@ -23,6 +23,22 @@
--border-editor-sidebar: var(--oh-border-editor-sidebar);
--bg-neutral-muted: var(--oh-bg-neutral-muted);
background-color: var(--oh-color-base) !important;
+
+ /* ── Cool Grey Scale (13 shades + 2 pure anchors: white / black) ──────── */
+ --cool-grey-50: #F7F9FC;
+ --cool-grey-100: #EEF2F7;
+ --cool-grey-200: #DCE3EE;
+ --cool-grey-300: #C3CDDC;
+ --cool-grey-400: #A3B0C4;
+ --cool-grey-500: #7E8A9E;
+ --cool-grey-600: #626D82;
+ --cool-grey-700: #4B5468;
+ --cool-grey-800: #383F50;
+ --cool-grey-900: #2C313F;
+ --cool-grey-925: #21252F;
+ --cool-grey-950: #0B0E14; /* intentional override: preserves original app-shell depth */
+ --cool-grey-975: #05070A;
+ /* ─────────────────────────────────────────────────────────────────────── */
}
body {
@@ -46,10 +62,10 @@ code {
margin: 0;
font-size: 85%;
white-space: break-spaces;
- background-color: #2a3038;
+ background-color: var(--cool-grey-900);
border-radius: 4px;
- color: #e6edf3;
- border: 1px solid #30363d;
+ color: var(--cool-grey-100);
+ border: 1px solid var(--cool-grey-900);
letter-spacing: -0.2px;
}
diff --git a/src/root.tsx b/src/root.tsx
index a860b6e7d8..82af2e63d2 100644
--- a/src/root.tsx
+++ b/src/root.tsx
@@ -15,6 +15,18 @@ import { TelemetryConsentBanner } from "#/components/features/analytics/telemetr
import { LoadingSpinner } from "#/components/shared/loading-spinner";
import { useConfig } from "#/hooks/query/use-config";
import { AgentServerUIRoot } from "#/components/providers";
+import {
+ applyColorTheme,
+ readPersistedColorTheme,
+} from "#/themes/color-themes";
+
+/** Applies the persisted color-theme palette to document.body on mount. */
+function ColorThemeApplier() {
+ React.useEffect(() => {
+ applyColorTheme(readPersistedColorTheme());
+ }, []);
+ return null;
+}
// Only rendered when the active backend is unreachable; keep the modal out of
// the default root graph.
@@ -35,6 +47,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
</head>
<body data-agent-server-ui="" style={{ margin: 0 }}>
<AgentServerUIRoot contentClassName="min-h-screen">
+ <ColorThemeApplier />
{children}
<Toaster />
<TelemetryConsentBanner />
@@ -51,7 +64,7 @@ function AgentServerBootstrapLoading() {
return (
<main className="min-h-screen bg-base px-6 py-10 text-white">
<div className="mx-auto flex min-h-screen max-w-6xl items-center justify-center">
- <div className="rounded-3xl border border-white/10 bg-neutral-900/80 px-8 py-10 shadow-2xl">
+ <div className="rounded-3xl border border-white/10 bg-base/80 px-8 py-10 shadow-2xl">
<LoadingSpinner size="large" />
</div>
</div>
diff --git a/src/routes/app-settings.tsx b/src/routes/app-settings.tsx
index 2246fc90aa..8d2f6d0470 100644
--- a/src/routes/app-settings.tsx
+++ b/src/routes/app-settings.tsx
@@ -10,6 +10,7 @@ import { SettingsSwitch } from "#/components/features/settings/settings-switch";
import { SettingsInput } from "#/components/features/settings/settings-input";
import { I18nKey } from "#/i18n/declaration";
import { LanguageInput } from "#/components/features/settings/app-settings/language-input";
+import { ThemeInput } from "#/components/features/settings/app-settings/theme-input";
import { handleCaptureConsent } from "#/utils/handle-capture-consent";
import {
displayErrorToast,
@@ -143,6 +144,8 @@ export function AppSettingsScreen() {
onChange={checkIfLanguageInputHasChanged}
/>
+ <ThemeInput />
+
<SettingsSwitch
testId="enable-analytics-switch"
name="enable-analytics-switch"
@@ -161,7 +164,7 @@ export function AppSettingsScreen() {
{t(I18nKey.SETTINGS$SOUND_NOTIFICATIONS)}
</SettingsSwitch>
- <div className="border-t border-t-tertiary pt-6 mt-2">
+ <div className="border-t border-[var(--oh-border)] pt-6 mt-2">
<h3 className="text-lg font-medium mb-2">
{t(I18nKey.SETTINGS$GIT_SETTINGS)}
</h3>
diff --git a/src/routes/automation-detail.tsx b/src/routes/automation-detail.tsx
index 9eaa32e4bd..1adc30be7f 100644
--- a/src/routes/automation-detail.tsx
+++ b/src/routes/automation-detail.tsx
@@ -65,7 +65,7 @@ export default function AutomationDetail() {
// Show loading state while checking health
if (isHealthLoading) {
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<DetailSkeleton />
</div>
@@ -76,7 +76,7 @@ export default function AutomationDetail() {
// Show backend not configured state if health check failed
if (!isBackendHealthy) {
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<BackendNotConfigured onRetry={refetchHealth} />
</div>
@@ -86,7 +86,7 @@ export default function AutomationDetail() {
if (isLoading) {
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<DetailSkeleton />
</div>
@@ -96,7 +96,7 @@ export default function AutomationDetail() {
if (is404) {
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<NotFoundState />
</div>
@@ -106,7 +106,7 @@ export default function AutomationDetail() {
if (isError || !automation) {
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<ErrorState onRetry={() => refetch()} />
</div>
@@ -130,7 +130,7 @@ export default function AutomationDetail() {
};
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<div className="flex flex-col gap-4">
<BackLink />
diff --git a/src/routes/automations-list.tsx b/src/routes/automations-list.tsx
index 25caa6e432..c18c59ca5b 100644
--- a/src/routes/automations-list.tsx
+++ b/src/routes/automations-list.tsx
@@ -86,12 +86,12 @@ export default function AutomationsList() {
// Show loading state while checking health
if (isHealthLoading) {
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<h1 className="text-xl font-semibold text-content">
{t(I18nKey.AUTOMATIONS$TITLE)}
</h1>
- <p className="mt-1 text-sm text-content-muted">
+ <p className="mt-1 text-sm text-muted">
{t(I18nKey.AUTOMATIONS$SUBTITLE)}
</p>
<div className="mt-6 flex flex-col gap-3">
@@ -107,12 +107,12 @@ export default function AutomationsList() {
// Show backend not configured state if health check failed
if (!isBackendHealthy) {
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
<h1 className="text-xl font-semibold text-content">
{t(I18nKey.AUTOMATIONS$TITLE)}
</h1>
- <p className="mt-1 text-sm text-content-muted">
+ <p className="mt-1 text-sm text-muted">
{t(I18nKey.AUTOMATIONS$SUBTITLE)}
</p>
<BackendNotConfigured onRetry={refetchHealth} />
@@ -122,13 +122,13 @@ export default function AutomationsList() {
}
return (
- <div className="min-h-full bg-surface">
+ <div className="min-h-full">
<div className="p-6 max-w-4xl mx-auto">
{/* Header */}
<h1 className="text-xl font-semibold text-content">
{t(I18nKey.AUTOMATIONS$TITLE)}
</h1>
- <p className="mt-1 text-sm text-content-muted">
+ <p className="mt-1 text-sm text-muted">
{t(I18nKey.AUTOMATIONS$SUBTITLE)}
</p>
@@ -177,7 +177,7 @@ export default function AutomationsList() {
<button
type="button"
onClick={() => setLimit((prev) => prev + PAGE_SIZE)}
- className="self-center rounded-lg border border-border px-6 py-2 text-sm text-white hover:bg-surface-elevated"
+ className="self-center rounded-lg border border-[var(--oh-border)] px-6 py-2 text-sm text-white hover:bg-surface-raised"
>
{t(I18nKey.AUTOMATIONS$LOAD_MORE)}
</button>
diff --git a/src/routes/device-verify.tsx b/src/routes/device-verify.tsx
index 990f642c0d..4b2f8fc9b4 100644
--- a/src/routes/device-verify.tsx
+++ b/src/routes/device-verify.tsx
@@ -126,7 +126,7 @@ export default function DeviceVerify() {
<div className="min-h-screen flex items-center justify-center bg-background">
<div className="max-w-md w-full mx-auto p-6 bg-card rounded-lg shadow-lg">
<div className="text-center">
- <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto mb-4" />
+ <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-white mx-auto mb-4" />
<p className="text-muted-foreground">
{t(I18nKey.DEVICE$PROCESSING)}
</p>
@@ -140,12 +140,12 @@ export default function DeviceVerify() {
return (
<div className="min-h-screen flex items-center justify-center bg-background p-4">
<div className="flex flex-col items-center gap-6 w-full max-w-md">
- <div className="flex-1 min-w-0 max-w-md w-full mx-auto p-6 bg-card rounded-2xl shadow-lg border border-[#242424]">
+ <div className="flex-1 min-w-0 max-w-md w-full mx-auto p-6 bg-card rounded-2xl shadow-lg border border-[var(--oh-border-subtle)]">
<H1 className="text-2xl mb-4 text-center">
{t(I18nKey.DEVICE$AUTHORIZATION_REQUEST)}
</H1>
- <div className="mb-6 p-4 bg-neutral-900 rounded-lg border border-neutral-700">
- <p className="text-xs text-neutral-500 mb-2 text-center uppercase tracking-wider">
+ <div className="mb-6 p-4 bg-base rounded-lg border border-[var(--oh-border-subtle)]">
+ <p className="text-xs text-[var(--oh-text-subtle)] mb-2 text-center uppercase tracking-wider">
{t(I18nKey.DEVICE$CODE_LABEL)}
</p>
<p className="text-xl font-mono font-semibold text-center tracking-[0.3em]">
@@ -156,7 +156,7 @@ export default function DeviceVerify() {
<p className="text-sm font-medium text-amber-500 mb-1">
{t(I18nKey.DEVICE$SECURITY_NOTICE)}
</p>
- <p className="text-sm text-gray-400">
+ <p className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.DEVICE$SECURITY_WARNING)}
</p>
</div>
@@ -167,7 +167,7 @@ export default function DeviceVerify() {
<button
type="button"
onClick={() => window.close()}
- className="flex-1 px-4 py-2 border border-neutral-600 rounded-md hover:bg-muted text-gray-300"
+ className="flex-1 px-4 py-2 border border-[var(--oh-border)] rounded-md hover:bg-muted text-[var(--oh-text-tertiary)]"
>
{t(I18nKey.DEVICE$CANCEL)}
</button>
@@ -228,7 +228,7 @@ export default function DeviceVerify() {
return (
<div className="min-h-screen flex items-center justify-center bg-background">
<div className="text-center">
- <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto mb-4" />
+ <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-white mx-auto mb-4" />
<p className="text-muted-foreground">
{t(I18nKey.DEVICE$PROCESSING)}
</p>
diff --git a/src/routes/files-tab.tsx b/src/routes/files-tab.tsx
index a03d7a7be4..b6c36aaad3 100644
--- a/src/routes/files-tab.tsx
+++ b/src/routes/files-tab.tsx
@@ -101,7 +101,7 @@ function FilesTab() {
>
{/* Top toolbar: diff/files + rich/plain toggles (left-aligned) plus
the refresh button on the right. */}
- <div className="flex items-center gap-3 px-3 py-1.5 border-b border-[#3A3D44]">
+ <div className="flex items-center gap-3 px-3 py-1.5 border-b border-[var(--oh-border)]">
<SegmentedToggle<"on" | "off">
ariaLabel={t(I18nKey.FILES$DIFF_VIEW)}
testId="files-tab-diff-toggle"
@@ -138,7 +138,7 @@ function FilesTab() {
aria-label={t(I18nKey.FILES$OPEN_IN_NEW_WINDOW)}
title={t(I18nKey.FILES$OPEN_IN_NEW_WINDOW)}
data-testid="files-tab-open-in-new-window"
- className="flex items-center justify-center w-[26px] py-1 rounded-[7px] hover:bg-[#474A54] cursor-pointer text-white"
+ className="flex items-center justify-center w-[26px] py-1 rounded-[7px] hover:bg-[var(--oh-interactive-hover)] cursor-pointer text-white"
>
<LinkExternalIcon width={14} height={14} />
</a>
@@ -150,7 +150,7 @@ function FilesTab() {
aria-label={t(I18nKey.FILES$REFRESH)}
title={t(I18nKey.FILES$REFRESH)}
data-testid="files-tab-refresh"
- className="flex items-center justify-center w-[26px] py-1 rounded-[7px] hover:enabled:bg-[#474A54] cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed"
+ className="flex items-center justify-center w-[26px] py-1 rounded-[7px] hover:enabled:bg-[var(--oh-interactive-hover)] cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed"
>
<RefreshIcon
width={12.75}
@@ -169,7 +169,7 @@ function FilesTab() {
) : (
<div className="flex flex-1 flex-col min-h-0">
{filesQuery.isLoading ? (
- <div className="flex flex-1 items-center justify-center text-sm text-[#9299AA]">
+ <div className="flex flex-1 items-center justify-center text-sm text-[var(--oh-muted)]">
{t(I18nKey.FILES$LOADING_FILES)}
</div>
) : (
@@ -184,7 +184,7 @@ function FilesTab() {
<div className="flex flex-1 min-h-0">
{isTreeVisible && (
<aside
- className="w-56 shrink-0 border-r border-[#3A3D44] overflow-y-auto custom-scrollbar-always"
+ className="w-56 shrink-0 border-r border-[var(--oh-border)] overflow-y-auto custom-scrollbar-always"
data-testid="files-tab-tree"
>
<FileTreeView
@@ -204,7 +204,7 @@ function FilesTab() {
viewMode={contentViewMode}
/>
) : (
- <div className="flex h-full w-full items-center justify-center text-sm text-[#9299AA]">
+ <div className="flex h-full w-full items-center justify-center text-sm text-[var(--oh-muted)]">
{t(I18nKey.FILES$NO_FILE_SELECTED)}
</div>
)}
diff --git a/src/routes/launch.tsx b/src/routes/launch.tsx
index 4e3a3cb67d..9c8e3fc023 100644
--- a/src/routes/launch.tsx
+++ b/src/routes/launch.tsx
@@ -104,16 +104,18 @@ function ErrorDisplay({
className="flex h-full items-center justify-center"
data-testid="launch-error"
>
- <div className="max-w-md rounded-lg bg-neutral-800 p-6 text-center">
+ <div className="max-w-md rounded-lg bg-[var(--oh-surface)] p-6 text-center">
<h2 className="mb-4 text-xl font-semibold text-red-400">
{t(I18nKey.LAUNCH$ERROR_TITLE)}
</h2>
- <p className="mb-6 text-neutral-300">{errorMessages[errorType]}</p>
+ <p className="mb-6 text-[var(--oh-text-tertiary)]">
+ {errorMessages[errorType]}
+ </p>
<div className="flex justify-center gap-3">
<button
type="button"
onClick={onGoHome}
- className="rounded-md bg-neutral-700 px-4 py-2 text-sm text-neutral-200 hover:bg-neutral-600"
+ className="rounded-md bg-tertiary px-4 py-2 text-sm text-[var(--oh-foreground)] hover:bg-[var(--oh-interactive-hover)]"
data-testid="go-home-button"
>
{t(I18nKey.LAUNCH$GO_HOME)}
diff --git a/src/routes/mcp.tsx b/src/routes/mcp.tsx
index 06d96d79f2..2535fca639 100644
--- a/src/routes/mcp.tsx
+++ b/src/routes/mcp.tsx
@@ -127,7 +127,7 @@ export default function MCPPage() {
<div data-testid="mcp-page" className="flex h-full gap-10">
<ExtensionsNavigation />
<div className="flex h-full flex-1 items-center justify-center">
- <div className="h-8 w-8 rounded-full border-2 border-tertiary border-t-primary animate-spin" />
+ <div className="h-8 w-8 rounded-full border-2 border-[var(--oh-border)] border-t-white animate-spin" />
</div>
</div>
);
diff --git a/src/routes/planner-tab.tsx b/src/routes/planner-tab.tsx
index 388d71e6e5..0cb794498a 100644
--- a/src/routes/planner-tab.tsx
+++ b/src/routes/planner-tab.tsx
@@ -46,8 +46,8 @@ function PlannerTab() {
return (
<div className="flex flex-col items-center justify-center w-full h-full p-10">
- <LessonPlanIcon width={109} height={109} color="#A1A1A1" />
- <span className="text-[#8D95A9] text-[19px] font-normal leading-5 pb-9">
+ <LessonPlanIcon width={109} height={109} color="var(--oh-muted)" />
+ <span className="text-[var(--oh-text-dim)] text-[19px] font-normal leading-5 pb-9">
{t(I18nKey.PLANNER$EMPTY_MESSAGE)}
</span>
<button
diff --git a/src/routes/secrets-settings.tsx b/src/routes/secrets-settings.tsx
index ea6c4f2c21..58c1e2e0b0 100644
--- a/src/routes/secrets-settings.tsx
+++ b/src/routes/secrets-settings.tsx
@@ -102,7 +102,7 @@ export function SecretsSettingsScreen() {
{view === "list" && !isLoadingSecrets && (
<div
ref={tableContainerRef}
- className="border border-tertiary rounded-md overflow-auto max-h-[60vh]"
+ className="border border-[var(--oh-border)] rounded-md overflow-auto max-h-[60vh]"
onScroll={handleScroll}
>
<table className="w-full min-w-full table-fixed">
diff --git a/src/routes/shared-conversation.tsx b/src/routes/shared-conversation.tsx
index d6023b9f9d..a329aaaf2d 100644
--- a/src/routes/shared-conversation.tsx
+++ b/src/routes/shared-conversation.tsx
@@ -60,7 +60,7 @@ export default function SharedConversation() {
if (isLoading) {
return (
- <div className="flex items-center justify-center h-screen bg-neutral-900">
+ <div className="flex items-center justify-center h-screen bg-base">
<LoadingSpinner size="large" />
</div>
);
@@ -68,16 +68,16 @@ export default function SharedConversation() {
if (error || !conversation) {
return (
- <div className="flex items-center justify-center h-screen bg-neutral-900">
+ <div className="flex items-center justify-center h-screen bg-base">
<div className="text-white">{t(I18nKey.CONVERSATION$NOT_FOUND)}</div>
</div>
);
}
return (
- <div className="h-screen bg-neutral-900 text-white flex flex-col">
+ <div className="h-screen bg-base text-white flex flex-col">
{/* Header with logo, conversation title and branch info */}
- <div className="border-b border-neutral-700 p-4 flex-shrink-0">
+ <div className="border-b border-[var(--oh-border-subtle)] p-4 flex-shrink-0">
<div className="max-w-4xl mx-auto flex items-start gap-4">
<Link
to="/conversations"
@@ -92,18 +92,18 @@ export default function SharedConversation() {
t(I18nKey.CONVERSATION$SHARED_CONVERSATION)}
</h1>
{conversation?.selected_branch && (
- <div className="text-sm text-neutral-400">
+ <div className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.CONVERSATION$BRANCH)}: {conversation.selected_branch}
</div>
)}
{conversation?.selected_repository && (
- <div className="text-sm text-neutral-400">
+ <div className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.CONVERSATION$REPOSITORY)}:{" "}
{conversation.selected_repository}
</div>
)}
{conversation?.llm_model && (
- <div className="text-sm text-neutral-400">
+ <div className="text-sm text-[var(--oh-muted)]">
{t(I18nKey.LLM$MODEL)}: {conversation.llm_model}
</div>
)}
@@ -116,7 +116,7 @@ export default function SharedConversation() {
ref={scrollContainerRef}
className="flex-1 overflow-y-auto custom-scrollbar-always px-4 pt-4 gap-2"
>
- <div className="max-w-4xl mx-auto p-4 border border-neutral-700 rounded">
+ <div className="max-w-4xl mx-auto p-4 border border-[var(--oh-border-subtle)] rounded">
{renderableEvents.length > 0 ? (
<Messages
messages={renderableEvents}
@@ -124,7 +124,7 @@ export default function SharedConversation() {
/>
) : (
<div className="flex items-center justify-center h-full">
- <div className="text-center text-neutral-400 py-8">
+ <div className="text-center text-[var(--oh-muted)] py-8">
{t(I18nKey.CONVERSATION$NO_HISTORY_AVAILABLE)}
</div>
</div>
diff --git a/src/routes/task-list-tab.tsx b/src/routes/task-list-tab.tsx
index 644f58136f..e7f3dd6a2e 100644
--- a/src/routes/task-list-tab.tsx
+++ b/src/routes/task-list-tab.tsx
@@ -13,8 +13,8 @@ function TaskListTab() {
if (taskList.length === 0) {
return (
<div className="flex flex-col items-center justify-center w-full h-full p-10 gap-4">
- <CheckCircleIcon width={109} height={109} color="#A1A1A1" />
- <Text className="text-[#8D95A9] text-[19px] font-normal leading-5">
+ <CheckCircleIcon width={109} height={109} color="var(--oh-muted)" />
+ <Text className="text-[var(--oh-text-dim)] text-[19px] font-normal leading-5">
{t(I18nKey.COMMON$NO_TASKS)}
</Text>
</div>
@@ -28,7 +28,7 @@ function TaskListTab() {
key={task.id}
className={cn(
"px-4 py-2",
- task.status === "in_progress" && "bg-[#2D3039]",
+ task.status === "in_progress" && "bg-[var(--oh-surface-raised)]",
)}
>
<TaskItem task={task} />
diff --git a/src/styles/agent-server-ui-style-scope.ts b/src/styles/agent-server-ui-style-scope.ts
index de686e1254..9b262f8f63 100644
--- a/src/styles/agent-server-ui-style-scope.ts
+++ b/src/styles/agent-server-ui-style-scope.ts
@@ -7,56 +7,69 @@ export type AgentServerUITheme = "dark" | "light" | "default";
export const AGENT_SERVER_UI_DEFAULT_CSS_VARIABLES = {
"--oh-color-primary": "#c9b974",
"--oh-color-logo": "#cfb755",
- "--oh-color-base": "#0d0f11",
- "--oh-color-base-secondary": "#24272e",
+ "--oh-color-base": "var(--cool-grey-950)",
+ "--oh-color-base-secondary": "var(--cool-grey-925)",
"--oh-color-danger": "#e76a5e",
"--oh-color-success": "#a5e75e",
- "--oh-color-basic": "#9099ac",
- "--oh-color-tertiary": "#454545",
- "--oh-color-tertiary-light": "#b7bdc2",
- "--oh-color-content": "#ecedee",
- "--oh-color-content-2": "#f9fbfe",
- "--oh-background": "#0d0f11",
- "--oh-foreground": "#ecedee",
- "--oh-surface": "#24272e",
- "--oh-surface-foreground": "#ecedee",
- "--oh-overlay": "#24272e",
- "--oh-overlay-foreground": "#ecedee",
- "--oh-muted": "#9099ac",
+ "--oh-color-basic": "var(--cool-grey-400)",
+ "--oh-color-tertiary": "var(--cool-grey-800)",
+ "--oh-color-tertiary-light": "var(--cool-grey-300)",
+ "--oh-color-content": "var(--cool-grey-100)",
+ "--oh-color-content-2": "var(--cool-grey-50)",
+ "--oh-background": "var(--cool-grey-950)",
+ "--oh-foreground": "var(--cool-grey-100)",
+ "--oh-surface": "var(--cool-grey-925)",
+ "--oh-surface-foreground": "var(--cool-grey-100)",
+ "--oh-surface-raised": "var(--cool-grey-900)",
+ "--oh-surface-deep": "var(--cool-grey-975)",
+ "--oh-overlay": "var(--cool-grey-925)",
+ "--oh-overlay-foreground": "var(--cool-grey-100)",
+ "--oh-muted": "var(--cool-grey-400)",
+ "--oh-text-secondary": "var(--cool-grey-300)",
+ "--oh-text-tertiary": "var(--cool-grey-200)",
+ "--oh-text-dim": "var(--cool-grey-500)",
+ "--oh-text-subtle": "var(--cool-grey-600)",
+ "--oh-interactive-hover": "var(--cool-grey-700)",
+ "--oh-interactive-hover-low": "var(--cool-grey-900)",
+ "--oh-interactive-active": "var(--cool-grey-800)",
+ "--oh-interactive-selected": "var(--cool-grey-600)",
"--oh-scrollbar": "rgba(208, 217, 250, 0.3)",
- "--oh-default": "#454545",
- "--oh-default-foreground": "#ecedee",
+ "--oh-default": "var(--cool-grey-800)",
+ "--oh-default-foreground": "var(--cool-grey-100)",
"--oh-accent": "#c9b974",
- "--oh-accent-foreground": "#0d0f11",
+ "--oh-accent-foreground": "var(--cool-grey-950)",
"--oh-success": "#a5e75e",
- "--oh-success-foreground": "#0d0f11",
+ "--oh-success-foreground": "var(--cool-grey-950)",
"--oh-warning": "#c9b974",
- "--oh-warning-foreground": "#0d0f11",
+ "--oh-warning-foreground": "var(--cool-grey-950)",
"--oh-danger": "#e76a5e",
- "--oh-danger-foreground": "#f9fbfe",
- "--oh-segment": "#24272e",
- "--oh-segment-foreground": "#ecedee",
+ "--oh-danger-foreground": "var(--cool-grey-50)",
+ "--oh-segment": "var(--cool-grey-925)",
+ "--oh-segment-foreground": "var(--cool-grey-100)",
"--oh-border-width": "1px",
"--oh-field-border-width": "1px",
- "--oh-border": "#717888",
+ "--oh-border": "var(--cool-grey-700)",
+ "--oh-border-input": "var(--cool-grey-600)",
+ "--oh-border-subtle": "var(--cool-grey-800)",
"--oh-separator": "rgba(113, 120, 136, 0.5)",
- "--oh-focus": "#c9b974",
- "--oh-link": "#ecedee",
+ "--oh-focus": "#ffffff",
+ "--oh-link": "var(--cool-grey-100)",
"--oh-radius": "5px",
"--oh-field-radius": "5px",
"--oh-surface-shadow": "none",
"--oh-overlay-shadow": "none",
"--oh-field-shadow": "none",
- "--oh-bg-dark": "#0c0e10",
- "--oh-bg-light": "#292929",
- "--oh-bg-input": "#393939",
- "--oh-bg-workspace": "#1f2228",
- "--oh-text-editor-base": "#9099ac",
- "--oh-text-editor-active": "#c4cbda",
- "--oh-bg-editor-sidebar": "#24272e",
- "--oh-bg-editor-active": "#31343d",
- "--oh-border-editor-sidebar": "#3c3c4a",
- "--oh-bg-neutral-muted": "#afb8c133",
+ "--oh-bg-dark": "var(--cool-grey-950)",
+ "--oh-bg-light": "var(--cool-grey-900)",
+ "--oh-bg-input": "var(--cool-grey-800)",
+ "--oh-bg-workspace": "var(--cool-grey-925)",
+ "--oh-text-editor-base": "var(--cool-grey-400)",
+ "--oh-text-editor-active": "var(--cool-grey-300)",
+ "--oh-bg-editor-sidebar": "var(--cool-grey-925)",
+ "--oh-bg-editor-active": "var(--cool-grey-900)",
+ "--oh-border-editor-sidebar": "var(--cool-grey-800)",
+ "--oh-bg-neutral-muted":
+ "color-mix(in srgb, var(--cool-grey-300) 20%, transparent)",
} as const;
export type AgentServerUICssVariableName =
diff --git a/src/tailwind.css b/src/tailwind.css
index 6c594f2f99..b9cf069ef3 100644
--- a/src/tailwind.css
+++ b/src/tailwind.css
@@ -19,49 +19,99 @@
--color-basic: var(--oh-color-basic);
--color-tertiary: var(--oh-color-tertiary);
--color-tertiary-light: var(--oh-color-tertiary-light);
+ --color-tertiary-alt: var(--oh-text-dim);
--color-content: var(--oh-color-content);
--color-content-2: var(--oh-color-content-2);
+
+ /* Semantic surface aliases */
+ --color-surface: var(--oh-surface);
+ --color-surface-raised: var(--oh-surface-raised);
+ --color-surface-deep: var(--oh-surface-deep);
+
+ /* Semantic text aliases */
+ --color-foreground: var(--oh-foreground);
+ --color-text-secondary: var(--oh-text-secondary);
+ --color-text-tertiary: var(--oh-text-tertiary);
+ --color-muted: var(--oh-muted);
+ --color-text-dim: var(--oh-text-dim);
+ --color-text-subtle: var(--oh-text-subtle);
+
+ /* Semantic border aliases */
+ --color-border-input: var(--oh-border-input);
+ --color-border-subtle: var(--oh-border-subtle);
+
+ /* Interactive state aliases */
+ --color-interactive-hover: var(--oh-interactive-hover);
+ --color-interactive-hover-low: var(--oh-interactive-hover-low);
+ --color-interactive-active: var(--oh-interactive-active);
+
+ /* Cool Grey scale */
+ --color-cool-grey-50: var(--cool-grey-50);
+ --color-cool-grey-100: var(--cool-grey-100);
+ --color-cool-grey-200: var(--cool-grey-200);
+ --color-cool-grey-300: var(--cool-grey-300);
+ --color-cool-grey-400: var(--cool-grey-400);
+ --color-cool-grey-500: var(--cool-grey-500);
+ --color-cool-grey-600: var(--cool-grey-600);
+ --color-cool-grey-700: var(--cool-grey-700);
+ --color-cool-grey-800: var(--cool-grey-800);
+ --color-cool-grey-900: var(--cool-grey-900);
+ --color-cool-grey-925: var(--cool-grey-925);
+ --color-cool-grey-950: var(--cool-grey-950);
+ --color-cool-grey-975: var(--cool-grey-975);
}
:root {
color-scheme: dark;
--oh-color-primary: #c9b974;
--oh-color-logo: #cfb755;
- --oh-color-base: #0d0f11;
- --oh-color-base-secondary: #24272e;
+ --oh-color-base: var(--cool-grey-950);
+ --oh-color-base-secondary: var(--cool-grey-925);
--oh-color-danger: #e76a5e;
--oh-color-success: #a5e75e;
- --oh-color-basic: #9099ac;
- --oh-color-tertiary: #454545;
- --oh-color-tertiary-light: #b7bdc2;
- --oh-color-content: #ecedee;
- --oh-color-content-2: #f9fbfe;
- --oh-background: #0d0f11;
- --oh-foreground: #ecedee;
- --oh-surface: #24272e;
- --oh-surface-foreground: #ecedee;
- --oh-overlay: #24272e;
- --oh-overlay-foreground: #ecedee;
- --oh-muted: #9099ac;
+ --oh-color-basic: var(--cool-grey-400);
+ --oh-color-tertiary: var(--cool-grey-800);
+ --oh-color-tertiary-light: var(--cool-grey-300);
+ --oh-color-content: var(--cool-grey-100);
+ --oh-color-content-2: var(--cool-grey-50);
+ --oh-background: var(--cool-grey-950);
+ --oh-foreground: var(--cool-grey-100);
+ --oh-surface: var(--cool-grey-925);
+ --oh-surface-foreground: var(--cool-grey-100);
+ --oh-surface-raised: var(--cool-grey-900); /* elevated within a panel */
+ --oh-surface-deep: var(--cool-grey-975); /* deep inset, context menus */
+ --oh-overlay: var(--cool-grey-925);
+ --oh-overlay-foreground: var(--cool-grey-100);
+ --oh-muted: var(--cool-grey-400);
+ --oh-text-secondary: var(--cool-grey-300); /* readable secondary text */
+ --oh-text-tertiary: var(--cool-grey-200); /* tertiary, slightly dimmer */
+ --oh-text-dim: var(--cool-grey-500); /* placeholders, very muted */
+ --oh-text-subtle: var(--cool-grey-600); /* subtle labels, breadcrumbs */
+ --oh-interactive-hover: var(--cool-grey-700); /* hover on mid surfaces (800 bg) */
+ --oh-interactive-hover-low: var(--cool-grey-900); /* hover on dark base (950 bg) */
+ --oh-interactive-active: var(--cool-grey-800); /* selected/active on dark base */
+ --oh-interactive-selected: var(--cool-grey-600); /* selected within a panel (on 800/925 bg) */
--oh-scrollbar: rgba(208, 217, 250, 0.3);
- --oh-default: #454545;
- --oh-default-foreground: #ecedee;
+ --oh-default: var(--cool-grey-800);
+ --oh-default-foreground: var(--cool-grey-100);
--oh-accent: #c9b974;
- --oh-accent-foreground: #0d0f11;
+ --oh-accent-foreground: var(--cool-grey-950);
--oh-success: #a5e75e;
- --oh-success-foreground: #0d0f11;
+ --oh-success-foreground: var(--cool-grey-950);
--oh-warning: #c9b974;
- --oh-warning-foreground: #0d0f11;
+ --oh-warning-foreground: var(--cool-grey-950);
--oh-danger: #e76a5e;
- --oh-danger-foreground: #f9fbfe;
- --oh-segment: #24272e;
- --oh-segment-foreground: #ecedee;
+ --oh-danger-foreground: var(--cool-grey-50);
+ --oh-segment: var(--cool-grey-925);
+ --oh-segment-foreground: var(--cool-grey-100);
--oh-border-width: 1px;
--oh-field-border-width: 1px;
- --oh-border: #717888;
+ --oh-border: var(--cool-grey-700);
+ --oh-border-input: var(--cool-grey-700); /* unified with --oh-border; same stroke weight everywhere */
+ --oh-border-subtle: var(--cool-grey-800); /* within-panel separators, list dividers */
--oh-separator: rgba(113, 120, 136, 0.5);
- --oh-focus: #c9b974;
- --oh-link: #ecedee;
+ --oh-focus: #ffffff;
+ --oh-link: var(--cool-grey-100);
--oh-radius: 5px;
--oh-field-radius: 5px;
--oh-surface-shadow: none;
@@ -70,6 +120,8 @@
--background: var(--oh-background);
--foreground: var(--oh-foreground);
--surface: var(--oh-surface);
+ --surface-raised: var(--oh-surface-raised);
+ --surface-deep: var(--oh-surface-deep);
--surface-foreground: var(--oh-surface-foreground);
--overlay: var(--oh-overlay);
--overlay-foreground: var(--oh-overlay-foreground);
@@ -101,7 +153,7 @@
}
.button-base {
- @apply bg-tertiary border border-neutral-600 rounded-xs;
+ @apply bg-tertiary border border-[var(--oh-border)] rounded-xs;
}
.skeleton {
@@ -184,7 +236,7 @@
/* Custom styles for contenteditable */
.chat-input:empty:before {
content: attr(data-placeholder);
- color: #959cb2;
+ color: var(--cool-grey-400);
pointer-events: none;
font-size: 16px;
font-weight: 400;
@@ -247,7 +299,7 @@
align-items: center;
gap: 8px;
font-size: 12px;
- color: #d0d9fa;
+ color: var(--cool-grey-200);
}
.file-preview .file-icon {
@@ -264,7 +316,7 @@
}
.file-preview .file-size {
- color: #959cb2;
+ color: var(--cool-grey-400);
font-size: 10px;
}
@@ -278,7 +330,7 @@
align-items: center;
justify-content: center;
cursor: pointer;
- color: #d0d9fa;
+ color: var(--cool-grey-200);
font-size: 10px;
transition: background-color 0.2s;
}
@@ -438,7 +490,7 @@
}
.git-external-link-icon {
- background: linear-gradient(90deg, rgba(69, 69, 69, 0) 0.35%, #454545 41.39%);
+ background: linear-gradient(90deg, rgba(69, 69, 69, 0) 0.35%, var(--cool-grey-800) 41.39%);
}
.api-configuration-modal {
@@ -468,7 +520,7 @@
background:
radial-gradient(circle at center, rgb(24 24 27 / 85%), transparent) -200%
50% / 200% 100% no-repeat,
- #f4f4f5;
+ var(--cool-grey-50);
}
/* CTA card gradient and shadow */
diff --git a/src/themes/color-themes.ts b/src/themes/color-themes.ts
new file mode 100644
index 0000000000..7c618839d7
--- /dev/null
+++ b/src/themes/color-themes.ts
@@ -0,0 +1,232 @@
+export type ColorThemeKey = "openhands-deepsea" | "openhands-neutral";
+
+export interface ColorThemeDefinition {
+ label: string;
+ /** Overrides for --cool-grey-* CSS custom properties (our semantic scale) */
+ scale: Record<string, string>;
+ /**
+ * Overrides for --heroui-* CSS custom properties.
+ * HeroUI stores colors as space-separated HSL channels ("H S% L%") so Tailwind
+ * utilities like bg-default-200 resolve to hsl(var(--heroui-default-200)).
+ * These vars are set by the heroui() plugin on :root, [data-theme=dark] at
+ * build time, so they must be overridden at the same or lower specificity
+ * from a later stylesheet to pick up theme changes at runtime.
+ */
+ heroui: Record<string, string>;
+}
+
+// HSL channel strings for the neutral grey palette (H=0, S=0%, L=hex/255*100)
+// prettier-ignore
+const NEUTRAL_HSL = {
+ 50: "0 0% 96.86%", // #F7F7F7
+ 100: "0 0% 92.55%", // #ECECEC
+ 200: "0 0% 86.27%", // #DCDCDC
+ 300: "0 0% 74.51%", // #BEBEBE
+ 400: "0 0% 59.22%", // #979797
+ 500: "0 0% 45.1%", // #737373
+ 600: "0 0% 33.73%", // #565656
+ 700: "0 0% 25.1%", // #404040
+ 800: "0 0% 19.22%", // #313131
+ 850: "0 0% 15.69%", // #282828
+ 900: "0 0% 12.55%", // #202020
+ 950: "0 0% 9.41%", // #181818
+ 975: "0 0% 6.27%", // #101010
+};
+
+export const COLOR_THEMES: Record<ColorThemeKey, ColorThemeDefinition> = {
+ "openhands-deepsea": {
+ label: "OpenHands-DeepSea",
+ // Matches the values already set by index.css; included so switching back
+ // from another theme restores the original palette explicitly.
+ scale: {
+ "--cool-grey-50": "#F7F9FC",
+ "--cool-grey-100": "#EEF2F7",
+ "--cool-grey-200": "#DCE3EE",
+ "--cool-grey-300": "#C3CDDC",
+ "--cool-grey-400": "#A3B0C4",
+ "--cool-grey-500": "#7E8A9E",
+ "--cool-grey-600": "#626D82",
+ "--cool-grey-700": "#4B5468",
+ "--cool-grey-800": "#383F50",
+ "--cool-grey-900": "#2C313F",
+ "--cool-grey-925": "#21252F",
+ "--cool-grey-950": "#0B0E14",
+ "--cool-grey-975": "#05070A",
+ },
+ // Values generated by heroui() from hero.ts — restore them explicitly when
+ // switching back from another theme.
+ heroui: {
+ "--heroui-background": "220 29.03% 6.08%",
+ "--heroui-background-foreground": "216 45.45% 97.84%",
+ "--heroui-foreground-50": "216 33.33% 2.94%",
+ "--heroui-foreground-100": "220 29.03% 6.08%",
+ "--heroui-foreground-200": "222.86 17.5% 15.69%",
+ "--heroui-foreground-300": "224.21 17.76% 20.98%",
+ "--heroui-foreground-400": "222.5 17.65% 26.67%",
+ "--heroui-foreground-500": "221.38 16.2% 35.1%",
+ "--heroui-foreground-600": "219.38 14.04% 44.71%",
+ "--heroui-foreground-700": "217.5 14.16% 55.69%",
+ "--heroui-foreground-800": "216.36 21.85% 70.39%",
+ "--heroui-foreground-900": "216 26.32% 81.37%",
+ "--heroui-foreground": "216 26.32% 81.37%",
+ "--heroui-content1": "222.86 17.5% 15.69%",
+ "--heroui-content1-foreground": "213.33 36% 95.1%",
+ "--heroui-content2": "224.21 17.76% 20.98%",
+ "--heroui-content2-foreground": "216.67 34.62% 89.8%",
+ "--heroui-content3": "222.5 17.65% 26.67%",
+ "--heroui-content3-foreground": "216 26.32% 81.37%",
+ "--heroui-content4": "221.38 16.2% 35.1%",
+ "--heroui-content4-foreground": "216.36 21.85% 70.39%",
+ "--heroui-default-50": "216 33.33% 2.94%",
+ "--heroui-default-100": "220 29.03% 6.08%",
+ "--heroui-default-200": "222.86 17.5% 15.69%",
+ "--heroui-default-300": "224.21 17.76% 20.98%",
+ "--heroui-default-400": "222.5 17.65% 26.67%",
+ "--heroui-default-500": "221.38 16.2% 35.1%",
+ "--heroui-default-600": "219.38 14.04% 44.71%",
+ "--heroui-default-700": "217.5 14.16% 55.69%",
+ "--heroui-default-800": "216.36 21.85% 70.39%",
+ "--heroui-default-900": "216 26.32% 81.37%",
+ "--heroui-default-foreground": "216 45.45% 97.84%",
+ "--heroui-default": "222.5 17.65% 26.67%",
+ },
+ },
+
+ "openhands-neutral": {
+ label: "OpenHands-Neutral",
+ scale: {
+ "--cool-grey-50": "#F7F7F7",
+ "--cool-grey-100": "#ECECEC",
+ "--cool-grey-200": "#DCDCDC",
+ "--cool-grey-300": "#BEBEBE",
+ "--cool-grey-400": "#979797",
+ "--cool-grey-500": "#737373",
+ "--cool-grey-600": "#565656",
+ "--cool-grey-700": "#404040",
+ "--cool-grey-800": "#313131",
+ "--cool-grey-900": "#282828",
+ "--cool-grey-925": "#202020",
+ "--cool-grey-950": "#181818",
+ "--cool-grey-975": "#101010",
+ },
+ // Each stop follows the same positional mapping as hero.ts:
+ // heroui-default-100 ← cool-grey-950 position ← neutral-950 (#181818)
+ // heroui-default-200 ← cool-grey-925 position ← neutral-900 (#202020)
+ // ...etc.
+ heroui: {
+ "--heroui-background": NEUTRAL_HSL[950],
+ "--heroui-background-foreground": NEUTRAL_HSL[50],
+ "--heroui-foreground-50": NEUTRAL_HSL[975],
+ "--heroui-foreground-100": NEUTRAL_HSL[950],
+ "--heroui-foreground-200": NEUTRAL_HSL[900],
+ "--heroui-foreground-300": NEUTRAL_HSL[850],
+ "--heroui-foreground-400": NEUTRAL_HSL[800],
+ "--heroui-foreground-500": NEUTRAL_HSL[700],
+ "--heroui-foreground-600": NEUTRAL_HSL[600],
+ "--heroui-foreground-700": NEUTRAL_HSL[500],
+ "--heroui-foreground-800": NEUTRAL_HSL[400],
+ "--heroui-foreground-900": NEUTRAL_HSL[300],
+ "--heroui-foreground": NEUTRAL_HSL[300],
+ "--heroui-content1": NEUTRAL_HSL[900],
+ "--heroui-content1-foreground": NEUTRAL_HSL[100],
+ "--heroui-content2": NEUTRAL_HSL[850],
+ "--heroui-content2-foreground": NEUTRAL_HSL[200],
+ "--heroui-content3": NEUTRAL_HSL[800],
+ "--heroui-content3-foreground": NEUTRAL_HSL[300],
+ "--heroui-content4": NEUTRAL_HSL[700],
+ "--heroui-content4-foreground": NEUTRAL_HSL[400],
+ "--heroui-default-50": NEUTRAL_HSL[975],
+ "--heroui-default-100": NEUTRAL_HSL[950],
+ "--heroui-default-200": NEUTRAL_HSL[900],
+ "--heroui-default-300": NEUTRAL_HSL[850],
+ "--heroui-default-400": NEUTRAL_HSL[800],
+ "--heroui-default-500": NEUTRAL_HSL[700],
+ "--heroui-default-600": NEUTRAL_HSL[600],
+ "--heroui-default-700": NEUTRAL_HSL[500],
+ "--heroui-default-800": NEUTRAL_HSL[400],
+ "--heroui-default-900": NEUTRAL_HSL[300],
+ "--heroui-default-foreground": NEUTRAL_HSL[50],
+ "--heroui-default": NEUTRAL_HSL[800],
+ },
+ },
+};
+
+export const DEFAULT_COLOR_THEME: ColorThemeKey = "openhands-neutral";
+
+export const AVAILABLE_COLOR_THEMES = Object.entries(COLOR_THEMES).map(
+ ([key, def]) => ({ key: key as ColorThemeKey, label: def.label }),
+);
+
+const STORAGE_KEY = "openhands-color-theme";
+
+/** Read the persisted theme key from localStorage, falling back to the default. */
+export function readPersistedColorTheme(): ColorThemeKey {
+ if (typeof window === "undefined") return DEFAULT_COLOR_THEME;
+ try {
+ const stored = window.localStorage.getItem(STORAGE_KEY);
+ if (stored && stored in COLOR_THEMES) return stored as ColorThemeKey;
+ } catch {
+ // ignore quota / privacy-mode failures
+ }
+ return DEFAULT_COLOR_THEME;
+}
+
+/** Persist the theme key to localStorage. */
+export function persistColorTheme(key: ColorThemeKey): void {
+ try {
+ window.localStorage.setItem(STORAGE_KEY, key);
+ } catch {
+ // ignore
+ }
+}
+
+const THEME_STYLE_TAG_ID = "oh-color-theme-override";
+
+/**
+ * Apply a theme by injecting (or replacing) a <style> tag that overrides
+ * both our custom --cool-grey-* primitives and HeroUI's --heroui-* tokens.
+ *
+ * Why a <style> tag:
+ * PostCSS transforms :root / body to [data-agent-server-ui], so --cool-grey-*
+ * is set on EVERY element carrying that attribute. A body inline-style only
+ * overrides body itself — inner matching elements keep the stylesheet value.
+ * Injecting a stylesheet appended to <head> wins on equal specificity because
+ * later sheets take precedence in the cascade.
+ *
+ * Why heroui variables:
+ * HeroUI stores colors as HSL channels in --heroui-* vars on [data-theme=dark].
+ * They reference their own token system and are unaffected by --cool-grey-*
+ * changes, so we override them from the same injected sheet.
+ */
+export function applyColorTheme(key: ColorThemeKey): void {
+ if (typeof document === "undefined") return;
+ const { scale, heroui } = COLOR_THEMES[key];
+
+ const scaleDecls = Object.entries(scale)
+ .map(([p, v]) => ` ${p}: ${v};`)
+ .join("\n");
+
+ const herouiDecls = Object.entries(heroui)
+ .map(([p, v]) => ` ${p}: ${v};`)
+ .join("\n");
+
+ // Target both selectors for heroui vars:
+ // [data-agent-server-ui] — covers document.body (portal destination) so
+ // portalled popover/listbox content inherits the overridden values.
+ // [data-theme=dark] — covers the inner AgentServerUIRoot wrapper so
+ // components scoped inside the dark theme wrapper also pick them up.
+ const css = [
+ `[data-agent-server-ui] {\n${scaleDecls}\n${herouiDecls}\n}`,
+ `[data-theme=dark] {\n${herouiDecls}\n}`,
+ ].join("\n");
+
+ let styleEl = document.getElementById(
+ THEME_STYLE_TAG_ID,
+ ) as HTMLStyleElement | null;
+ if (!styleEl) {
+ styleEl = document.createElement("style");
+ styleEl.id = THEME_STYLE_TAG_ID;
+ document.head.appendChild(styleEl);
+ }
+ styleEl.textContent = css;
+}
diff --git a/src/ui/card.tsx b/src/ui/card.tsx
index 758a03d6b7..392a2b28c6 100644
--- a/src/ui/card.tsx
+++ b/src/ui/card.tsx
@@ -5,17 +5,19 @@ import { cn } from "#/utils/utils";
const cardVariants = cva("flex", {
variants: {
theme: {
- default: "relative bg-[#26282D] border border-[#727987] rounded-xl",
- outlined: "relative bg-transparent border border-[#727987] rounded-xl",
- dark: "relative bg-black border border-[#242424] rounded-2xl",
+ default:
+ "relative bg-[var(--oh-surface)] border border-[var(--oh-border)] rounded-xl",
+ outlined:
+ "relative bg-transparent border border-[var(--oh-border)] rounded-xl",
+ dark: "relative bg-black border border-[var(--oh-border-subtle)] rounded-2xl",
},
hover: {
none: "",
elevated: [
"transition-all duration-200",
- "hover:bg-[linear-gradient(180deg,#0F0F0F_0%,#0A0A0A_100%)]",
- "hover:border-t-[#242424CC]",
- "hover:shadow-[0px_4px_6px_-4px_#0000001A,0px_10px_15px_-3px_#0000001A]",
+ "hover:bg-[linear-gradient(180deg,var(--cool-grey-950)_0%,var(--cool-grey-975)_100%)]",
+ "hover:border-t-[color-mix(in srgb, var(--cool-grey-925) 80%, transparent)]",
+ "hover:shadow-[0px_4px_6px_-4px_rgba(0, 0, 0, 0.1),0px_10px_15px_-3px_rgba(0, 0, 0, 0.1)]",
"before:absolute before:inset-0 before:rounded-2xl before:opacity-0 before:transition-opacity before:duration-200",
"before:bg-[radial-gradient(98.4%_116.11%_at_50%_0%,rgba(255,255,255,0.08)_0%,rgba(0,0,0,0)_70%)]",
"hover:before:opacity-100",
@@ -25,8 +27,8 @@ const cardVariants = cva("flex", {
gradient: {
none: "",
standard: [
- "bg-[#0A0A0A80] border-t-[#24242499]",
- "shadow-[0px_4px_6px_-4px_#0000001A,0px_10px_15px_-3px_#0000001A]",
+ "bg-[color-mix(in srgb, var(--cool-grey-975) 50%, transparent)] border-t-[color-mix(in srgb, var(--cool-grey-925) 60%, transparent)]",
+ "shadow-[0px_4px_6px_-4px_rgba(0, 0, 0, 0.1),0px_10px_15px_-3px_rgba(0, 0, 0, 0.1)]",
"before:absolute before:inset-0 before:rounded-2xl before:pointer-events-none",
"before:bg-[radial-gradient(144.32%_106.6%_at_50%_0%,rgba(255,255,255,0.14)_0%,rgba(0,0,0,0)_55%)]",
].join(" "),
diff --git a/src/ui/context-menu-icon-text.tsx b/src/ui/context-menu-icon-text.tsx
index 9790ee03c2..b3fa3543b5 100644
--- a/src/ui/context-menu-icon-text.tsx
+++ b/src/ui/context-menu-icon-text.tsx
@@ -16,7 +16,7 @@ export function ContextMenuIconText({
return (
<div
className={cn(
- "flex items-center justify-between p-2 hover:bg-[#5C5D62] rounded",
+ "flex items-center justify-between p-2 hover:bg-[var(--oh-interactive-hover)] rounded",
className,
)}
>
diff --git a/src/ui/divider.tsx b/src/ui/divider.tsx
index e8250f0398..9c17cfdfdb 100644
--- a/src/ui/divider.tsx
+++ b/src/ui/divider.tsx
@@ -7,7 +7,7 @@ const dividerVariants = cva("w-full", {
horizontal: "h-[1px]",
},
color: {
- light: "bg-[#5C5D62]",
+ light: "bg-[var(--oh-border)]",
},
size: {
thin: "h-[1px]",
diff --git a/src/ui/dropdown/clear-button.tsx b/src/ui/dropdown/clear-button.tsx
index 191e855a8d..98b62c05a8 100644
--- a/src/ui/dropdown/clear-button.tsx
+++ b/src/ui/dropdown/clear-button.tsx
@@ -11,7 +11,7 @@ export function ClearButton({ onClear }: ClearButtonProps) {
data-testid="dropdown-clear"
onClick={onClear}
aria-label="Clear selection"
- className="text-white hover:text-gray-300"
+ className="text-white hover:text-[var(--oh-text-tertiary)]"
>
<X size={14} />
</button>
diff --git a/src/ui/dropdown/dropdown-menu.tsx b/src/ui/dropdown/dropdown-menu.tsx
index f03ad35e98..a246ad719e 100644
--- a/src/ui/dropdown/dropdown-menu.tsx
+++ b/src/ui/dropdown/dropdown-menu.tsx
@@ -39,7 +39,7 @@ export function DropdownMenu({
>
<ul {...getMenuProps({ className: "p-0" })}>
{isOpen && filteredOptions.length === 0 && (
- <li className="px-2 py-2 text-sm text-gray-400 italic">
+ <li className="px-2 py-2 text-sm text-[var(--oh-muted)] italic">
{emptyMessage}
</li>
)}
@@ -55,8 +55,8 @@ export function DropdownMenu({
"text-white focus:outline-none font-normal",
"flex items-center gap-2",
selectedItem?.value === option.value
- ? "bg-[#C9B974] text-black"
- : "hover:bg-[#5C5D62]",
+ ? "bg-[var(--oh-interactive-selected)] text-white"
+ : "hover:bg-[var(--oh-interactive-hover)]",
),
})}
>
@@ -67,7 +67,7 @@ export function DropdownMenu({
</ul>
{isOpen && footer ? (
<>
- <div className="my-1 h-[1px] w-full bg-[#5C5D62]" />
+ <div className="my-1 h-[1px] w-full bg-[var(--oh-border)]" />
<div className="p-0">{footer}</div>
</>
) : null}
diff --git a/src/ui/dropdown/dropdown.tsx b/src/ui/dropdown/dropdown.tsx
index e0eded4e6a..7cec377937 100644
--- a/src/ui/dropdown/dropdown.tsx
+++ b/src/ui/dropdown/dropdown.tsx
@@ -164,7 +164,7 @@ export function Dropdown({
{!hideTrigger ? (
<div
className={cn(
- "bg-tertiary border border-[#717888] rounded w-full p-2",
+ "bg-tertiary border border-[var(--oh-border-input)] rounded w-full p-2",
"flex items-center gap-2",
isDisabled && "cursor-not-allowed opacity-60",
className,
diff --git a/src/ui/dropdown/loading-spinner.tsx b/src/ui/dropdown/loading-spinner.tsx
index 18f5fe3aa1..300743719f 100644
--- a/src/ui/dropdown/loading-spinner.tsx
+++ b/src/ui/dropdown/loading-spinner.tsx
@@ -1,7 +1,7 @@
export function LoadingSpinner() {
return (
<div
- className="animate-spin h-4 w-4 border-2 border-blue-500 border-t-transparent rounded-full"
+ className="animate-spin h-4 w-4 border-2 border-white/20 border-t-white rounded-full"
data-testid="dropdown-loading"
/>
);
diff --git a/src/ui/help-link.tsx b/src/ui/help-link.tsx
index b47730f4f2..7d7017b7fd 100644
--- a/src/ui/help-link.tsx
+++ b/src/ui/help-link.tsx
@@ -5,7 +5,7 @@ const helpLinkVariants = cva("", {
variants: {
size: {
default: "text-xs",
- settings: "text-sm text-[#A3A3A3] font-normal leading-5.5",
+ settings: "text-sm text-[var(--oh-muted)] font-normal leading-5.5",
},
linkColor: {
default: "",
diff --git a/src/ui/interactive-chip.tsx b/src/ui/interactive-chip.tsx
index 224e98d7d8..6edc3640dd 100644
--- a/src/ui/interactive-chip.tsx
+++ b/src/ui/interactive-chip.tsx
@@ -22,8 +22,8 @@ export function InteractiveChip({
data-testid={testId}
onClick={onClick}
className={cn(
- "bg-[#E4E4E4] px-2 rounded-[100px] text-black text-sm text-center font-semibold cursor-pointer",
- "hover:bg-[#D4D4D4] transition-colors",
+ "bg-[var(--oh-text-tertiary)] px-2 rounded-[100px] text-black text-sm text-center font-semibold cursor-pointer",
+ "hover:bg-[var(--oh-text-tertiary)] transition-colors",
className,
)}
>
diff --git a/src/ui/pre.tsx b/src/ui/pre.tsx
index 1070d2c23b..5da2a33be0 100644
--- a/src/ui/pre.tsx
+++ b/src/ui/pre.tsx
@@ -17,11 +17,11 @@ const preVariants = cva("whitespace-pre-wrap", {
},
background: {
default: "",
- dark: "bg-gray-900",
+ dark: "bg-base",
},
textColor: {
default: "",
- light: "text-gray-300",
+ light: "text-[var(--oh-text-tertiary)]",
},
padding: {
default: "",
diff --git a/src/ui/typography.tsx b/src/ui/typography.tsx
index 6e8dfbcaec..908a319de7 100644
--- a/src/ui/typography.tsx
+++ b/src/ui/typography.tsx
@@ -6,11 +6,11 @@ const typographyVariants = cva("", {
variant: {
h1: "text-[32px] text-white font-bold leading-5",
h2: "text-xl font-semibold leading-6 -tracking-[0.02em] text-white",
- h3: "text-sm font-semibold text-gray-300",
+ h3: "text-sm font-semibold text-[var(--oh-text-tertiary)]",
span: "text-sm font-normal text-white leading-5.5",
p: "text-sm font-normal text-white leading-5.5",
codeBlock:
- "font-mono text-sm leading-relaxed text-gray-300 whitespace-pre-wrap",
+ "font-mono text-sm leading-relaxed text-[var(--oh-text-tertiary)] whitespace-pre-wrap",
},
},
defaultVariants: {
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index fbbf582dba..1896831bbd 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -14,12 +14,12 @@ export const ASSET_FILE_TYPES = [
export const JSON_VIEW_THEME = {
base00: "transparent", // background
- base01: "#2d2d2d", // lighter background
- base02: "#4e4e4e", // selection background
- base03: "#6c6c6c", // comments, invisibles
- base04: "#969896", // dark foreground
- base05: "#d9d9d9", // default foreground
- base06: "#e8e8e8", // light foreground
+ base01: "var(--cool-grey-900)", // lighter background
+ base02: "var(--cool-grey-700)", // selection background
+ base03: "var(--cool-grey-600)", // comments, invisibles
+ base04: "var(--cool-grey-500)", // dark foreground
+ base05: "var(--cool-grey-200)", // default foreground
+ base06: "var(--cool-grey-100)", // light foreground
base07: "#ffffff", // light background
base08: "#ff5370", // variables, red
base09: "#f78c6c", // integers, orange
diff --git a/src/utils/custom-toast-handlers.tsx b/src/utils/custom-toast-handlers.tsx
index 44c847c697..0c86356158 100644
--- a/src/utils/custom-toast-handlers.tsx
+++ b/src/utils/custom-toast-handlers.tsx
@@ -4,8 +4,8 @@ import { calculateToastDuration } from "./toast-duration";
import i18n from "#/i18n";
const TOAST_STYLE: CSSProperties = {
- background: "#454545",
- border: "1px solid #717888",
+ background: "var(--oh-color-tertiary)",
+ border: "1px solid var(--oh-border-input)",
color: "#fff",
borderRadius: "4px",
maxWidth: "400px",
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 2b06f7897f..c5381cb66d 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -627,7 +627,7 @@ export const getStatusClassName = (status: string) => {
if (status === "in_progress") {
return "bg-yellow-800 text-yellow-200";
}
- return "bg-gray-700 text-gray-300";
+ return "bg-tertiary text-[var(--oh-text-tertiary)]";
};
/**