AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
feat(web): preset light and dark note CSS
tianma-if64d8857e69a7
diff --git a/apps/web/src/components/settings/NoteProseCssEditor.tsx b/apps/web/src/components/settings/NoteProseCssEditor.tsxindex 3a84d90f..cdfe91c1 100644--- a/apps/web/src/components/settings/NoteProseCssEditor.tsx+++ b/apps/web/src/components/settings/NoteProseCssEditor.tsx@@ -15,7 +15,7 @@ const cssEditorChrome = EditorView.theme({lineHeight: "1.25rem",},".cm-content, .cm-gutter": {- minHeight: "192px",+ minHeight: "360px",},".cm-content": {padding: "8px 12px",@@ -41,6 +41,7 @@ export const NoteProseCssEditor = ({const extensions = useMemo(() => [cssLanguage,cssEditorChrome,+ EditorView.lineWrapping,EditorView.contentAttributes.of({"aria-label": ariaLabel,spellcheck: "false",@@ -49,7 +50,7 @@ export const NoteProseCssEditor = ({return (<CodeMirrorvalue={value}- height="192px"+ height="360px"theme={dark ? githubDark : lightTheme}extensions={extensions}basicSetup={{diff --git a/apps/web/src/components/settings/PreferenceCard.test.mjs b/apps/web/src/components/settings/PreferenceCard.test.mjsindex 0a816c57..d4f4fbad 100644--- a/apps/web/src/components/settings/PreferenceCard.test.mjs+++ b/apps/web/src/components/settings/PreferenceCard.test.mjs@@ -76,7 +76,10 @@ describe("reading typography settings", () => {expect(preferenceCard).toContain('t("settings.editorContentWidthDescription")');expect(preferenceCard).toContain('t("settings.editorBodyPaletteTitle")');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")');+ expect(preferenceCard).toContain('t("settings.editorBodyCssReset")');+ expect(preferenceCard).toContain("DEFAULT_NOTE_PROSE_CSS");expect(preferenceCard.match(/t\("settings\.accountSyncDescription"\)/g)).toHaveLength(1);expect(preferenceCard).toContain("NoteProseCssEditor");expect(readFileSync(new URL("./NoteProseCssEditor.tsx", import.meta.url), "utf8")).toContain("@codemirror/lang-css");diff --git a/apps/web/src/components/settings/PreferenceCard.tsx b/apps/web/src/components/settings/PreferenceCard.tsxindex 21e6d4d1..38b80747 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 { 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 } from "@edgeever/shared";import {EDITOR_LINK_OPEN_MODE_CHANGED_EVENT,getStoredEditorLinkOpenMode,@@ -268,10 +268,14 @@ export const PreferenceCard = ({const cssDraftBytes = new TextEncoder().encode(cssDraft).byteLength;const openCssDialog = () => {- setCssDraft(noteProse.customCss);+ setCssDraft(noteProse.customCss.trim() ? noteProse.customCss : DEFAULT_NOTE_PROSE_CSS);setCssDialogOpen(true);};+ const resetCssDraft = () => {+ setCssDraft(DEFAULT_NOTE_PROSE_CSS);+ };+const saveCssDraft = () => {onNoteProseChange({ customCss: cssDraft });setCssDialogOpen(false);@@ -475,7 +479,7 @@ export const PreferenceCard = ({</div></div>- <div className="flex min-h-16 flex-col items-start gap-3 px-4 py-3 sm:flex-row sm:items-center sm:justify-between sm:gap-4">+ <div className="hidden min-h-16 flex-col items-start gap-3 px-4 py-3 sm:flex-row sm:items-center sm:justify-between sm:gap-4 lg:flex"><div className="flex min-w-0 items-center gap-3"><Code2 className="h-4 w-4 shrink-0 text-slate-500" /><div className="min-w-0">@@ -591,7 +595,7 @@ export const PreferenceCard = ({</div></PreferenceSection><Dialog open={cssDialogOpen} onOpenChange={setCssDialogOpen}>- <DialogContent>+ <DialogContent className="max-h-[calc(100dvh-2rem)] max-w-2xl overflow-y-auto"><DialogHeader><DialogTitle>{t("settings.editorBodyCssTitle")}</DialogTitle><DialogDescription>{t("settings.editorBodyCssDescription")}</DialogDescription>@@ -606,7 +610,10 @@ export const PreferenceCard = ({<p className={cssDraftBytes > MAX_NOTE_PROSE_CSS_BYTES ? "text-xs text-rose-600" : "text-xs text-slate-500"}>{cssDraftBytes} / {MAX_NOTE_PROSE_CSS_BYTES}</p>- <DialogFooter>+ <DialogFooter className="sm:justify-between">+ <Button type="button" variant="outline" onClick={resetCssDraft}>+ {t("settings.editorBodyCssReset")}+ </Button><Button type="button" onClick={saveCssDraft} disabled={cssDraftBytes > MAX_NOTE_PROSE_CSS_BYTES}>{t("common.save")}</Button>diff --git a/apps/web/src/lib/css-sandbox.test.mjs b/apps/web/src/lib/css-sandbox.test.mjsnew file mode 100644index 00000000..766a96b4--- /dev/null+++ b/apps/web/src/lib/css-sandbox.test.mjs@@ -0,0 +1,21 @@+import { describe, expect, test } from "bun:test";+import { DEFAULT_NOTE_PROSE_CSS } from "@edgeever/shared";+import { parseCustomCssToStyles, sanitizeAndScopeCss } from "./css-sandbox";++describe("note prose css sandbox", () => {+ test("keeps dark rules outside the editor scope", () => {+ const scoped = sanitizeAndScopeCss(DEFAULT_NOTE_PROSE_CSS);+ expect(scoped).toContain(".edgeever-editor .ProseMirror p { color: #212121; text-indent: 0; margin-top: 0; margin-bottom: 8px; }");+ expect(scoped).toContain(":root.dark .edgeever-editor .ProseMirror p { color: #dee3e0; }");+ expect(scoped).toContain(":root.dark .edgeever-editor .ProseMirror h1");+ expect(scoped).not.toContain(".ProseMirror :root.dark");+ expect(scoped).not.toContain("font-size");+ });++ test("inlines light tag rules and skips dark selectors", () => {+ const styles = parseCustomCssToStyles(DEFAULT_NOTE_PROSE_CSS);+ expect(styles.p).toContain("color: #212121");+ expect(styles.p).not.toContain("#dee3e0");+ expect(styles.blockquote).toContain("background-color: #f3f5f7");+ });+});diff --git a/apps/web/src/lib/css-sandbox.ts b/apps/web/src/lib/css-sandbox.tsindex fdab986d..9542bcf7 100644--- a/apps/web/src/lib/css-sandbox.ts+++ b/apps/web/src/lib/css-sandbox.ts@@ -6,40 +6,35 @@ import { sanitizeNoteProseDeclarationBlock } from "@edgeever/shared";const sanitizeRulesBlock = (block: string): string => sanitizeNoteProseDeclarationBlock(block);+const scopeSelector = (selector: string): string => {+ const trimmed = selector.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/\s+/g, " ").trim();+ if (!trimmed) return "";+ if (trimmed.startsWith(".ProseMirror") || trimmed.includes(".edgeever-editor")) return trimmed;+ const dark = trimmed.match(/^(?:html\.dark|:root\.dark)\s+(.+)$/);+ if (dark) return `:root.dark .edgeever-editor .ProseMirror ${dark[1]}`;+ return `.edgeever-editor .ProseMirror ${trimmed}`;+};+/**- * 对用户的 CSS 进行安全过滤,并将其作用域限定在当前编辑器的 ProseMirror 区域+ * 对用户的 CSS 进行安全过滤,并将其作用域限定在当前编辑器的 ProseMirror 区域。+ * :root.dark 留在作用域外面,这样深色规则跟着应用主题走。*/export const sanitizeAndScopeCss = (css: string): string => {if (!css) return "";- // 1. 过滤全局危险指令let cleaned = css.replace(/@import/gi, "").replace(/@charset/gi, "").replace(/@namespace/gi, "");- // 2. 匹配选择器与大括号块- const scopePrefix = ".edgeever-editor .ProseMirror ";-- // 匹配形如 selector { rules } 的结构cleaned = cleaned.replace(/([^{]+)({[^}]+})/g, (_, selectors, blockContent) => {- // 提取大括号内部的规则块并过滤const rawRules = blockContent.slice(1, -1);const safeRules = sanitizeRulesBlock(rawRules);if (!safeRules) return "";- // 给选择器加前缀,限制其影响范围const scopedSelectors = selectors.split(",")- .map((s: string) => {- const trimmed = s.trim();- if (!trimmed) return "";- // 若选择器已经有了前缀或特定类,不要重复加- if (trimmed.startsWith(".ProseMirror") || trimmed.includes(".edgeever-editor")) {- return trimmed;- }- return `${scopePrefix}${trimmed}`;- })+ .map((selector: string) => scopeSelector(selector)).filter(Boolean).join(", ");@@ -68,7 +63,7 @@ export const parseCustomCssToStyles = (css: string): Record<string, string> => {if (!safeRules) continue;selectors.forEach((sel) => {- const key = sel.trim().toLowerCase();+ const key = sel.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/\s+/g, " ").trim().toLowerCase();// 只提取针对纯标签的简单选择器(如 h1, p, blockquote 等),这样便于直接在微信复制里进行标签内联样式动态覆盖if (/^[a-z0-9]+$/i.test(key)) {if (stylesMap[key]) {diff --git a/docs/editor-typography-plan.zh-CN.md b/docs/editor-typography-plan.zh-CN.mdindex 9f294b85..0ee866cb 100644--- a/docs/editor-typography-plan.zh-CN.md+++ b/docs/editor-typography-plan.zh-CN.md@@ -25,7 +25,7 @@| 行高 | 紧凑 1.5、标准 1.65、宽松 2.0 | 标准 || 正文配色 | 原生,加上下面 9 款 | 原生 |-字号、行高、栏宽用固定档位,不用滑杆。正文字号、行高和正文配色不附说明。自定义 CSS 的说明一行:**支持云端同步。** 正文宽度的说明一行:**只改变这台设备上的编辑区。**+字号、行高、栏宽用固定档位,不用滑杆。正文字号、行高和正文配色不附说明。自定义 CSS 的说明一行:**支持云端同步。** 这项的编辑入口只在桌面设置里。正文宽度的说明一行:**只改变这台设备上的编辑区。**### 正文宽度@@ -114,7 +114,7 @@换电脑不丢,靠的是这份账号数据,不做导入导出。Web 和桌面登录同一个实例后读写同一份样式表:一台机器上保存,另一台打开就是最新内容。账号上还没有样式、而这台设备里留着旧的本地 CSS 时,用本地那份填上账号,避免第一次同步把已经写好的样式清掉。之后以账号上的为准。-作者若要对外改段距、字距、首行缩进或标题样式,写在这份 CSS 里。字号和行高不写在这里。+作者若要对外改段距、字距、首行缩进或标题样式,写在这份 CSS 里。字号和行高不写在这里。空白时编辑框放一份预置:一条声明一行,按正文、标题、链接、强调、代码、引用、列表和表格加注释。浅色写颜色和间距,深色写在 `:root.dark` 下面,只覆盖颜色,跟着应用的浅色或深色走。恢复预置把草稿放回这份初始值,保存后才写入账号。复制到公众号时只带浅色的纯标签规则。## 作用范围diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex 3c200d51..5b40c71c 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -795,8 +795,9 @@ export const enUS = {slate: "Gray",},editorBodyCssTitle: "Custom CSS",- editorBodyCssDescription: "Size and line height stay on the controls above.",+ editorBodyCssDescription: "Light and dark each have their own rules. Size and line height stay on the controls above.",editorBodyCssEdit: "Edit styles",+ editorBodyCssReset: "Reset",editorBodyCssPlaceholder: "p { text-indent: 2em; } h1 { letter-spacing: 0.04em; }",editorBodyFontTitle: "Note text font",editorBodyFonts: {diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.tsindex 8bf2475c..0f087fe4 100644--- a/packages/shared/src/i18n/ja.ts+++ b/packages/shared/src/i18n/ja.ts@@ -795,8 +795,9 @@ export const ja = {slate: "グレー",},editorBodyCssTitle: "カスタム CSS",- editorBodyCssDescription: "文字サイズと行間はここでは指定しません。",+ editorBodyCssDescription: "ライトとダークをそれぞれ書きます。文字サイズと行間はここでは指定しません。",editorBodyCssEdit: "スタイルを編集",+ editorBodyCssReset: "初期値に戻す",editorBodyCssPlaceholder: "p { text-indent: 2em; } h1 { letter-spacing: 0.04em; }",editorBodyFontTitle: "ノート本文のフォント",editorBodyFonts: {diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex 69134d82..7d520f32 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -795,8 +795,9 @@ export const zhCN = {slate: "灰色",},editorBodyCssTitle: "自定义 CSS",- editorBodyCssDescription: "字号和行高不写在这里。",+ editorBodyCssDescription: "浅色和深色各写一份。字号和行高不写在这里。",editorBodyCssEdit: "编辑样式",+ editorBodyCssReset: "恢复预置",editorBodyCssPlaceholder: "例如 p { text-indent: 2em; } h1 { letter-spacing: 0.04em; }",editorBodyFontTitle: "笔记正文字体",editorBodyFonts: {diff --git a/packages/shared/src/note-prose-css.ts b/packages/shared/src/note-prose-css.tsindex d11ccf90..7420e030 100644--- a/packages/shared/src/note-prose-css.ts+++ b/packages/shared/src/note-prose-css.ts@@ -52,6 +52,231 @@ export const sanitizeNoteProseDeclarationBlock = (block: string): string =>.filter(Boolean).join(" ");+/** Starter sheet. Light rules carry layout. Dark rules use :root.dark and only recolor. */+export const DEFAULT_NOTE_PROSE_CSS = `/* 浅色+ * 字号和行高由上面的档位决定,写在这里会被丢掉。+ * 深色在文末,只覆盖颜色,间距沿用这里。+ */++/* 正文。text-indent 是首行缩进,margin-bottom 是段距。 */+p {+ color: #212121;+ text-indent: 0;+ margin-top: 0;+ margin-bottom: 8px;+}++/* 一级标题 */+h1 {+ color: #1a1d21;+ letter-spacing: -0.02em;+ margin-top: 0;+ margin-bottom: 0.85rem;+}++/* 二级标题 */+h2 {+ color: #27272a;+ letter-spacing: -0.015em;+ margin-top: 1.4rem;+ margin-bottom: 0.6rem;+}++/* 三级标题 */+h3 {+ color: #27272a;+ letter-spacing: -0.01em;+ margin-top: 1.15rem;+ margin-bottom: 0.5rem;+}++/* 四级标题 */+h4 {+ color: #1e293b;+ letter-spacing: -0.006em;+ margin-top: 1.05rem;+ margin-bottom: 0.45rem;+}++/* 五级标题 */+h5 {+ color: #334155;+ margin-top: 0.95rem;+ margin-bottom: 0.4rem;+}++/* 六级标题 */+h6 {+ color: #334155;+ margin-top: 0.85rem;+ margin-bottom: 0.35rem;+}++/* 链接 */+a {+ color: #334155;+ text-decoration: underline;+}++/* 粗体 */+strong,+b {+ color: #212121;+}++/* 斜体 */+em,+i {+ color: #212121;+}++/* 行内代码 */+code {+ color: #3d4450;+ background-color: #f3f5f7;+ border-color: #e1e5ea;+ border-radius: 4px;+ padding: 0.12rem 0.38rem;+}++/* 代码块 */+pre {+ color: #0f172a;+ background-color: #f8fafc;+ border-color: #e2e8f0;+ border-radius: 8px;+ padding: 0.9rem 1rem;+ margin-bottom: 1rem;+}++/* 代码块内部不再套一层行内代码的底色 */+pre code {+ color: inherit;+ background-color: transparent;+ border: 0;+ padding: 0;+}++/* 引用 */+blockquote {+ color: #3d4450;+ background-color: #f3f5f7;+ border-radius: 8px;+ padding: 0.75rem 1rem;+ margin-bottom: 1rem;+}++/* 分隔线 */+hr {+ border-color: #e7ebe8;+}++/* 列表 */+ul,+ol {+ padding-left: 1.5rem;+ margin-bottom: 1rem;+}++ul {+ list-style-type: disc;+}++ol {+ list-style-type: decimal;+}++li {+ margin-top: 0.25rem;+ margin-bottom: 0.25rem;+}++/* 表格 */+th,+td {+ border-color: #e2e8f0;+ padding: 0.48rem 0.8rem;+ text-align: left;+}++th {+ color: #0f172a;+ background-color: #f1f5f9;+ font-weight: 600;+}++/* 深色。应用切到深色时覆盖上面的颜色,间距不用再写一份。 */++/* 深色 · 正文 */+:root.dark p {+ color: #dee3e0;+}++/* 深色 · 标题 */+:root.dark h1,+:root.dark h2,+:root.dark h3,+:root.dark h4,+:root.dark h5,+:root.dark h6 {+ color: #dee3e0;+}++/* 深色 · 链接 */+:root.dark a {+ color: #dee3e0;+}++/* 深色 · 粗体 */+:root.dark strong,+:root.dark b {+ color: #dee3e0;+}++/* 深色 · 斜体 */+:root.dark em,+:root.dark i {+ color: #dee3e0;+}++/* 深色 · 行内代码 */+:root.dark code {+ color: #dee3e0;+ background-color: #2a2e2c;+ border-color: #3a403c;+}++/* 深色 · 代码块 */+:root.dark pre {+ color: #dee3e0;+ background-color: #1e2422;+ border-color: #3a403c;+}++/* 深色 · 引用 */+:root.dark blockquote {+ color: #dee3e0;+ background-color: #2a2e2c;+}++/* 深色 · 分隔线 */+:root.dark hr {+ border-color: #3a403c;+}++/* 深色 · 表头 */+:root.dark th {+ color: #f1f5f9;+ background-color: #2a2e2c;+}++/* 深色 · 单元格边框 */+:root.dark th,+:root.dark td {+ border-color: #3a403c;+}+`;+/** Drops font-size, line-height, url(), and rules that are not typography. Selectors stay intact. */export const sanitizeNoteProseCss = (css: string): string => {if (!css) return "";diff --git a/packages/shared/src/note-prose.test.mjs b/packages/shared/src/note-prose.test.mjsindex 71fa467c..d805ab8e 100644--- a/packages/shared/src/note-prose.test.mjs+++ b/packages/shared/src/note-prose.test.mjs@@ -7,6 +7,7 @@ import {paletteForLegacyEditorTheme,parseNoteProsePalette,resolveNoteProse,+ DEFAULT_NOTE_PROSE_CSS,sanitizeNoteProseCss,} from "@edgeever/shared";@@ -88,6 +89,20 @@ describe("note prose", () => {})).toEqual({});});+ test("ships a light and dark starter sheet without font size or line height", () => {+ expect(DEFAULT_NOTE_PROSE_CSS).toContain("/* 正文。text-indent 是首行缩进,margin-bottom 是段距。 */");+ expect(DEFAULT_NOTE_PROSE_CSS).toContain("text-indent: 0;");+ expect(DEFAULT_NOTE_PROSE_CSS).toContain("/* 深色 · 标题 */");+ expect(DEFAULT_NOTE_PROSE_CSS).toContain("color: #212121;");+ expect(DEFAULT_NOTE_PROSE_CSS).toContain("color: #dee3e0;");+ expect(DEFAULT_NOTE_PROSE_CSS).not.toContain("font-size");+ expect(DEFAULT_NOTE_PROSE_CSS).not.toContain("line-height");+ const sanitized = sanitizeNoteProseCss(DEFAULT_NOTE_PROSE_CSS);+ expect(sanitized).toContain(":root.dark p");+ expect(sanitized).toContain("color: #dee3e0");+ expect(new TextEncoder().encode(DEFAULT_NOTE_PROSE_CSS).byteLength).toBeLessThan(MAX_NOTE_PROSE_CSS_BYTES);+ });+test("rejects a stylesheet larger than 8 KB", () => {expect(NoteProseUpdateSchema.safeParse({customCss: "p { color: red; }",