feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Emmanuek5 wants to merge 1 commit into from
Closed

feat: Theme system with light/dark/night modes + compact user messages #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
- **Light**: Light mode
- **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
- **Night**: Darkest mode (previously the only dark mode)
- **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
- Reduced padding (px-3 py-2 instead of px-4 py-3)
- Smaller text (13px instead of 14px)
- Action buttons (copy, rollback) and timestamp moved below the message card
- Actions only appear on hover for cleaner UI
49 changes: 25 additions & 24 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
const userImages = row.message.attachments ?? [];
const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
return (
<div className="flex justify-end">
<div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
<div className="group flex flex-col items-end">
<div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
{userImages.length > 0 && (
<div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
<div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
{userImages.map(
(image: NonNullable<TimelineMessage["attachments"]>[number]) => (
<div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
</div>
)}
{row.message.text && (
<pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
<pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
{row.message.text}
</pre>
)}
<div className="mt-1.5 flex items-center justify-end gap-2">
<div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
{row.message.text && <MessageCopyButton text={row.message.text} />}
{canRevertAgentWork && (
<Button
type="button"
size="xs"
variant="outline"
disabled={isRevertingCheckpoint || isWorking}
onClick={() => onRevertUserMessage(row.message.id)}
title="Revert to this message"
>
<Undo2Icon className="size-3" />
</Button>
)}
</div>
<p className="text-right text-[10px] text-muted-foreground/30">
{formatTimestamp(row.message.createdAt)}
</p>
</div>
</div>
<div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
{row.message.text && <MessageCopyButton text={row.message.text} />}
{canRevertAgentWork && (
<Button
type="button"
size="xs"
variant="outline"
disabled={isRevertingCheckpoint || isWorking}
onClick={() => onRevertUserMessage(row.message.id)}
title="Revert to this message"
>
<Undo2Icon className="size-3" />
</Button>
)}
<span
className="text-[10px] text-muted-foreground/40"
title={formatTimestamp(row.message.createdAt)}
>
{formatTimestamp(row.message.createdAt)}
</span>
</div>
</div>
);
Expand Down
103 changes: 82 additions & 21 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
ChevronRightIcon,
FolderIcon,
GitPullRequestIcon,
MoonIcon,
MoonStarIcon,
RocketIcon,
SquarePenIcon,
SunIcon,
TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
Menu,
MenuPopup,
MenuRadioGroup,
MenuRadioItem,
MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
);
}

function ThemeIcon({ theme }: { theme: Theme }) {
if (theme === "light") return <SunIcon className="size-3.5" />;
if (theme === "night") return <MoonStarIcon className="size-3.5" />;
return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
const { theme, setTheme } = useTheme();
const projects = useStore((store) => store.projects);
const threads = useStore((store) => store.threads);
const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
</div>
);

const themeSelector = (
<Menu>
<Tooltip>
<TooltipTrigger
render={
<MenuTrigger
render={
<button
type="button"
aria-label="Change theme"
className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
>
<ThemeIcon theme={theme} />
</button>
}
/>
}
/>
<TooltipPopup side="bottom">Theme</TooltipPopup>
</Tooltip>
<MenuPopup side="bottom" align="end" className="min-w-[140px]">
<MenuRadioGroup
value={theme}
onValueChange={(value) => setTheme(value as Theme)}
>
{THEME_OPTIONS.map((option) => (
<MenuRadioItem key={option.value} value={option.value}>
{option.label}
</MenuRadioItem>
))}
</MenuRadioGroup>
</MenuPopup>
</Menu>
);

return (
<>
{isElectron ? (
<>
<SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
<SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
{wordmark}
{showDesktopUpdateButton && (
<Tooltip>
<TooltipTrigger
render={
<button
type="button"
aria-label={desktopUpdateTooltip}
aria-disabled={desktopUpdateButtonDisabled || undefined}
disabled={desktopUpdateButtonDisabled}
className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
onClick={handleDesktopUpdateButtonClick}
>
<RocketIcon className="size-3.5" />
</button>
}
/>
<TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
</Tooltip>
)}
<div className="ml-auto mt-2 flex items-center gap-0.5">
{themeSelector}
{showDesktopUpdateButton && (
<Tooltip>
<TooltipTrigger
render={
<button
type="button"
aria-label={desktopUpdateTooltip}
aria-disabled={desktopUpdateButtonDisabled || undefined}
disabled={desktopUpdateButtonDisabled}
className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
onClick={handleDesktopUpdateButtonClick}
>
<RocketIcon className="size-3.5" />
</button>
}
/>
<TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
</Tooltip>
)}
</div>
</SidebarHeader>
</>
) : (
<SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
{wordmark}
<div className="flex items-center gap-2">
{wordmark}
<div className="ml-auto">
{themeSelector}
</div>
</div>
</SidebarHeader>
)}

Expand Down
39 changes: 34 additions & 5 deletions apps/web/src/hooks/useTheme.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
theme: Theme;
systemDark: boolean;
};

export const THEME_OPTIONS = [
{ value: "light", label: "Light", description: "Light mode" },
{ value: "dark", label: "Dark", description: "Balanced dark mode" },
{ value: "night", label: "Night", description: "Darkest mode" },

@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode

This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.

Useful? React with 👍 / 👎.

{ value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
const raw = localStorage.getItem(STORAGE_KEY);
if (raw === "light" || raw === "dark" || raw === "system") return raw;
if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
if (suppressTransitions) {
document.documentElement.classList.add("no-transitions");
}
const isDark = theme === "dark" || (theme === "system" && getSystemDark());
document.documentElement.classList.toggle("dark", isDark);

// Determine which CSS classes to apply
// - "dark" class = dark mode (middle ground)
// - "night" class = darkest mode
// - neither = light mode
const resolvedTheme = theme === "system"
? (getSystemDark() ? "dark" : "light")
: theme;

document.documentElement.classList.remove("dark", "night");
if (resolvedTheme === "dark") {
document.documentElement.classList.add("dark");
} else if (resolvedTheme === "night") {
document.documentElement.classList.add("dark", "night");
}

if (suppressTransitions) {
// Force a reflow so the no-transitions class takes effect before removal
// oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
const snapshot = useSyncExternalStore(subscribe, getSnapshot);
const theme = snapshot.theme;

// resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
// (night is treated as dark for icon/color purposes)
const resolvedTheme: "light" | "dark" =
theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
theme === "system"
? (snapshot.systemDark ? "dark" : "light")
: theme === "night"
? "dark"
: theme;

const setTheme = useCallback((next: Theme) => {
localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };
36 changes: 34 additions & 2 deletions apps/web/src/index.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
--animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
--warning: var(--color-amber-500);
--warning-foreground: var(--color-amber-700);

/* Dark mode - balanced dark, between light and night */
@variant dark {
color-scheme: dark;
--background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
--foreground: var(--color-neutral-100);
--card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
--card-foreground: var(--color-neutral-100);
--popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
--popover-foreground: var(--color-neutral-100);
--primary: oklch(0.588 0.217 264);
--primary-foreground: var(--color-white);
--secondary: --alpha(var(--color-white) / 5%);
--secondary-foreground: var(--color-neutral-100);
--muted: --alpha(var(--color-white) / 6%);
--muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
--accent: --alpha(var(--color-white) / 6%);
--accent-foreground: var(--color-neutral-100);
--destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
--border: --alpha(var(--color-white) / 8%);
--input: --alpha(var(--color-white) / 10%);
--ring: oklch(0.588 0.217 264);
--destructive-foreground: var(--color-red-400);
--info: var(--color-blue-500);
--info-foreground: var(--color-blue-400);
--success: var(--color-emerald-500);
--success-foreground: var(--color-emerald-400);
--warning: var(--color-amber-500);
--warning-foreground: var(--color-amber-400);
}

/* Night mode - darkest */
@variant night {
color-scheme: dark;
--background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
--foreground: var(--color-neutral-100);
--card: color-mix(in srgb, var(--background) 98%, var(--color-white));
--card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
--card-foreground: var(--color-neutral-100);
--popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
--popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
--popover-foreground: var(--color-neutral-100);
--primary: oklch(0.588 0.217 264);
--primary-foreground: var(--color-white);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Emmanuek5
wants to merge
1
commit into

from

 Closed


feat: Theme system with light/dark/night modes + compact user messages
#430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
 - **Light**: Light mode
 - **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
 - **Night**: Darkest mode (previously the only dark mode)
 - **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
 - Reduced padding (px-3 py-2 instead of px-4 py-3)
 - Smaller text (13px instead of 14px)
 - Action buttons (copy, rollback) and timestamp moved below the message card
 - Actions only appear on hover for cleaner UI

49 changes: 25 additions & 24 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
 const userImages = row.message.attachments ?? [];
 const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
 return (
 <div className="flex justify-end">
 <div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
 <div className="group flex flex-col items-end">
 <div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
 {userImages.length > 0 && (
 <div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
 <div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
 {userImages.map(
 (image: NonNullable<TimelineMessage["attachments"]>[number]) => (
 <div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
 </div>
 )}
 {row.message.text && (
 <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
 <pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
 {row.message.text}
 </pre>
 )}
 <div className="mt-1.5 flex items-center justify-end gap-2">
 <div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 </div>
 <p className="text-right text-[10px] text-muted-foreground/30">
 {formatTimestamp(row.message.createdAt)}
 </p>
 </div>
 </div>
 <div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 <span
 className="text-[10px] text-muted-foreground/40"
 title={formatTimestamp(row.message.createdAt)}
 >
 {formatTimestamp(row.message.createdAt)}
 </span>
 </div>
 </div>
 );
Expand Down

103 changes: 82 additions & 21 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
 ChevronRightIcon,
 FolderIcon,
 GitPullRequestIcon,
 MoonIcon,
 MoonStarIcon,
 RocketIcon,
 SquarePenIcon,
 SunIcon,
 TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
 Menu,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
 );
}

function ThemeIcon({ theme }: { theme: Theme }) {
 if (theme === "light") return <SunIcon className="size-3.5" />;
 if (theme === "night") return <MoonStarIcon className="size-3.5" />;
 return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
 const { theme, setTheme } = useTheme();
 const projects = useStore((store) => store.projects);
 const threads = useStore((store) => store.threads);
 const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
 </div>
 );

 const themeSelector = (
 <Menu>
 <Tooltip>
 <TooltipTrigger
 render={
 <MenuTrigger
 render={
 <button
 type="button"
 aria-label="Change theme"
 className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
 >
 <ThemeIcon theme={theme} />
 </button>
 }
 />
 }
 />
 <TooltipPopup side="bottom">Theme</TooltipPopup>
 </Tooltip>
 <MenuPopup side="bottom" align="end" className="min-w-[140px]">
 <MenuRadioGroup
 value={theme}
 onValueChange={(value) => setTheme(value as Theme)}
 >
 {THEME_OPTIONS.map((option) => (
 <MenuRadioItem key={option.value} value={option.value}>
 {option.label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuPopup>
 </Menu>
 );

 return (
 <>
 {isElectron ? (
 <>
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
 {wordmark}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 <div className="ml-auto mt-2 flex items-center gap-0.5">
 {themeSelector}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 </div>
 </SidebarHeader>
 </>
 ) : (
 <SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
 {wordmark}
 <div className="flex items-center gap-2">
 {wordmark}
 <div className="ml-auto">
 {themeSelector}
 </div>
 </div>
 </SidebarHeader>
 )}

Expand Down

39 changes: 34 additions & 5 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
 theme: Theme;
 systemDark: boolean;
};

export const THEME_OPTIONS = [
 { value: "light", label: "Light", description: "Light mode" },
 { value: "dark", label: "Dark", description: "Balanced dark mode" },
 { value: "night", label: "Night", description: "Darkest mode" },
@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode
This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.
Useful? React with 👍 / 👎.
 { value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
 const raw = localStorage.getItem(STORAGE_KEY);
 if (raw === "light" || raw === "dark" || raw === "system") return raw;
 if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
 return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 document.documentElement.classList.toggle("dark", isDark);

 // Determine which CSS classes to apply
 // - "dark" class = dark mode (middle ground)
 // - "night" class = darkest mode
 // - neither = light mode
 const resolvedTheme = theme === "system" 
 ? (getSystemDark() ? "dark" : "light") 
 : theme;

 document.documentElement.classList.remove("dark", "night");
 if (resolvedTheme === "dark") {
 document.documentElement.classList.add("dark");
 } else if (resolvedTheme === "night") {
 document.documentElement.classList.add("dark", "night");
 }

 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
 // oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
 const snapshot = useSyncExternalStore(subscribe, getSnapshot);
 const theme = snapshot.theme;

 // resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
 // (night is treated as dark for icon/color purposes)
 const resolvedTheme: "light" | "dark" =
 theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
 theme === "system" 
 ? (snapshot.systemDark ? "dark" : "light") 
 : theme === "night" 
 ? "dark" 
 : theme;

 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

 return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };

36 changes: 34 additions & 2 deletions
apps/web/src/index.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
 --animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-700);

 /* Dark mode - balanced dark, between light and night */
 @variant dark {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
 --secondary: --alpha(var(--color-white) / 5%);
 --secondary-foreground: var(--color-neutral-100);
 --muted: --alpha(var(--color-white) / 6%);
 --muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
 --accent: --alpha(var(--color-white) / 6%);
 --accent-foreground: var(--color-neutral-100);
 --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
 --border: --alpha(var(--color-white) / 8%);
 --input: --alpha(var(--color-white) / 10%);
 --ring: oklch(0.588 0.217 264);
 --destructive-foreground: var(--color-red-400);
 --info: var(--color-blue-500);
 --info-foreground: var(--color-blue-400);
 --success: var(--color-emerald-500);
 --success-foreground: var(--color-emerald-400);
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-400);
 }

 /* Night mode - darkest */
 @variant night {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Emmanuek5
wants to merge
1
commit into

from

 Closed


feat: Theme system with light/dark/night modes + compact user messages
#430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
 - **Light**: Light mode
 - **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
 - **Night**: Darkest mode (previously the only dark mode)
 - **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
 - Reduced padding (px-3 py-2 instead of px-4 py-3)
 - Smaller text (13px instead of 14px)
 - Action buttons (copy, rollback) and timestamp moved below the message card
 - Actions only appear on hover for cleaner UI

49 changes: 25 additions & 24 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
 const userImages = row.message.attachments ?? [];
 const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
 return (
 <div className="flex justify-end">
 <div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
 <div className="group flex flex-col items-end">
 <div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
 {userImages.length > 0 && (
 <div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
 <div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
 {userImages.map(
 (image: NonNullable<TimelineMessage["attachments"]>[number]) => (
 <div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
 </div>
 )}
 {row.message.text && (
 <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
 <pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
 {row.message.text}
 </pre>
 )}
 <div className="mt-1.5 flex items-center justify-end gap-2">
 <div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 </div>
 <p className="text-right text-[10px] text-muted-foreground/30">
 {formatTimestamp(row.message.createdAt)}
 </p>
 </div>
 </div>
 <div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 <span
 className="text-[10px] text-muted-foreground/40"
 title={formatTimestamp(row.message.createdAt)}
 >
 {formatTimestamp(row.message.createdAt)}
 </span>
 </div>
 </div>
 );
Expand Down

103 changes: 82 additions & 21 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
 ChevronRightIcon,
 FolderIcon,
 GitPullRequestIcon,
 MoonIcon,
 MoonStarIcon,
 RocketIcon,
 SquarePenIcon,
 SunIcon,
 TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
 Menu,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
 );
}

function ThemeIcon({ theme }: { theme: Theme }) {
 if (theme === "light") return <SunIcon className="size-3.5" />;
 if (theme === "night") return <MoonStarIcon className="size-3.5" />;
 return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
 const { theme, setTheme } = useTheme();
 const projects = useStore((store) => store.projects);
 const threads = useStore((store) => store.threads);
 const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
 </div>
 );

 const themeSelector = (
 <Menu>
 <Tooltip>
 <TooltipTrigger
 render={
 <MenuTrigger
 render={
 <button
 type="button"
 aria-label="Change theme"
 className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
 >
 <ThemeIcon theme={theme} />
 </button>
 }
 />
 }
 />
 <TooltipPopup side="bottom">Theme</TooltipPopup>
 </Tooltip>
 <MenuPopup side="bottom" align="end" className="min-w-[140px]">
 <MenuRadioGroup
 value={theme}
 onValueChange={(value) => setTheme(value as Theme)}
 >
 {THEME_OPTIONS.map((option) => (
 <MenuRadioItem key={option.value} value={option.value}>
 {option.label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuPopup>
 </Menu>
 );

 return (
 <>
 {isElectron ? (
 <>
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
 {wordmark}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 <div className="ml-auto mt-2 flex items-center gap-0.5">
 {themeSelector}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 </div>
 </SidebarHeader>
 </>
 ) : (
 <SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
 {wordmark}
 <div className="flex items-center gap-2">
 {wordmark}
 <div className="ml-auto">
 {themeSelector}
 </div>
 </div>
 </SidebarHeader>
 )}

Expand Down

39 changes: 34 additions & 5 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
 theme: Theme;
 systemDark: boolean;
};

export const THEME_OPTIONS = [
 { value: "light", label: "Light", description: "Light mode" },
 { value: "dark", label: "Dark", description: "Balanced dark mode" },
 { value: "night", label: "Night", description: "Darkest mode" },
@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode
This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.
Useful? React with 👍 / 👎.
 { value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
 const raw = localStorage.getItem(STORAGE_KEY);
 if (raw === "light" || raw === "dark" || raw === "system") return raw;
 if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
 return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 document.documentElement.classList.toggle("dark", isDark);

 // Determine which CSS classes to apply
 // - "dark" class = dark mode (middle ground)
 // - "night" class = darkest mode
 // - neither = light mode
 const resolvedTheme = theme === "system" 
 ? (getSystemDark() ? "dark" : "light") 
 : theme;

 document.documentElement.classList.remove("dark", "night");
 if (resolvedTheme === "dark") {
 document.documentElement.classList.add("dark");
 } else if (resolvedTheme === "night") {
 document.documentElement.classList.add("dark", "night");
 }

 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
 // oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
 const snapshot = useSyncExternalStore(subscribe, getSnapshot);
 const theme = snapshot.theme;

 // resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
 // (night is treated as dark for icon/color purposes)
 const resolvedTheme: "light" | "dark" =
 theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
 theme === "system" 
 ? (snapshot.systemDark ? "dark" : "light") 
 : theme === "night" 
 ? "dark" 
 : theme;

 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

 return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };

36 changes: 34 additions & 2 deletions
apps/web/src/index.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
 --animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-700);

 /* Dark mode - balanced dark, between light and night */
 @variant dark {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
 --secondary: --alpha(var(--color-white) / 5%);
 --secondary-foreground: var(--color-neutral-100);
 --muted: --alpha(var(--color-white) / 6%);
 --muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
 --accent: --alpha(var(--color-white) / 6%);
 --accent-foreground: var(--color-neutral-100);
 --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
 --border: --alpha(var(--color-white) / 8%);
 --input: --alpha(var(--color-white) / 10%);
 --ring: oklch(0.588 0.217 264);
 --destructive-foreground: var(--color-red-400);
 --info: var(--color-blue-500);
 --info-foreground: var(--color-blue-400);
 --success: var(--color-emerald-500);
 --success-foreground: var(--color-emerald-400);
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-400);
 }

 /* Night mode - darkest */
 @variant night {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Emmanuek5
wants to merge
1
commit into

from

 Closed


feat: Theme system with light/dark/night modes + compact user messages
#430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
 - **Light**: Light mode
 - **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
 - **Night**: Darkest mode (previously the only dark mode)
 - **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
 - Reduced padding (px-3 py-2 instead of px-4 py-3)
 - Smaller text (13px instead of 14px)
 - Action buttons (copy, rollback) and timestamp moved below the message card
 - Actions only appear on hover for cleaner UI

49 changes: 25 additions & 24 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
 const userImages = row.message.attachments ?? [];
 const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
 return (
 <div className="flex justify-end">
 <div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
 <div className="group flex flex-col items-end">
 <div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
 {userImages.length > 0 && (
 <div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
 <div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
 {userImages.map(
 (image: NonNullable<TimelineMessage["attachments"]>[number]) => (
 <div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
 </div>
 )}
 {row.message.text && (
 <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
 <pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
 {row.message.text}
 </pre>
 )}
 <div className="mt-1.5 flex items-center justify-end gap-2">
 <div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 </div>
 <p className="text-right text-[10px] text-muted-foreground/30">
 {formatTimestamp(row.message.createdAt)}
 </p>
 </div>
 </div>
 <div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 <span
 className="text-[10px] text-muted-foreground/40"
 title={formatTimestamp(row.message.createdAt)}
 >
 {formatTimestamp(row.message.createdAt)}
 </span>
 </div>
 </div>
 );
Expand Down

103 changes: 82 additions & 21 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
 ChevronRightIcon,
 FolderIcon,
 GitPullRequestIcon,
 MoonIcon,
 MoonStarIcon,
 RocketIcon,
 SquarePenIcon,
 SunIcon,
 TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
 Menu,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
 );
}

function ThemeIcon({ theme }: { theme: Theme }) {
 if (theme === "light") return <SunIcon className="size-3.5" />;
 if (theme === "night") return <MoonStarIcon className="size-3.5" />;
 return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
 const { theme, setTheme } = useTheme();
 const projects = useStore((store) => store.projects);
 const threads = useStore((store) => store.threads);
 const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
 </div>
 );

 const themeSelector = (
 <Menu>
 <Tooltip>
 <TooltipTrigger
 render={
 <MenuTrigger
 render={
 <button
 type="button"
 aria-label="Change theme"
 className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
 >
 <ThemeIcon theme={theme} />
 </button>
 }
 />
 }
 />
 <TooltipPopup side="bottom">Theme</TooltipPopup>
 </Tooltip>
 <MenuPopup side="bottom" align="end" className="min-w-[140px]">
 <MenuRadioGroup
 value={theme}
 onValueChange={(value) => setTheme(value as Theme)}
 >
 {THEME_OPTIONS.map((option) => (
 <MenuRadioItem key={option.value} value={option.value}>
 {option.label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuPopup>
 </Menu>
 );

 return (
 <>
 {isElectron ? (
 <>
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
 {wordmark}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 <div className="ml-auto mt-2 flex items-center gap-0.5">
 {themeSelector}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 </div>
 </SidebarHeader>
 </>
 ) : (
 <SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
 {wordmark}
 <div className="flex items-center gap-2">
 {wordmark}
 <div className="ml-auto">
 {themeSelector}
 </div>
 </div>
 </SidebarHeader>
 )}

Expand Down

39 changes: 34 additions & 5 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
 theme: Theme;
 systemDark: boolean;
};

export const THEME_OPTIONS = [
 { value: "light", label: "Light", description: "Light mode" },
 { value: "dark", label: "Dark", description: "Balanced dark mode" },
 { value: "night", label: "Night", description: "Darkest mode" },
@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode
This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.
Useful? React with 👍 / 👎.
 { value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
 const raw = localStorage.getItem(STORAGE_KEY);
 if (raw === "light" || raw === "dark" || raw === "system") return raw;
 if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
 return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 document.documentElement.classList.toggle("dark", isDark);

 // Determine which CSS classes to apply
 // - "dark" class = dark mode (middle ground)
 // - "night" class = darkest mode
 // - neither = light mode
 const resolvedTheme = theme === "system" 
 ? (getSystemDark() ? "dark" : "light") 
 : theme;

 document.documentElement.classList.remove("dark", "night");
 if (resolvedTheme === "dark") {
 document.documentElement.classList.add("dark");
 } else if (resolvedTheme === "night") {
 document.documentElement.classList.add("dark", "night");
 }

 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
 // oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
 const snapshot = useSyncExternalStore(subscribe, getSnapshot);
 const theme = snapshot.theme;

 // resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
 // (night is treated as dark for icon/color purposes)
 const resolvedTheme: "light" | "dark" =
 theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
 theme === "system" 
 ? (snapshot.systemDark ? "dark" : "light") 
 : theme === "night" 
 ? "dark" 
 : theme;

 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

 return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };

36 changes: 34 additions & 2 deletions
apps/web/src/index.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
 --animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-700);

 /* Dark mode - balanced dark, between light and night */
 @variant dark {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
 --secondary: --alpha(var(--color-white) / 5%);
 --secondary-foreground: var(--color-neutral-100);
 --muted: --alpha(var(--color-white) / 6%);
 --muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
 --accent: --alpha(var(--color-white) / 6%);
 --accent-foreground: var(--color-neutral-100);
 --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
 --border: --alpha(var(--color-white) / 8%);
 --input: --alpha(var(--color-white) / 10%);
 --ring: oklch(0.588 0.217 264);
 --destructive-foreground: var(--color-red-400);
 --info: var(--color-blue-500);
 --info-foreground: var(--color-blue-400);
 --success: var(--color-emerald-500);
 --success-foreground: var(--color-emerald-400);
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-400);
 }

 /* Night mode - darkest */
 @variant night {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Emmanuek5
wants to merge
1
commit into

from

 Closed


feat: Theme system with light/dark/night modes + compact user messages
#430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
 - **Light**: Light mode
 - **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
 - **Night**: Darkest mode (previously the only dark mode)
 - **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
 - Reduced padding (px-3 py-2 instead of px-4 py-3)
 - Smaller text (13px instead of 14px)
 - Action buttons (copy, rollback) and timestamp moved below the message card
 - Actions only appear on hover for cleaner UI

49 changes: 25 additions & 24 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
 const userImages = row.message.attachments ?? [];
 const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
 return (
 <div className="flex justify-end">
 <div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
 <div className="group flex flex-col items-end">
 <div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
 {userImages.length > 0 && (
 <div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
 <div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
 {userImages.map(
 (image: NonNullable<TimelineMessage["attachments"]>[number]) => (
 <div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
 </div>
 )}
 {row.message.text && (
 <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
 <pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
 {row.message.text}
 </pre>
 )}
 <div className="mt-1.5 flex items-center justify-end gap-2">
 <div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 </div>
 <p className="text-right text-[10px] text-muted-foreground/30">
 {formatTimestamp(row.message.createdAt)}
 </p>
 </div>
 </div>
 <div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 <span
 className="text-[10px] text-muted-foreground/40"
 title={formatTimestamp(row.message.createdAt)}
 >
 {formatTimestamp(row.message.createdAt)}
 </span>
 </div>
 </div>
 );
Expand Down

103 changes: 82 additions & 21 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
 ChevronRightIcon,
 FolderIcon,
 GitPullRequestIcon,
 MoonIcon,
 MoonStarIcon,
 RocketIcon,
 SquarePenIcon,
 SunIcon,
 TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
 Menu,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
 );
}

function ThemeIcon({ theme }: { theme: Theme }) {
 if (theme === "light") return <SunIcon className="size-3.5" />;
 if (theme === "night") return <MoonStarIcon className="size-3.5" />;
 return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
 const { theme, setTheme } = useTheme();
 const projects = useStore((store) => store.projects);
 const threads = useStore((store) => store.threads);
 const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
 </div>
 );

 const themeSelector = (
 <Menu>
 <Tooltip>
 <TooltipTrigger
 render={
 <MenuTrigger
 render={
 <button
 type="button"
 aria-label="Change theme"
 className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
 >
 <ThemeIcon theme={theme} />
 </button>
 }
 />
 }
 />
 <TooltipPopup side="bottom">Theme</TooltipPopup>
 </Tooltip>
 <MenuPopup side="bottom" align="end" className="min-w-[140px]">
 <MenuRadioGroup
 value={theme}
 onValueChange={(value) => setTheme(value as Theme)}
 >
 {THEME_OPTIONS.map((option) => (
 <MenuRadioItem key={option.value} value={option.value}>
 {option.label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuPopup>
 </Menu>
 );

 return (
 <>
 {isElectron ? (
 <>
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
 {wordmark}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 <div className="ml-auto mt-2 flex items-center gap-0.5">
 {themeSelector}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 </div>
 </SidebarHeader>
 </>
 ) : (
 <SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
 {wordmark}
 <div className="flex items-center gap-2">
 {wordmark}
 <div className="ml-auto">
 {themeSelector}
 </div>
 </div>
 </SidebarHeader>
 )}

Expand Down

39 changes: 34 additions & 5 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
 theme: Theme;
 systemDark: boolean;
};

export const THEME_OPTIONS = [
 { value: "light", label: "Light", description: "Light mode" },
 { value: "dark", label: "Dark", description: "Balanced dark mode" },
 { value: "night", label: "Night", description: "Darkest mode" },
@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode
This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.
Useful? React with 👍 / 👎.
 { value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
 const raw = localStorage.getItem(STORAGE_KEY);
 if (raw === "light" || raw === "dark" || raw === "system") return raw;
 if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
 return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 document.documentElement.classList.toggle("dark", isDark);

 // Determine which CSS classes to apply
 // - "dark" class = dark mode (middle ground)
 // - "night" class = darkest mode
 // - neither = light mode
 const resolvedTheme = theme === "system" 
 ? (getSystemDark() ? "dark" : "light") 
 : theme;

 document.documentElement.classList.remove("dark", "night");
 if (resolvedTheme === "dark") {
 document.documentElement.classList.add("dark");
 } else if (resolvedTheme === "night") {
 document.documentElement.classList.add("dark", "night");
 }

 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
 // oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
 const snapshot = useSyncExternalStore(subscribe, getSnapshot);
 const theme = snapshot.theme;

 // resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
 // (night is treated as dark for icon/color purposes)
 const resolvedTheme: "light" | "dark" =
 theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
 theme === "system" 
 ? (snapshot.systemDark ? "dark" : "light") 
 : theme === "night" 
 ? "dark" 
 : theme;

 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

 return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };

36 changes: 34 additions & 2 deletions
apps/web/src/index.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
 --animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-700);

 /* Dark mode - balanced dark, between light and night */
 @variant dark {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
 --secondary: --alpha(var(--color-white) / 5%);
 --secondary-foreground: var(--color-neutral-100);
 --muted: --alpha(var(--color-white) / 6%);
 --muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
 --accent: --alpha(var(--color-white) / 6%);
 --accent-foreground: var(--color-neutral-100);
 --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
 --border: --alpha(var(--color-white) / 8%);
 --input: --alpha(var(--color-white) / 10%);
 --ring: oklch(0.588 0.217 264);
 --destructive-foreground: var(--color-red-400);
 --info: var(--color-blue-500);
 --info-foreground: var(--color-blue-400);
 --success: var(--color-emerald-500);
 --success-foreground: var(--color-emerald-400);
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-400);
 }

 /* Night mode - darkest */
 @variant night {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Emmanuek5
wants to merge
1
commit into

from

 Closed


feat: Theme system with light/dark/night modes + compact user messages
#430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
 - **Light**: Light mode
 - **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
 - **Night**: Darkest mode (previously the only dark mode)
 - **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
 - Reduced padding (px-3 py-2 instead of px-4 py-3)
 - Smaller text (13px instead of 14px)
 - Action buttons (copy, rollback) and timestamp moved below the message card
 - Actions only appear on hover for cleaner UI

49 changes: 25 additions & 24 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
 const userImages = row.message.attachments ?? [];
 const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
 return (
 <div className="flex justify-end">
 <div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
 <div className="group flex flex-col items-end">
 <div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
 {userImages.length > 0 && (
 <div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
 <div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
 {userImages.map(
 (image: NonNullable<TimelineMessage["attachments"]>[number]) => (
 <div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
 </div>
 )}
 {row.message.text && (
 <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
 <pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
 {row.message.text}
 </pre>
 )}
 <div className="mt-1.5 flex items-center justify-end gap-2">
 <div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 </div>
 <p className="text-right text-[10px] text-muted-foreground/30">
 {formatTimestamp(row.message.createdAt)}
 </p>
 </div>
 </div>
 <div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 <span
 className="text-[10px] text-muted-foreground/40"
 title={formatTimestamp(row.message.createdAt)}
 >
 {formatTimestamp(row.message.createdAt)}
 </span>
 </div>
 </div>
 );
Expand Down

103 changes: 82 additions & 21 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
 ChevronRightIcon,
 FolderIcon,
 GitPullRequestIcon,
 MoonIcon,
 MoonStarIcon,
 RocketIcon,
 SquarePenIcon,
 SunIcon,
 TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
 Menu,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
 );
}

function ThemeIcon({ theme }: { theme: Theme }) {
 if (theme === "light") return <SunIcon className="size-3.5" />;
 if (theme === "night") return <MoonStarIcon className="size-3.5" />;
 return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
 const { theme, setTheme } = useTheme();
 const projects = useStore((store) => store.projects);
 const threads = useStore((store) => store.threads);
 const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
 </div>
 );

 const themeSelector = (
 <Menu>
 <Tooltip>
 <TooltipTrigger
 render={
 <MenuTrigger
 render={
 <button
 type="button"
 aria-label="Change theme"
 className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
 >
 <ThemeIcon theme={theme} />
 </button>
 }
 />
 }
 />
 <TooltipPopup side="bottom">Theme</TooltipPopup>
 </Tooltip>
 <MenuPopup side="bottom" align="end" className="min-w-[140px]">
 <MenuRadioGroup
 value={theme}
 onValueChange={(value) => setTheme(value as Theme)}
 >
 {THEME_OPTIONS.map((option) => (
 <MenuRadioItem key={option.value} value={option.value}>
 {option.label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuPopup>
 </Menu>
 );

 return (
 <>
 {isElectron ? (
 <>
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
 {wordmark}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 <div className="ml-auto mt-2 flex items-center gap-0.5">
 {themeSelector}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 </div>
 </SidebarHeader>
 </>
 ) : (
 <SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
 {wordmark}
 <div className="flex items-center gap-2">
 {wordmark}
 <div className="ml-auto">
 {themeSelector}
 </div>
 </div>
 </SidebarHeader>
 )}

Expand Down

39 changes: 34 additions & 5 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
 theme: Theme;
 systemDark: boolean;
};

export const THEME_OPTIONS = [
 { value: "light", label: "Light", description: "Light mode" },
 { value: "dark", label: "Dark", description: "Balanced dark mode" },
 { value: "night", label: "Night", description: "Darkest mode" },
@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode
This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.
Useful? React with 👍 / 👎.
 { value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
 const raw = localStorage.getItem(STORAGE_KEY);
 if (raw === "light" || raw === "dark" || raw === "system") return raw;
 if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
 return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 document.documentElement.classList.toggle("dark", isDark);

 // Determine which CSS classes to apply
 // - "dark" class = dark mode (middle ground)
 // - "night" class = darkest mode
 // - neither = light mode
 const resolvedTheme = theme === "system" 
 ? (getSystemDark() ? "dark" : "light") 
 : theme;

 document.documentElement.classList.remove("dark", "night");
 if (resolvedTheme === "dark") {
 document.documentElement.classList.add("dark");
 } else if (resolvedTheme === "night") {
 document.documentElement.classList.add("dark", "night");
 }

 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
 // oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
 const snapshot = useSyncExternalStore(subscribe, getSnapshot);
 const theme = snapshot.theme;

 // resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
 // (night is treated as dark for icon/color purposes)
 const resolvedTheme: "light" | "dark" =
 theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
 theme === "system" 
 ? (snapshot.systemDark ? "dark" : "light") 
 : theme === "night" 
 ? "dark" 
 : theme;

 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

 return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };

36 changes: 34 additions & 2 deletions
apps/web/src/index.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
 --animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-700);

 /* Dark mode - balanced dark, between light and night */
 @variant dark {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
 --secondary: --alpha(var(--color-white) / 5%);
 --secondary-foreground: var(--color-neutral-100);
 --muted: --alpha(var(--color-white) / 6%);
 --muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
 --accent: --alpha(var(--color-white) / 6%);
 --accent-foreground: var(--color-neutral-100);
 --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
 --border: --alpha(var(--color-white) / 8%);
 --input: --alpha(var(--color-white) / 10%);
 --ring: oklch(0.588 0.217 264);
 --destructive-foreground: var(--color-red-400);
 --info: var(--color-blue-500);
 --info-foreground: var(--color-blue-400);
 --success: var(--color-emerald-500);
 --success-foreground: var(--color-emerald-400);
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-400);
 }

 /* Night mode - darkest */
 @variant night {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Emmanuek5
wants to merge
1
commit into

from

 Closed


feat: Theme system with light/dark/night modes + compact user messages
#430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
 - **Light**: Light mode
 - **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
 - **Night**: Darkest mode (previously the only dark mode)
 - **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
 - Reduced padding (px-3 py-2 instead of px-4 py-3)
 - Smaller text (13px instead of 14px)
 - Action buttons (copy, rollback) and timestamp moved below the message card
 - Actions only appear on hover for cleaner UI

49 changes: 25 additions & 24 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
 const userImages = row.message.attachments ?? [];
 const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
 return (
 <div className="flex justify-end">
 <div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
 <div className="group flex flex-col items-end">
 <div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
 {userImages.length > 0 && (
 <div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
 <div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
 {userImages.map(
 (image: NonNullable<TimelineMessage["attachments"]>[number]) => (
 <div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
 </div>
 )}
 {row.message.text && (
 <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
 <pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
 {row.message.text}
 </pre>
 )}
 <div className="mt-1.5 flex items-center justify-end gap-2">
 <div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 </div>
 <p className="text-right text-[10px] text-muted-foreground/30">
 {formatTimestamp(row.message.createdAt)}
 </p>
 </div>
 </div>
 <div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 <span
 className="text-[10px] text-muted-foreground/40"
 title={formatTimestamp(row.message.createdAt)}
 >
 {formatTimestamp(row.message.createdAt)}
 </span>
 </div>
 </div>
 );
Expand Down

103 changes: 82 additions & 21 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
 ChevronRightIcon,
 FolderIcon,
 GitPullRequestIcon,
 MoonIcon,
 MoonStarIcon,
 RocketIcon,
 SquarePenIcon,
 SunIcon,
 TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
 Menu,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
 );
}

function ThemeIcon({ theme }: { theme: Theme }) {
 if (theme === "light") return <SunIcon className="size-3.5" />;
 if (theme === "night") return <MoonStarIcon className="size-3.5" />;
 return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
 const { theme, setTheme } = useTheme();
 const projects = useStore((store) => store.projects);
 const threads = useStore((store) => store.threads);
 const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
 </div>
 );

 const themeSelector = (
 <Menu>
 <Tooltip>
 <TooltipTrigger
 render={
 <MenuTrigger
 render={
 <button
 type="button"
 aria-label="Change theme"
 className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
 >
 <ThemeIcon theme={theme} />
 </button>
 }
 />
 }
 />
 <TooltipPopup side="bottom">Theme</TooltipPopup>
 </Tooltip>
 <MenuPopup side="bottom" align="end" className="min-w-[140px]">
 <MenuRadioGroup
 value={theme}
 onValueChange={(value) => setTheme(value as Theme)}
 >
 {THEME_OPTIONS.map((option) => (
 <MenuRadioItem key={option.value} value={option.value}>
 {option.label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuPopup>
 </Menu>
 );

 return (
 <>
 {isElectron ? (
 <>
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
 {wordmark}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 <div className="ml-auto mt-2 flex items-center gap-0.5">
 {themeSelector}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 </div>
 </SidebarHeader>
 </>
 ) : (
 <SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
 {wordmark}
 <div className="flex items-center gap-2">
 {wordmark}
 <div className="ml-auto">
 {themeSelector}
 </div>
 </div>
 </SidebarHeader>
 )}

Expand Down

39 changes: 34 additions & 5 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
 theme: Theme;
 systemDark: boolean;
};

export const THEME_OPTIONS = [
 { value: "light", label: "Light", description: "Light mode" },
 { value: "dark", label: "Dark", description: "Balanced dark mode" },
 { value: "night", label: "Night", description: "Darkest mode" },
@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode
This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.
Useful? React with 👍 / 👎.
 { value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
 const raw = localStorage.getItem(STORAGE_KEY);
 if (raw === "light" || raw === "dark" || raw === "system") return raw;
 if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
 return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 document.documentElement.classList.toggle("dark", isDark);

 // Determine which CSS classes to apply
 // - "dark" class = dark mode (middle ground)
 // - "night" class = darkest mode
 // - neither = light mode
 const resolvedTheme = theme === "system" 
 ? (getSystemDark() ? "dark" : "light") 
 : theme;

 document.documentElement.classList.remove("dark", "night");
 if (resolvedTheme === "dark") {
 document.documentElement.classList.add("dark");
 } else if (resolvedTheme === "night") {
 document.documentElement.classList.add("dark", "night");
 }

 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
 // oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
 const snapshot = useSyncExternalStore(subscribe, getSnapshot);
 const theme = snapshot.theme;

 // resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
 // (night is treated as dark for icon/color purposes)
 const resolvedTheme: "light" | "dark" =
 theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
 theme === "system" 
 ? (snapshot.systemDark ? "dark" : "light") 
 : theme === "night" 
 ? "dark" 
 : theme;

 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

 return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };

36 changes: 34 additions & 2 deletions
apps/web/src/index.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
 --animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-700);

 /* Dark mode - balanced dark, between light and night */
 @variant dark {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
 --secondary: --alpha(var(--color-white) / 5%);
 --secondary-foreground: var(--color-neutral-100);
 --muted: --alpha(var(--color-white) / 6%);
 --muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
 --accent: --alpha(var(--color-white) / 6%);
 --accent-foreground: var(--color-neutral-100);
 --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
 --border: --alpha(var(--color-white) / 8%);
 --input: --alpha(var(--color-white) / 10%);
 --ring: oklch(0.588 0.217 264);
 --destructive-foreground: var(--color-red-400);
 --info: var(--color-blue-500);
 --info-foreground: var(--color-blue-400);
 --success: var(--color-emerald-500);
 --success-foreground: var(--color-emerald-400);
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-400);
 }

 /* Night mode - darkest */
 @variant night {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: Theme system with light/dark/night modes + compact user messages#430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Emmanuek5
wants to merge
1
commit into

from

 Closed


feat: Theme system with light/dark/night modes + compact user messages
#430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 20 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
# Changelog

## [Unreleased]

### Added
- **Theme selector**: Added theme toggle button in sidebar with three theme options:
 - **Light**: Light mode
 - **Dark**: Balanced dark mode with brighter backgrounds and more visible UI elements
 - **Night**: Darkest mode (previously the only dark mode)
 - **System**: Follow system preference

### Changed
- **apps/web/src/hooks/useTheme.ts**: Extended theme system to support `light`, `dark`, `night`, and `system` themes. Added `THEME_OPTIONS` export and `Theme` type export.
- **apps/web/src/index.css**: Added CSS variables for the new "dark" middle-ground theme and renamed existing dark theme to "night". The dark theme now uses brighter backgrounds (neutral-800/900 vs neutral-950) and more visible borders/accents.
- **apps/web/src/components/Sidebar.tsx**: Added theme selector menu with icon (Sun/Moon/MoonStar) in the sidebar header, available in both desktop and web modes.
- **apps/web/src/components/ChatView.tsx**: Made user messages more compact:
 - Reduced padding (px-3 py-2 instead of px-4 py-3)
 - Smaller text (13px instead of 14px)
 - Action buttons (copy, rollback) and timestamp moved below the message card
 - Actions only appear on hover for cleaner UI

49 changes: 25 additions & 24 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5047,10 +5047,10 @@ const MessagesTimeline = memo(function MessagesTimeline({
 const userImages = row.message.attachments ?? [];
 const canRevertAgentWork = revertTurnCountByUserMessageId.has(row.message.id);
 return (
 <div className="flex justify-end">
 <div className="group relative max-w-[80%] rounded-2xl rounded-br-sm border border-border bg-secondary px-4 py-3">
 <div className="group flex flex-col items-end">
 <div className="max-w-[80%] rounded-xl rounded-br-sm border border-border bg-secondary px-3 py-2">
 {userImages.length > 0 && (
 <div className="mb-2 grid max-w-[420px] grid-cols-2 gap-2">
 <div className="mb-1.5 grid max-w-[420px] grid-cols-2 gap-2">
 {userImages.map(
 (image: NonNullable<TimelineMessage["attachments"]>[number]) => (
 <div
Expand DownExpand Up@@ -5087,30 +5087,31 @@ const MessagesTimeline = memo(function MessagesTimeline({
 </div>
 )}
 {row.message.text && (
 <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
 <pre className="whitespace-pre-wrap wrap-break-word text-[13px] leading-normal text-foreground">
 {row.message.text}
 </pre>
 )}
 <div className="mt-1.5 flex items-center justify-end gap-2">
 <div className="flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 </div>
 <p className="text-right text-[10px] text-muted-foreground/30">
 {formatTimestamp(row.message.createdAt)}
 </p>
 </div>
 </div>
 <div className="mt-1 flex items-center gap-1.5 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100">
 {row.message.text && <MessageCopyButton text={row.message.text} />}
 {canRevertAgentWork && (
 <Button
 type="button"
 size="xs"
 variant="outline"
 disabled={isRevertingCheckpoint || isWorking}
 onClick={() => onRevertUserMessage(row.message.id)}
 title="Revert to this message"
 >
 <Undo2Icon className="size-3" />
 </Button>
 )}
 <span
 className="text-[10px] text-muted-foreground/40"
 title={formatTimestamp(row.message.createdAt)}
 >
 {formatTimestamp(row.message.createdAt)}
 </span>
 </div>
 </div>
 );
Expand Down

103 changes: 82 additions & 21 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,11 @@ import {
 ChevronRightIcon,
 FolderIcon,
 GitPullRequestIcon,
 MoonIcon,
 MoonStarIcon,
 RocketIcon,
 SquarePenIcon,
 SunIcon,
 TerminalIcon,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
Expand DownExpand Up@@ -60,6 +63,14 @@ import {
} from "./ui/sidebar";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
import { isNonEmpty as isNonEmptyString } from "effect/String";
import { useTheme, THEME_OPTIONS, type Theme } from "../hooks/useTheme";
import {
 Menu,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuTrigger,
} from "./ui/menu";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand DownExpand Up@@ -257,7 +268,14 @@ function ProjectFavicon({ cwd }: { cwd: string }) {
 );
}

function ThemeIcon({ theme }: { theme: Theme }) {
 if (theme === "light") return <SunIcon className="size-3.5" />;
 if (theme === "night") return <MoonStarIcon className="size-3.5" />;
 return <MoonIcon className="size-3.5" />;
}

export default function Sidebar() {
 const { theme, setTheme } = useTheme();
 const projects = useStore((store) => store.projects);
 const threads = useStore((store) => store.threads);
 const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand DownExpand Up@@ -990,36 +1008,79 @@ export default function Sidebar() {
 </div>
 );

 const themeSelector = (
 <Menu>
 <Tooltip>
 <TooltipTrigger
 render={
 <MenuTrigger
 render={
 <button
 type="button"
 aria-label="Change theme"
 className="inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
 >
 <ThemeIcon theme={theme} />
 </button>
 }
 />
 }
 />
 <TooltipPopup side="bottom">Theme</TooltipPopup>
 </Tooltip>
 <MenuPopup side="bottom" align="end" className="min-w-[140px]">
 <MenuRadioGroup
 value={theme}
 onValueChange={(value) => setTheme(value as Theme)}
 >
 {THEME_OPTIONS.map((option) => (
 <MenuRadioItem key={option.value} value={option.value}>
 {option.label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuPopup>
 </Menu>
 );

 return (
 <>
 {isElectron ? (
 <>
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-2 px-4 py-0 pl-[82px]">
 <SidebarHeader className="drag-region h-[52px] flex-row items-center gap-1 px-4 py-0 pl-[82px]">
 {wordmark}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 ml-auto mt-2 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 <div className="ml-auto mt-2 flex items-center gap-0.5">
 {themeSelector}
 {showDesktopUpdateButton && (
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 type="button"
 aria-label={desktopUpdateTooltip}
 aria-disabled={desktopUpdateButtonDisabled || undefined}
 disabled={desktopUpdateButtonDisabled}
 className={`inline-flex size-7 items-center justify-center rounded-md text-muted-foreground transition-colors ${desktopUpdateButtonInteractivityClasses} ${desktopUpdateButtonClasses}`}
 onClick={handleDesktopUpdateButtonClick}
 >
 <RocketIcon className="size-3.5" />
 </button>
 }
 />
 <TooltipPopup side="bottom">{desktopUpdateTooltip}</TooltipPopup>
 </Tooltip>
 )}
 </div>
 </SidebarHeader>
 </>
 ) : (
 <SidebarHeader className="gap-3 px-3 py-2 sm:gap-2.5 sm:px-4 sm:py-3">
 {wordmark}
 <div className="flex items-center gap-2">
 {wordmark}
 <div className="ml-auto">
 {themeSelector}
 </div>
 </div>
 </SidebarHeader>
 )}

Expand Down

39 changes: 34 additions & 5 deletions
apps/web/src/hooks/useTheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
import { useCallback, useEffect, useSyncExternalStore } from "react";

type Theme = "light" | "dark" | "system";
type Theme = "light" | "dark" | "night" | "system";
type ThemeSnapshot = {
 theme: Theme;
 systemDark: boolean;
};

export const THEME_OPTIONS = [
 { value: "light", label: "Light", description: "Light mode" },
 { value: "dark", label: "Dark", description: "Balanced dark mode" },
 { value: "night", label: "Night", description: "Darkest mode" },
@chatgpt-codex-connectorchatgpt-codex-connectorBotMar 7, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update settings theme options for the new night mode
This change introduces a persisted night theme choice, but the settings UI still hardcodes only system, light, and dark (apps/web/src/routes/_chat.settings.tsx lines 25-41), so once a user selects Night from the new sidebar picker, no option is shown as selected and the page reports the active theme as dark via resolvedTheme. That leaves the appearance state inconsistent across surfaces and can lead users to unintentionally reset their preference; the settings page should be driven by the same theme option source.
Useful? React with 👍 / 👎.
 { value: "system", label: "System", description: "Follow system preference" },
] as const;

const STORAGE_KEY = "t3code:theme";
const MEDIA_QUERY = "(prefers-color-scheme: dark)";

Expand All@@ -21,16 +28,30 @@ function getSystemDark(): boolean {

function getStored(): Theme {
 const raw = localStorage.getItem(STORAGE_KEY);
 if (raw === "light" || raw === "dark" || raw === "system") return raw;
 if (raw === "light" || raw === "dark" || raw === "night" || raw === "system") return raw;
 return "system";
}

function applyTheme(theme: Theme, suppressTransitions = false) {
 if (suppressTransitions) {
 document.documentElement.classList.add("no-transitions");
 }
 const isDark = theme === "dark" || (theme === "system" && getSystemDark());
 document.documentElement.classList.toggle("dark", isDark);

 // Determine which CSS classes to apply
 // - "dark" class = dark mode (middle ground)
 // - "night" class = darkest mode
 // - neither = light mode
 const resolvedTheme = theme === "system" 
 ? (getSystemDark() ? "dark" : "light") 
 : theme;

 document.documentElement.classList.remove("dark", "night");
 if (resolvedTheme === "dark") {
 document.documentElement.classList.add("dark");
 } else if (resolvedTheme === "night") {
 document.documentElement.classList.add("dark", "night");
 }

 if (suppressTransitions) {
 // Force a reflow so the no-transitions class takes effect before removal
 // oxlint-disable-next-line no-unused-expressions
Expand DownExpand Up@@ -87,8 +108,14 @@ export function useTheme() {
 const snapshot = useSyncExternalStore(subscribe, getSnapshot);
 const theme = snapshot.theme;

 // resolvedTheme returns "light" or "dark" for components that only care about light/dark distinction
 // (night is treated as dark for icon/color purposes)
 const resolvedTheme: "light" | "dark" =
 theme === "system" ? (snapshot.systemDark ? "dark" : "light") : theme;
 theme === "system" 
 ? (snapshot.systemDark ? "dark" : "light") 
 : theme === "night" 
 ? "dark" 
 : theme;

 const setTheme = useCallback((next: Theme) => {
 localStorage.setItem(STORAGE_KEY, next);
Expand All@@ -103,3 +130,5 @@ export function useTheme() {

 return { theme, setTheme, resolvedTheme } as const;
}

export type { Theme };

36 changes: 34 additions & 2 deletions
apps/web/src/index.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
@import "tailwindcss";

@custom-variant dark (&:is(.dark, .dark *));
@custom-variant night (&:is(.night, .night *));

@theme inline {
 --animate-skeleton: skeleton 2s -1s infinite linear;
Expand DownExpand Up@@ -90,13 +91,44 @@
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-700);

 /* Dark mode - balanced dark, between light and night */
 @variant dark {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-900) 97%, var(--color-black));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--color-neutral-900) 92%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--color-neutral-900) 94%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
 --secondary: --alpha(var(--color-white) / 5%);
 --secondary-foreground: var(--color-neutral-100);
 --muted: --alpha(var(--color-white) / 6%);
 --muted-foreground: color-mix(in srgb, var(--color-neutral-400) 90%, var(--color-white));
 --accent: --alpha(var(--color-white) / 6%);
 --accent-foreground: var(--color-neutral-100);
 --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
 --border: --alpha(var(--color-white) / 8%);
 --input: --alpha(var(--color-white) / 10%);
 --ring: oklch(0.588 0.217 264);
 --destructive-foreground: var(--color-red-400);
 --info: var(--color-blue-500);
 --info-foreground: var(--color-blue-400);
 --success: var(--color-emerald-500);
 --success-foreground: var(--color-emerald-400);
 --warning: var(--color-amber-500);
 --warning-foreground: var(--color-amber-400);
 }

 /* Night mode - darkest */
 @variant night {
 color-scheme: dark;
 --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
 --foreground: var(--color-neutral-100);
 --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --card: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --card-foreground: var(--color-neutral-100);
 --popover: color-mix(in srgb, var(--background) 98%, var(--color-white));
 --popover: color-mix(in srgb, var(--color-neutral-950) 98%, var(--color-white));
 --popover-foreground: var(--color-neutral-100);
 --primary: oklch(0.588 0.217 264);
 --primary-foreground: var(--color-white);
Expand Down