diff --git a/dashboard/src/components/shared/ConsoleDisplayer.vue b/dashboard/src/components/shared/ConsoleDisplayer.vue index cf249acf8..823bdc1cb 100644 --- a/dashboard/src/components/shared/ConsoleDisplayer.vue +++ b/dashboard/src/components/shared/ConsoleDisplayer.vue @@ -269,8 +269,8 @@ export default { } } - 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.style = style + span.classList.add('console-log-line', 'fade-in') span.innerText = `${log}`; ele.appendChild(span) if (this.autoScroll) { @@ -290,7 +290,15 @@ export default { margin-left: 20px; } -.fade-in { +:deep(.console-log-line) { + display: block; + margin-bottom: 2px; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, var(--astrbot-font-cjk-mono), monospace; + font-size: 12px; + white-space: pre-wrap; +} + +:deep(.fade-in) { animation: fadeIn 0.3s; } diff --git a/dashboard/src/scss/_variables.scss b/dashboard/src/scss/_variables.scss index 33f3c86fb..7993bb860 100644 --- a/dashboard/src/scss/_variables.scss +++ b/dashboard/src/scss/_variables.scss @@ -9,7 +9,15 @@ $color-pack: false; // Global font size and border radius $font-size-root: 1rem; $border-radius-root: 8px; -$body-font-family: 'Roboto', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !default; +$cjk-sans-fallback: 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei' !default; +$cjk-mono-fallback: 'PingFang SC', 'PingFang TC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei' !default; + +:root { + --astrbot-font-cjk-sans: #{$cjk-sans-fallback}; + --astrbot-font-cjk-mono: #{$cjk-mono-fallback}; +} + +$body-font-family: 'Roboto', $cjk-sans-fallback, 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 21c33eb9c..bf9ef0d08 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', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !important; + font-family: 'Poppins', $cjk-sans-fallback, sans-serif !important; } .Inter { - font-family: 'Inter', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !important; + font-family: 'Inter', $cjk-sans-fallback, sans-serif !important; } .Outfit { - font-family: 'Outfit', 'PingFang SC', 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Microsoft YaHei', sans-serif !important; + font-family: 'Outfit', $cjk-sans-fallback, sans-serif !important; } }