Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(web): show a color chip beside each note palette

tianma-if77094c472efb
diff --git a/apps/web/src/components/settings/PreferenceCard.test.mjs b/apps/web/src/components/settings/PreferenceCard.test.mjs
index d4f4fbad..4daeda8c 100644
--- a/apps/web/src/components/settings/PreferenceCard.test.mjs
+++ b/apps/web/src/components/settings/PreferenceCard.test.mjs
@@ -75,6 +75,8 @@ describe("reading typography settings", () => {
expect(preferenceCard).not.toContain('t("settings.editorBodyLineHeightDescription")');
expect(preferenceCard).toContain('t("settings.editorContentWidthDescription")');
expect(preferenceCard).toContain('t("settings.editorBodyPaletteTitle")');
+ expect(preferenceCard).toContain("NoteProsePaletteSwatch");
+ expect(preferenceCard).toContain("NOTE_PROSE_PALETTES[paletteId].accent");
expect(preferenceCard).toContain('t("settings.editorBodyCssTitle")');
expect(preferenceCard.slice(preferenceCard.indexOf("editorBodyCssTitle") - 500, preferenceCard.indexOf("editorBodyCssTitle"))).toContain("lg:flex");
expect(preferenceCard).toContain('t("settings.editorBodyCssDescription")');
diff --git a/apps/web/src/components/settings/PreferenceCard.tsx b/apps/web/src/components/settings/PreferenceCard.tsx
index 38b80747..85dad30e 100644
--- a/apps/web/src/components/settings/PreferenceCard.tsx
+++ b/apps/web/src/components/settings/PreferenceCard.tsx
@@ -3,7 +3,7 @@ import { useState, useEffect, type ReactNode } from "react";
import { useTranslation } from "react-i18next";
import type { EditorContentWidth } from "@/lib/editor-content-width";
import type { NoteProsePatch, NoteProsePaletteChoice, ResolvedNoteProse } from "@edgeever/shared";
-import { DEFAULT_NOTE_PROSE_CSS, MAX_NOTE_PROSE_CSS_BYTES, NOTE_PROSE_FONT_SIZES, NOTE_PROSE_PALETTE_CHOICES } from "@edgeever/shared";
+import { DEFAULT_NOTE_PROSE_CSS, MAX_NOTE_PROSE_CSS_BYTES, NOTE_PROSE_FONT_SIZES, NOTE_PROSE_PALETTE_CHOICES, NOTE_PROSE_PALETTES } from "@edgeever/shared";
import {
EDITOR_LINK_OPEN_MODE_CHANGED_EVENT,
getStoredEditorLinkOpenMode,
@@ -176,6 +176,14 @@ const FontChoiceFields = ({
);
};
+const NoteProsePaletteSwatch = ({ paletteId }: { paletteId: NoteProsePaletteChoice }) => (
+ <span
+ aria-hidden
+ className={`h-3 w-6 shrink-0 rounded-[2px] shadow-[inset_0_0_0_1px_rgba(0,0,0,0.14)] ${paletteId === "native" ? "bg-foreground" : ""}`}
+ style={paletteId === "native" ? undefined : { backgroundColor: NOTE_PROSE_PALETTES[paletteId].accent }}
+ />
+);
+
const NOTE_PROSE_LINE_HEIGHT_OPTIONS = [
{ value: "1.5", labelKey: "settings.editorBodyLineHeights.compact" },
{ value: "1.65", labelKey: "settings.editorBodyLineHeights.standard" },
@@ -468,11 +476,25 @@ export const PreferenceCard = ({
onValueChange={(value) => onNoteProseChange({ palette: value as NoteProsePaletteChoice })}
>
<SelectTrigger aria-label={t("settings.editorBodyPaletteTitle")} className="h-9 bg-card">
- <SelectValue />
+ <SelectValue>
+ <span className="flex items-center gap-2">
+ <NoteProsePaletteSwatch paletteId={noteProse.palette} />
+ <span>{t(`settings.editorBodyPalettes.${noteProse.palette}`)}</span>
+ </span>
+ </SelectValue>
</SelectTrigger>
<SelectContent>
{NOTE_PROSE_PALETTE_CHOICES.map((paletteId) => (
- <SelectItem key={paletteId} value={paletteId}>{t(`settings.editorBodyPalettes.${paletteId}`)}</SelectItem>
+ <SelectItem
+ key={paletteId}
+ value={paletteId}
+ className="pr-2.5 [&>span:last-child]:flex [&>span:last-child]:min-w-0 [&>span:last-child]:flex-1"
+ >
+ <span className="flex w-full items-center justify-between gap-3">
+ <span>{t(`settings.editorBodyPalettes.${paletteId}`)}</span>
+ <NoteProsePaletteSwatch paletteId={paletteId} />
+ </span>
+ </SelectItem>
))}
</SelectContent>
</Select>
diff --git a/docs/editor-typography-plan.zh-CN.md b/docs/editor-typography-plan.zh-CN.md
index bd77f8d6..74434ae3 100644
--- a/docs/editor-typography-plan.zh-CN.md
+++ b/docs/editor-typography-plan.zh-CN.md
@@ -61,7 +61,7 @@
笔记正文字体维持现状:本机选择,内置字体仍可发布到公开分享页,自定义字体名称不发布。
-正文配色放在「阅读」里,用固定选项,不用滑杆。默认是现在的原生配色。另外 9 款按色相分开,每款差一个大色相。选中一款时,只改链接、行内代码、粗体和待办勾选框,粗体和勾选框用该款强调色。空框和划掉的文字仍用原生。正文、标题、引用、分隔线、表格、代码底和代码边框仍用原生。深色模式同样只改这几项,链接和行内代码用强调色。界面、侧栏、工具栏、图表和信息图不跟着变。
+正文配色放在「阅读」里,用固定选项,不用滑杆。每一项右侧有一块该色的圆角矩形,当前选项在收起时也带着。原生用界面前景色。默认是现在的原生配色。另外 9 款按色相分开,每款差一个大色相。选中一款时,只改链接、行内代码、粗体和待办勾选框,粗体和勾选框用该款强调色。空框和划掉的文字仍用原生。正文、标题、引用、分隔线、表格、代码底和代码边框仍用原生。深色模式同样只改这几项,链接和行内代码用强调色。界面、侧栏、工具栏、图表和信息图不跟着变。
原先那 10 款里,琥珀和日暖都是金黄,夜蓝和青页都是蓝,雾色和青玉都是青,林绿又接近品牌绿。这四款舍弃。空出来的位置用酒红,再补色相上没有的橙色和粉色。绿色曾放进选项,后来去掉。设置里的名字直接用色名。