Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/8036

Browse source
This commit is contained in:
Vanessa 2023-10-27 09:34:25 +08:00
parent 633f9af058
commit 72d828db64
5 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/appearance/themes/daylight/theme.css
View file

@ -22,7 +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-protyle: var(--b3-font-family);
--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";

2
app/appearance/themes/midnight/theme.css
View file

@ -22,7 +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-protyle: var(--b3-font-family);
--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";

1
app/src/assets/scss/component/_typography.scss
View file

@ -8,6 +8,7 @@
font-variant-ligatures: no-common-ligatures;
display: flex;
flex-direction: column;
font-family: var(--b3-font-family-protyle);
img {
max-width: 100%;

1
app/src/assets/scss/protyle/_protyle.scss
View file

@ -334,6 +334,7 @@
position: relative;
font-size: 16px;
border-radius: var(--b3-border-radius);
font-family: var(--b3-font-family-protyle);
&:hover .protyle-title__icon {
opacity: 1;

2
app/src/util/assets.ts
View file

@ -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: var(--b3-font-family-protyle), "${window.siyuan.config.editor.fontFamily}", var(--b3-font-family)}`;
style += `\n.b3-typography:not(.b3-typography--default), .protyle-wysiwyg, .protyle-title {font-family: "${window.siyuan.config.editor.fontFamily}", var(--b3-font-family-protyle)}`;
}
// pad 端菜单移除显示，如工作空间
if ("ontouchend" in document) {