Skip to content

fix(theme): distinguish Luna swatches and visible borders #1696

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

Merged
ZhaoJiSen merged 1 commit into from
Sep 18, 2026
Merged

fix(theme): distinguish Luna swatches and visible borders #1696

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
7 changes: 5 additions & 2 deletions ui/components/SideBar/profile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,10 @@ const menuShortcutButtonUi = {
label: "min-w-0 flex-1 truncate text-left"
};

const currentThemeAccent = computed(() => getThemePreset(currentThemePresetId.value)?.accent || "var(--theme-accent)");
const currentThemeAccent = computed(() => {
const preset = getThemePreset(currentThemePresetId.value);
return preset?.baseColor || preset?.accent || "var(--theme-accent)";
});
const themePaletteOpen = ref(false);
const previewedThemePresetId = ref<ThemePresetId | null>(null);
const palettePreviewArmed = ref(false);
Expand Down Expand Up @@ -1132,7 +1135,7 @@ onBeforeUnmount(() => {
>
<span
class="size-2.5 shrink-0 rounded-full ring-1 ring-(--app-border)"
:style="{ backgroundColor: item.accent }"
:style="{ backgroundColor: item.baseColor || item.accent }"
/>
<span class="min-w-0 flex-1 truncate text-left text-xs">{{ themePresetLabel(item) }}</span>
<UIcon
Expand Down
5 changes: 5 additions & 0 deletions ui/shared/theme/color.check.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,9 @@ for (const preset of [...LIGHT_THEME_PRESETS, ...DARK_THEME_PRESETS]) {
assert.ok(contrastRatio(preset.accent, foreground) >= 4.5, `${preset.id} checkbox foreground has sufficient contrast`);
}

const lunaSwatches = DARK_THEME_PRESETS.flatMap((preset) =>
preset.family === "luna" ? [preset.baseColor || preset.accent] : []
);
assert.equal(new Set(lunaSwatches).size, lunaSwatches.length, "Luna theme swatches must be distinct");

console.log("color.check: ok");
2 changes: 1 addition & 1 deletion ui/shared/theme/themes/luna-darkgray.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--theme-bg: #111113;
--theme-fg: #efeff0;
--theme-muted: #878c97;
--theme-border: rgba(0, 0, 0, 0.3);
--theme-border: #3a3e45;
--theme-accent: #1ab394;
--theme-folder-icon: var(--sidebar-icon-color);
--theme-surface: #1c1e21;
Expand Down
2 changes: 1 addition & 1 deletion ui/shared/theme/themes/luna-deepblue.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--theme-bg: #020203;
--theme-fg: #efeff0;
--theme-muted: #6b82a8;
--theme-border: rgba(0, 0, 0, 0.3);
--theme-border: #2a3548;
--theme-accent: #1ab394;
--theme-folder-icon: var(--sidebar-icon-color);
--theme-surface: #0b0e13;
Expand Down
2 changes: 1 addition & 1 deletion ui/shared/theme/themes/luna-default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--theme-bg: #241e1e;
--theme-fg: #efeff0;
--theme-muted: #a69696;
--theme-border: rgba(0, 0, 0, 0.3);
--theme-border: #4a4040;
--theme-accent: #1ab394;
--theme-folder-icon: var(--sidebar-icon-color);
--theme-folder-icon-filled: 1;
Expand Down
Loading