diff --git a/dashboard/src/components/shared/ConsoleDisplayer.vue b/dashboard/src/components/shared/ConsoleDisplayer.vue index 10ebd4d17..cf249acf8 100644 --- a/dashboard/src/components/shared/ConsoleDisplayer.vue +++ b/dashboard/src/components/shared/ConsoleDisplayer.vue @@ -269,7 +269,7 @@ export default { } } - span.style = style + 'display: block; font-size: 12px; font-family: Consolas, monospace; white-space: pre-wrap; margin-bottom: 2px;' + span.style = style + 'display: block; font-size: 12px; font-family: SFMono-Regular, Menlo, Monaco, Consolas, "PingFang SC", "PingFang TC", "Hiragino Sans GB", "Noto Sans CJK SC", "Microsoft YaHei", monospace; white-space: pre-wrap; margin-bottom: 2px;' span.classList.add('fade-in') span.innerText = `${log}`; ele.appendChild(span) diff --git a/dashboard/src/scss/_variables.scss b/dashboard/src/scss/_variables.scss index 3584fff1e..33f3c86fb 100644 --- a/dashboard/src/scss/_variables.scss +++ b/dashboard/src/scss/_variables.scss @@ -9,7 +9,7 @@ $color-pack: false; // Global font size and border radius $font-size-root: 1rem; $border-radius-root: 8px; -$body-font-family: 'Roboto', sans-serif !default; +$body-font-family: 'Roboto', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !default; $heading-font-family: $body-font-family !default; $btn-font-weight: 400 !default; $btn-letter-spacing: 0 !default; diff --git a/dashboard/src/scss/layout/_container.scss b/dashboard/src/scss/layout/_container.scss index cc4229274..21c33eb9c 100644 --- a/dashboard/src/scss/layout/_container.scss +++ b/dashboard/src/scss/layout/_container.scss @@ -85,15 +85,15 @@ $sizes: ( body { .Poppins { - font-family: 'Poppins', sans-serif !important; + font-family: 'Poppins', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !important; } .Inter { - font-family: 'Inter', sans-serif !important; + font-family: 'Inter', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !important; } .Outfit { - font-family: 'Outfit', sans-serif !important; + font-family: 'Outfit', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !important; } } diff --git a/desktop/main.js b/desktop/main.js index a578fdc81..d681f2992 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -161,6 +161,16 @@ function createWindow() { nodeIntegration: false, sandbox: true, preload: path.join(__dirname, 'preload.js'), + ...(isMac + ? { + defaultFontFamily: { + standard: 'PingFang SC', + sansSerif: 'PingFang SC', + serif: 'Songti SC', + monospace: 'SF Mono', + }, + } + : {}), }, });