feat: add Rose/Amber/Teal color themes, default to Ocean + Square
Adds three new color themes alongside the existing Stalwart/Ocean/ Forest/Violet set so more people can find one they like, and switches the out-of-the-box defaults to Ocean + square corners instead of the neutral Stalwart theme + rounded corners (existing users' saved preferences are untouched, this only changes what a fresh install starts with). Verified in the browser: all three new themes render with legible primary-foreground contrast in both light and dark mode, and the pre-hydration flash-prevention script in main.tsx (which reads localStorage before React mounts) now recognizes the new theme names. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
7a96fa6786
commit
8c1e826d63
@@ -16,9 +16,12 @@
|
|||||||
"switchToDark": "Switch to dark mode",
|
"switchToDark": "Switch to dark mode",
|
||||||
"switchToLight": "Switch to light mode",
|
"switchToLight": "Switch to light mode",
|
||||||
"theme": {
|
"theme": {
|
||||||
|
"amber": "Amber",
|
||||||
"forest": "Forest",
|
"forest": "Forest",
|
||||||
"ocean": "Ocean",
|
"ocean": "Ocean",
|
||||||
|
"rose": "Rose",
|
||||||
"stalwart": "Stalwart",
|
"stalwart": "Stalwart",
|
||||||
|
"teal": "Teal",
|
||||||
"violet": "Violet"
|
"violet": "Violet"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
+117
@@ -220,6 +220,123 @@
|
|||||||
--chart-1: 263 70% 66%;
|
--chart-1: 263 70% 66%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:root[data-theme='rose'] {
|
||||||
|
--foreground: oklch(0.145 0.02 12);
|
||||||
|
--content-background: oklch(0.965 0.008 12);
|
||||||
|
--primary: oklch(0.577 0.245 12);
|
||||||
|
--primary-foreground: oklch(0.985 0.002 12);
|
||||||
|
--secondary: oklch(0.955 0.012 12);
|
||||||
|
--secondary-foreground: oklch(0.3 0.035 12);
|
||||||
|
--muted: oklch(0.935 0.01 12);
|
||||||
|
--muted-foreground: oklch(0.556 0.022 12);
|
||||||
|
--accent: oklch(0.94 0.018 12);
|
||||||
|
--accent-foreground: oklch(0.3 0.035 12);
|
||||||
|
--border: oklch(0.912 0.012 12);
|
||||||
|
--input: oklch(0.912 0.012 12);
|
||||||
|
--ring: oklch(0.577 0.245 12);
|
||||||
|
--chart-1: 350 83% 55%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dark[data-theme='rose'] {
|
||||||
|
--background: oklch(0.152 0.014 12);
|
||||||
|
--foreground: oklch(0.96 0.008 12);
|
||||||
|
--card: oklch(0.235 0.02 12);
|
||||||
|
--card-foreground: oklch(0.96 0.008 12);
|
||||||
|
--popover: oklch(0.208 0.018 12);
|
||||||
|
--popover-foreground: oklch(0.96 0.008 12);
|
||||||
|
--content-background: oklch(0.122 0.012 12);
|
||||||
|
--primary: oklch(0.704 0.191 12);
|
||||||
|
--primary-foreground: oklch(0.21 0.03 12);
|
||||||
|
--secondary: oklch(0.28 0.022 12);
|
||||||
|
--secondary-foreground: oklch(0.96 0.008 12);
|
||||||
|
--muted: oklch(0.28 0.022 12);
|
||||||
|
--muted-foreground: oklch(0.715 0.022 12);
|
||||||
|
--accent: oklch(0.305 0.028 12);
|
||||||
|
--accent-foreground: oklch(0.96 0.008 12);
|
||||||
|
--border: oklch(0.29 0.024 12);
|
||||||
|
--input: oklch(0.29 0.024 12);
|
||||||
|
--ring: oklch(0.704 0.191 12);
|
||||||
|
--chart-1: 350 80% 66%;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme='amber'] {
|
||||||
|
--foreground: oklch(0.145 0.02 70);
|
||||||
|
--content-background: oklch(0.965 0.008 70);
|
||||||
|
--primary: oklch(0.65 0.16 70);
|
||||||
|
--primary-foreground: oklch(0.2 0.02 70);
|
||||||
|
--secondary: oklch(0.955 0.012 70);
|
||||||
|
--secondary-foreground: oklch(0.3 0.035 70);
|
||||||
|
--muted: oklch(0.935 0.01 70);
|
||||||
|
--muted-foreground: oklch(0.556 0.022 70);
|
||||||
|
--accent: oklch(0.94 0.018 70);
|
||||||
|
--accent-foreground: oklch(0.3 0.035 70);
|
||||||
|
--border: oklch(0.912 0.012 70);
|
||||||
|
--input: oklch(0.912 0.012 70);
|
||||||
|
--ring: oklch(0.65 0.16 70);
|
||||||
|
--chart-1: 43 96% 56%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dark[data-theme='amber'] {
|
||||||
|
--background: oklch(0.152 0.014 70);
|
||||||
|
--foreground: oklch(0.96 0.008 70);
|
||||||
|
--card: oklch(0.235 0.02 70);
|
||||||
|
--card-foreground: oklch(0.96 0.008 70);
|
||||||
|
--popover: oklch(0.208 0.018 70);
|
||||||
|
--popover-foreground: oklch(0.96 0.008 70);
|
||||||
|
--content-background: oklch(0.122 0.012 70);
|
||||||
|
--primary: oklch(0.75 0.17 75);
|
||||||
|
--primary-foreground: oklch(0.2 0.02 70);
|
||||||
|
--secondary: oklch(0.28 0.022 70);
|
||||||
|
--secondary-foreground: oklch(0.96 0.008 70);
|
||||||
|
--muted: oklch(0.28 0.022 70);
|
||||||
|
--muted-foreground: oklch(0.715 0.022 70);
|
||||||
|
--accent: oklch(0.305 0.028 70);
|
||||||
|
--accent-foreground: oklch(0.96 0.008 70);
|
||||||
|
--border: oklch(0.29 0.024 70);
|
||||||
|
--input: oklch(0.29 0.024 70);
|
||||||
|
--ring: oklch(0.75 0.17 75);
|
||||||
|
--chart-1: 43 96% 62%;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme='teal'] {
|
||||||
|
--foreground: oklch(0.145 0.02 195);
|
||||||
|
--content-background: oklch(0.965 0.008 195);
|
||||||
|
--primary: oklch(0.55 0.13 195);
|
||||||
|
--primary-foreground: oklch(0.985 0.002 195);
|
||||||
|
--secondary: oklch(0.955 0.012 195);
|
||||||
|
--secondary-foreground: oklch(0.3 0.035 195);
|
||||||
|
--muted: oklch(0.935 0.01 195);
|
||||||
|
--muted-foreground: oklch(0.556 0.022 195);
|
||||||
|
--accent: oklch(0.94 0.018 195);
|
||||||
|
--accent-foreground: oklch(0.3 0.035 195);
|
||||||
|
--border: oklch(0.912 0.012 195);
|
||||||
|
--input: oklch(0.912 0.012 195);
|
||||||
|
--ring: oklch(0.55 0.13 195);
|
||||||
|
--chart-1: 189 94% 43%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dark[data-theme='teal'] {
|
||||||
|
--background: oklch(0.152 0.014 195);
|
||||||
|
--foreground: oklch(0.96 0.008 195);
|
||||||
|
--card: oklch(0.235 0.02 195);
|
||||||
|
--card-foreground: oklch(0.96 0.008 195);
|
||||||
|
--popover: oklch(0.208 0.018 195);
|
||||||
|
--popover-foreground: oklch(0.96 0.008 195);
|
||||||
|
--content-background: oklch(0.122 0.012 195);
|
||||||
|
--primary: oklch(0.68 0.13 195);
|
||||||
|
--primary-foreground: oklch(0.2 0.02 195);
|
||||||
|
--secondary: oklch(0.28 0.022 195);
|
||||||
|
--secondary-foreground: oklch(0.96 0.008 195);
|
||||||
|
--muted: oklch(0.28 0.022 195);
|
||||||
|
--muted-foreground: oklch(0.715 0.022 195);
|
||||||
|
--accent: oklch(0.305 0.028 195);
|
||||||
|
--accent-foreground: oklch(0.96 0.008 195);
|
||||||
|
--border: oklch(0.29 0.024 195);
|
||||||
|
--input: oklch(0.29 0.024 195);
|
||||||
|
--ring: oklch(0.68 0.13 195);
|
||||||
|
--chart-1: 189 90% 55%;
|
||||||
|
}
|
||||||
|
|
||||||
@theme inline {
|
@theme inline {
|
||||||
--color-background: var(--background);
|
--color-background: var(--background);
|
||||||
--color-foreground: var(--foreground);
|
--color-foreground: var(--foreground);
|
||||||
|
|||||||
+8
-1
@@ -25,7 +25,14 @@ import { getBasePath } from './lib/basePath';
|
|||||||
const dark = theme === 'dark' || (theme !== 'light' && !!window.matchMedia?.('(prefers-color-scheme: dark)').matches);
|
const dark = theme === 'dark' || (theme !== 'light' && !!window.matchMedia?.('(prefers-color-scheme: dark)').matches);
|
||||||
document.documentElement.classList.toggle('dark', dark);
|
document.documentElement.classList.toggle('dark', dark);
|
||||||
const colorTheme = state?.colorTheme;
|
const colorTheme = state?.colorTheme;
|
||||||
if (colorTheme === 'ocean' || colorTheme === 'forest' || colorTheme === 'violet') {
|
if (
|
||||||
|
colorTheme === 'ocean' ||
|
||||||
|
colorTheme === 'forest' ||
|
||||||
|
colorTheme === 'violet' ||
|
||||||
|
colorTheme === 'rose' ||
|
||||||
|
colorTheme === 'amber' ||
|
||||||
|
colorTheme === 'teal'
|
||||||
|
) {
|
||||||
document.documentElement.dataset.theme = colorTheme;
|
document.documentElement.dataset.theme = colorTheme;
|
||||||
}
|
}
|
||||||
if (state?.radius === 'square') {
|
if (state?.radius === 'square') {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { persist } from 'zustand/middleware';
|
|||||||
import { getApiBaseUrl } from '@/services/api';
|
import { getApiBaseUrl } from '@/services/api';
|
||||||
|
|
||||||
export type Theme = 'light' | 'dark';
|
export type Theme = 'light' | 'dark';
|
||||||
export type ColorTheme = 'stalwart' | 'ocean' | 'forest' | 'violet';
|
export type ColorTheme = 'stalwart' | 'ocean' | 'forest' | 'violet' | 'rose' | 'amber' | 'teal';
|
||||||
export type Radius = 'rounded' | 'square';
|
export type Radius = 'rounded' | 'square';
|
||||||
|
|
||||||
let logoAbortController: AbortController | null = null;
|
let logoAbortController: AbortController | null = null;
|
||||||
@@ -73,6 +73,9 @@ export const COLOR_THEMES: { value: ColorTheme; labelKey: string; fallback: stri
|
|||||||
{ value: 'ocean', labelKey: 'appearance.theme.ocean', fallback: 'Ocean', swatch: 'oklch(0.546 0.215 262.9)' },
|
{ value: 'ocean', labelKey: 'appearance.theme.ocean', fallback: 'Ocean', swatch: 'oklch(0.546 0.215 262.9)' },
|
||||||
{ value: 'forest', labelKey: 'appearance.theme.forest', fallback: 'Forest', swatch: 'oklch(0.527 0.137 150.1)' },
|
{ value: 'forest', labelKey: 'appearance.theme.forest', fallback: 'Forest', swatch: 'oklch(0.527 0.137 150.1)' },
|
||||||
{ value: 'violet', labelKey: 'appearance.theme.violet', fallback: 'Violet', swatch: 'oklch(0.541 0.281 293)' },
|
{ value: 'violet', labelKey: 'appearance.theme.violet', fallback: 'Violet', swatch: 'oklch(0.541 0.281 293)' },
|
||||||
|
{ value: 'rose', labelKey: 'appearance.theme.rose', fallback: 'Rose', swatch: 'oklch(0.577 0.245 12)' },
|
||||||
|
{ value: 'amber', labelKey: 'appearance.theme.amber', fallback: 'Amber', swatch: 'oklch(0.65 0.16 70)' },
|
||||||
|
{ value: 'teal', labelKey: 'appearance.theme.teal', fallback: 'Teal', swatch: 'oklch(0.55 0.13 195)' },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const useUIStore = create<UIState>()(
|
export const useUIStore = create<UIState>()(
|
||||||
@@ -80,8 +83,8 @@ export const useUIStore = create<UIState>()(
|
|||||||
(set, get) => ({
|
(set, get) => ({
|
||||||
theme:
|
theme:
|
||||||
typeof window !== 'undefined' && window.matchMedia?.('(prefers-color-scheme: dark)').matches ? 'dark' : 'light',
|
typeof window !== 'undefined' && window.matchMedia?.('(prefers-color-scheme: dark)').matches ? 'dark' : 'light',
|
||||||
colorTheme: 'stalwart',
|
colorTheme: 'ocean',
|
||||||
radius: 'rounded',
|
radius: 'square',
|
||||||
sidebarOpen: typeof window !== 'undefined' ? (window.matchMedia?.('(min-width: 768px)').matches ?? true) : true,
|
sidebarOpen: typeof window !== 'undefined' ? (window.matchMedia?.('(min-width: 768px)').matches ?? true) : true,
|
||||||
activeSection: '',
|
activeSection: '',
|
||||||
logoUrl: null,
|
logoUrl: null,
|
||||||
@@ -166,8 +169,8 @@ export const useUIStore = create<UIState>()(
|
|||||||
return (state) => {
|
return (state) => {
|
||||||
if (state) {
|
if (state) {
|
||||||
applyThemeClass(state.theme);
|
applyThemeClass(state.theme);
|
||||||
applyColorThemeAttribute(state.colorTheme ?? 'stalwart');
|
applyColorThemeAttribute(state.colorTheme ?? 'ocean');
|
||||||
applyRadiusAttribute(state.radius ?? 'rounded');
|
applyRadiusAttribute(state.radius ?? 'square');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user