diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss index fcefdba5e..96362d8dc 100644 --- a/app/src/assets/scss/component/_typography.scss +++ b/app/src/assets/scss/component/_typography.scss @@ -3,14 +3,6 @@ src: url(../fonts/JetBrainsMono-2.304/JetBrainsMono-Regular.woff2) format('woff2'); } -// Windows 斜体遮挡添加 "Segoe UI" 字体 https://github.com/siyuan-note/siyuan/issues/11841 -@font-face { - font-family: 'Segoe UI Italic Char'; - src: local("Segoe UI italic"); - font-style: italic; - unicode-range: U+30-39, U+41-5A, U+61-7A, U+29, U+7D; -} - @font-face { font-family: "Emojis"; src: url(../fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2"), @@ -79,7 +71,6 @@ span[data-type~="em"] { font-style: italic; color: var(--b3-protyle-inline-em-color); - font-family: "Segoe UI Italic Char"; } s, diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index fe6eacfed..cd382f388 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -221,6 +221,10 @@ export const setInlineStyle = (set = true) => { 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)}`; } + // Windows 斜体遮挡添加 "Segoe UI" 字体 https://github.com/siyuan-note/siyuan/issues/11841 + if (navigator.platform.indexOf('Win') > -1) { + style += `\n.b3-typography em, .b3-typography span[data-type~=em], .protyle-wysiwyg em, .protyle-wysiwyg span[data-type~=em] { font-family: emojis, "Segoe UI"; }`; + } // pad 端菜单移除显示,如工作空间 if ("ontouchend" in document) { style += "\n.b3-menu .b3-menu__action {opacity: 0.68;}";