Skip to content
Merged
Changes from all commits
Commits
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
47 changes: 27 additions & 20 deletions packages/jaeger-ui/src/components/App/ThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,39 @@ export function useThemeMode() {
const { defaultAlgorithm, defaultSeed } = theme;
const mapToken = defaultAlgorithm(defaultSeed);

// The base theme customizes some dimensional properties.
const baseThemeConfig: ThemeConfig = {
cssVar: {},
components: {
Layout: {
headerHeight: 48,
headerPadding: '0 50',
footerPadding: '24 50',
triggerHeight: 48,
zeroTriggerWidth: 36,
zeroTriggerHeight: 42,
},
},
};

const lightTheme: ThemeConfig = {
...baseThemeConfig,
algorithm: theme.defaultAlgorithm,
token: {
...mapToken,
colorPrimary: '#199',
// --- Color Palette Seeds ---
colorPrimary: '#199', // Your brand's single primary color
// --- Neutral Seeds (Optional but recommended) ---
colorTextBase: '#000000',
colorBgBase: '#ffffff',
},
components: {
Layout: {
...baseThemeConfig.components?.Layout,
bodyBg: '#fff',
headerBg: '#404040',
footerBg: '#fff',
headerHeight: 48,
headerPadding: '0 50',
footerPadding: '24 50',
siderBg: '#404040',
triggerHeight: 48,
triggerBg: 'tint(#fff, 20%)',
zeroTriggerWidth: 36,
zeroTriggerHeight: 42,
},
Menu: {
darkItemBg: '#151515',
Expand All @@ -62,6 +77,8 @@ const lightTheme: ThemeConfig = {
};

const darkTheme: ThemeConfig = {
...baseThemeConfig,
algorithm: theme.darkAlgorithm,
token: {
...mapToken,
colorPrimary: '#4dd0e1',
Expand All @@ -77,17 +94,12 @@ const darkTheme: ThemeConfig = {
},
components: {
Layout: {
...baseThemeConfig.components?.Layout,
bodyBg: '#0b1625',
headerBg: 'transparent',
footerBg: '#0b1625',
headerHeight: 48,
headerPadding: '0 40',
footerPadding: '24 40',
siderBg: '#0f1c30',
triggerHeight: 48,
triggerBg: 'rgba(255, 255, 255, 0.06)',
zeroTriggerWidth: 36,
zeroTriggerHeight: 42,
},
Menu: {
darkItemBg: 'transparent',
Expand All @@ -99,11 +111,6 @@ const darkTheme: ThemeConfig = {
},
};

const APP_THEMES: Record<ThemeMode, ThemeConfig> = {
light: lightTheme,
dark: darkTheme,
};

function readStoredTheme(targetWindow?: Window | null): ThemeMode | null {
const activeWindow =
targetWindow !== undefined
Expand Down Expand Up @@ -196,7 +203,7 @@ export default function AppThemeProvider({ children }: ThemeProviderProps) {
[mode, setMode, toggleMode]
);

const themeConfig: ThemeConfig = mode === 'dark' ? APP_THEMES.dark : APP_THEMES.light;
const themeConfig: ThemeConfig = mode === 'dark' ? darkTheme : lightTheme;

return (
<ThemeModeContext.Provider value={value}>
Expand Down