From 633f9af058166f3e41cf1b4cedc4be427183e2b1 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 27 Oct 2023 09:19:33 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/8036 --- app/appearance/themes/daylight/theme.css | 1 + app/appearance/themes/daylight/theme.json | 2 +- app/appearance/themes/midnight/theme.css | 1 + app/appearance/themes/midnight/theme.json | 2 +- app/src/util/assets.ts | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index ad56ef4bb..e54e882ec 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/app/appearance/themes/daylight/theme.css @@ -22,6 +22,7 @@ /* 字体 */ --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif, "Apple Color Emoji", "Noto Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Android Emoji", "EmojiSymbols"; + --b3-font-family-protyle: none; --b3-font-family-code: "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family); --b3-font-family-graph: mononoki; --b3-font-family-emoji: "Segoe UI Emoji", "Segoe UI Symbol", "Segoe UI", "Apple Color Emoji", "Twemoji Mozilla", "Noto Color Emoji", "Android Emoji"; diff --git a/app/appearance/themes/daylight/theme.json b/app/appearance/themes/daylight/theme.json index 167c967e8..3474fdd7a 100644 --- a/app/appearance/themes/daylight/theme.json +++ b/app/appearance/themes/daylight/theme.json @@ -2,7 +2,7 @@ "name": "daylight", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.4", + "version": "1.0.5", "modes": [ "light" ] diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css index 6a4fbe64f..5ebeab4aa 100644 --- a/app/appearance/themes/midnight/theme.css +++ b/app/appearance/themes/midnight/theme.css @@ -22,6 +22,7 @@ /* 字体 */ --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Microsoft Yahei", sans-serif, "Apple Color Emoji", "Noto Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Android Emoji", "EmojiSymbols"; + --b3-font-family-protyle: none; --b3-font-family-code: "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family); --b3-font-family-graph: mononoki; --b3-font-family-emoji: "Segoe UI Emoji", "Segoe UI Symbol", "Segoe UI", "Apple Color Emoji", "Twemoji Mozilla", "Noto Color Emoji", "Android Emoji"; diff --git a/app/appearance/themes/midnight/theme.json b/app/appearance/themes/midnight/theme.json index 8c3149048..e47505edb 100644 --- a/app/appearance/themes/midnight/theme.json +++ b/app/appearance/themes/midnight/theme.json @@ -2,7 +2,7 @@ "name": "midnight", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.4", + "version": "1.0.5", "modes": [ "dark" ] diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index 1b4a71b6c..9bd76fbfc 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -218,7 +218,7 @@ export const setInlineStyle = (set = true) => { .protyle-wysiwyg .h5 img.emoji, .b3-typography h5 img.emoji {width:${Math.floor(window.siyuan.config.editor.fontSize * 1.13 * 1.25)}px} .protyle-wysiwyg .h6 img.emoji, .b3-typography h6 img.emoji {width:${Math.floor(window.siyuan.config.editor.fontSize * 1.25)}px}`; if (window.siyuan.config.editor.fontFamily) { - style += `\n.b3-typography:not(.b3-typography--default), .protyle-wysiwyg, .protyle-title {font-family: "${window.siyuan.config.editor.fontFamily}", var(--b3-font-family)}`; + style += `\n.b3-typography:not(.b3-typography--default), .protyle-wysiwyg, .protyle-title {font-family: var(--b3-font-family-protyle), "${window.siyuan.config.editor.fontFamily}", var(--b3-font-family)}`; } // pad 端菜单移除显示,如工作空间 if ("ontouchend" in document) {