Skip to content

Modern Docker Management, Designed for Everyone

feat: system mode for light/dark mode (#2994)

Kyle Mendell95923b136f4e
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index de0a1eaab..30452e7fc 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1614,7 +1614,7 @@
"appearance_title": "Appearance",
"appearance_description": "Customize the look and feel of Arcane",
"appearance_language_current_user_description": "Language preference is saved for the current user only.",
- "appearance_theme_current_user_description": "Theme preference is saved for the current user only.",
+ "appearance_theme_current_user_description": "Choose Light, Dark, or System. System follows your operating system's theme. This preference is saved on this device.",
"oled_mode": "OLED Mode",
"oled_mode_description": "Use true-black backgrounds for OLED displays. Only active with the Default application theme in dark mode.",
"oled_mode_enabled": "Enabled",
@@ -2313,6 +2313,7 @@
"events_delete_success": "Event \"{title}\" deleted successfully",
"sidebar_dark_mode": "Dark",
"sidebar_light_mode": "Light",
+ "sidebar_system_mode": "System",
"notifications_title": "Notifications",
"notifications_description": "Configure notifications for container updates",
"notifications_tab_built_in": "Built-in Notifications",
diff --git a/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte b/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
index 311103e08..5b8026ebd 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { cn } from '$lib/utils';
import { environmentStore } from '$lib/stores/environment.store.svelte';
- import { mode, toggleMode } from 'mode-watcher';
+ import ThemeModeSelector from '$lib/components/theme-mode/theme-mode-selector.svelte';
import { m } from '$lib/paraglide/messages';
import type { User } from '$lib/types/auth';
import LocalePicker from '$lib/components/locale-picker.svelte';
@@ -10,16 +10,7 @@
import userStore from '$lib/stores/user-store';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import IfPermitted from '$lib/components/if-permitted.svelte';
- import {
- ArrowDownIcon,
- MoonIcon,
- SunIcon,
- LogoutIcon,
- EnvironmentsIcon,
- RemoteEnvironmentIcon,
- LanguageIcon,
- ArrowRightIcon
- } from '$lib/icons';
+ import { ArrowDownIcon, LogoutIcon, EnvironmentsIcon, RemoteEnvironmentIcon, LanguageIcon, ArrowRightIcon } from '$lib/icons';
type Props = {
user: User;
@@ -37,8 +28,6 @@
let userCardExpanded = $state(false);
let envDialogOpen = $state(false);
- const isDarkMode = $derived(mode.current === 'dark');
-
const effectiveUser = $derived(user);
function getConnectionString(): string {
@@ -145,23 +134,12 @@
</div>
<div class="bg-background/50 border-border/20 rounded-2xl border p-4">
- <button class="flex h-full w-full items-center gap-3 text-left" onclick={toggleMode}>
- <div class="bg-primary/10 text-primary flex aspect-square size-8 items-center justify-center rounded-lg">
- {#if isDarkMode}
- <SunIcon class="size-4" />
- {:else}
- <MoonIcon class="size-4" />
- {/if}
- </div>
- <div class="flex min-w-0 flex-1 flex-col justify-center">
- <div class="text-muted-foreground/70 mb-1 text-xs font-medium tracking-widest uppercase">
- {m.common_toggle_theme()}
- </div>
- <div class="text-foreground text-sm font-medium">
- {isDarkMode ? m.sidebar_dark_mode() : m.sidebar_light_mode()}
- </div>
+ <div class="flex h-full flex-col justify-center gap-2">
+ <div class="text-muted-foreground/70 text-xs font-medium tracking-widest uppercase">
+ {m.common_toggle_theme()}
</div>
- </button>
+ <ThemeModeSelector class="grid w-full grid-cols-3" />
+ </div>
</div>
</div>
</div>
diff --git a/frontend/src/lib/components/theme-mode/theme-mode-selector.svelte b/frontend/src/lib/components/theme-mode/theme-mode-selector.svelte
new file mode 100644
index 000000000..a0af6e039
--- /dev/null
+++ b/frontend/src/lib/components/theme-mode/theme-mode-selector.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+ import { userPrefersMode, setMode } from 'mode-watcher';
+ import { m } from '$lib/paraglide/messages';
+ import { SunIcon, MoonIcon, MonitorIcon } from '$lib/icons';
+ import { cn } from '$lib/utils';
+
+ type Props = {
+ disabled?: boolean;
+ class?: string;
+ };
+
+ let { disabled = false, class: className = '' }: Props = $props();
+
+ const options = $derived([
+ { value: 'light', label: m.sidebar_light_mode(), icon: SunIcon },
+ { value: 'dark', label: m.sidebar_dark_mode(), icon: MoonIcon },
+ { value: 'system', label: m.sidebar_system_mode(), icon: MonitorIcon }
+ ] as const);
+
+ const current = $derived(userPrefersMode.current);
+</script>
+
+<div class={cn('bg-muted/40 inline-flex rounded-lg p-0.5', className)} role="group" aria-label={m.common_toggle_theme()}>
+ {#each options as option (option.value)}
+ {@const Icon = option.icon}
+ <button
+ type="button"
+ {disabled}
+ aria-pressed={current === option.value}
+ onclick={() => setMode(option.value)}
+ class={cn(
+ 'inline-flex items-center justify-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+ current === option.value ? 'bg-background text-foreground shadow-sm' : 'text-muted-foreground hover:text-foreground'
+ )}
+ >
+ <Icon class="size-3.5" />
+ {option.label}
+ </button>
+ {/each}
+</div>
diff --git a/frontend/src/lib/icons/index.ts b/frontend/src/lib/icons/index.ts
index 78fc031ab..baa0ef6f7 100644
--- a/frontend/src/lib/icons/index.ts
+++ b/frontend/src/lib/icons/index.ts
@@ -74,6 +74,7 @@ export { default as BoxIcon } from 'virtual:icons/solar/box-minimalistic-linear'
export { default as StartIcon } from 'virtual:icons/solar/play-linear';
export { default as StopIcon } from 'virtual:icons/solar/stop-bold';
export { default as MonitorSpeakerIcon } from 'virtual:icons/lucide/monitor-speaker';
+export { default as MonitorIcon } from 'virtual:icons/lucide/monitor';
export { default as DockIcon } from 'virtual:icons/lucide/dock';
export { default as EditIcon } from 'virtual:icons/solar/pen-linear';
export { default as SearchIcon } from 'virtual:icons/solar/minimalistic-magnifer-linear';
diff --git a/frontend/src/routes/(app)/account/+page.svelte b/frontend/src/routes/(app)/account/+page.svelte
index beb7271c0..f8e7a80d7 100644
--- a/frontend/src/routes/(app)/account/+page.svelte
+++ b/frontend/src/routes/(app)/account/+page.svelte
@@ -2,7 +2,7 @@
import { onMount } from 'svelte';
import { fromStore } from 'svelte/store';
import { toast } from 'svelte-sonner';
- import { mode, toggleMode } from 'mode-watcher';
+ import ThemeModeSelector from '$lib/components/theme-mode/theme-mode-selector.svelte';
import { format, formatDistanceToNow } from 'date-fns';
import HeaderCard from '$lib/components/header-card.svelte';
import ApiKeyFormSheet from '$lib/components/sheets/api-key-form-sheet.svelte';
@@ -22,7 +22,7 @@
import { getDefaultProfilePicture } from '$lib/utils/docker';
import { GLOBAL_SCOPE } from '$lib/types/auth';
import type { ApiKey, ApiKeyCreated, ApiKeyPermissionGrant, CreateUserApiKey } from '$lib/types/auth';
- import { UserIcon, LogoutIcon, ShieldAlertIcon, SunIcon, MoonIcon, ApiKeyIcon, AddIcon, CopyIcon, TrashIcon } from '$lib/icons';
+ import { UserIcon, LogoutIcon, ShieldAlertIcon, ApiKeyIcon, AddIcon, CopyIcon, TrashIcon } from '$lib/icons';
let { data: _data }: PageProps = $props();
@@ -481,21 +481,9 @@
<div class="flex items-center justify-between gap-4 p-3">
<div class="min-w-0">
<div class="text-sm font-medium">Theme</div>
- <div class="text-muted-foreground text-xs">Switch between light and dark mode</div>
+ <div class="text-muted-foreground text-xs">{m.appearance_theme_current_user_description()}</div>
</div>
- <button
- type="button"
- onclick={toggleMode}
- class="border-border hover:bg-muted/60 flex items-center gap-2 rounded-lg border px-3 py-1.5 text-sm font-medium transition-colors"
- >
- {#if mode.current === 'dark'}
- <MoonIcon class="size-4" />
- Dark
- {:else}
- <SunIcon class="size-4" />
- Light
- {/if}
- </button>
+ <ThemeModeSelector />
</div>
<div class="flex items-center justify-between gap-4 p-3">
<div class="min-w-0">
diff --git a/frontend/src/routes/(app)/settings/appearance/+page.svelte b/frontend/src/routes/(app)/settings/appearance/+page.svelte
index ed36b406a..618281445 100644
--- a/frontend/src/routes/(app)/settings/appearance/+page.svelte
+++ b/frontend/src/routes/(app)/settings/appearance/+page.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { onDestroy } from 'svelte';
import { z } from 'zod/v4';
- import { mode, toggleMode } from 'mode-watcher';
+ import { mode } from 'mode-watcher';
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
import { navigationSettingsOverridesStore, resetNavigationVisibility } from '$lib/utils/navigation';
@@ -14,11 +14,11 @@
import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
import AccentColorPicker from '$lib/components/accent-color/accent-color-picker.svelte';
import ApplicationThemePicker from '$lib/components/application-theme/application-theme-picker.svelte';
+ import ThemeModeSelector from '$lib/components/theme-mode/theme-mode-selector.svelte';
import { applyAccentColor } from '$lib/utils/theme';
import { APPLICATION_THEME_VALUES, applyApplicationTheme } from '$lib/utils/theme';
import { applyOledMode } from '$lib/utils/theme';
- import { AppearanceIcon, MonitorSpeakerIcon, DockIcon, MoonIcon, SunIcon } from '$lib/icons';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import { AppearanceIcon, MonitorSpeakerIcon, DockIcon } from '$lib/icons';
import { cn } from '$lib/utils';
let { data } = $props();
@@ -203,14 +203,7 @@
description={m.appearance_theme_current_user_description()}
layout="inline"
>
- <ArcaneButton action="base" tone="outline" class="h-9 min-w-40 justify-start gap-2" onclick={toggleMode}>
- {#if isDarkMode}
- <SunIcon class="size-4" />
- {:else}
- <MoonIcon class="size-4" />
- {/if}
- <span>{isDarkMode ? m.sidebar_dark_mode() : m.sidebar_light_mode()}</span>
- </ArcaneButton>
+ <ThemeModeSelector disabled={isReadOnly} />
</SettingsRow>
<!-- OLED Mode -->