From fd751c14b0c7f57b6e06d75658c1c5770cd7c868 Mon Sep 17 00:00:00 2001 From: Erzbir Date: Wed, 19 Aug 2026 02:25:45 +0800 Subject: [PATCH] refactor: integrate system font into default font selector --- README.md | 1 - settings.yaml | 12 +++--------- src/styles/main.scss | 4 ---- templates/layout.html | 1 - templates/modules/theme-preferences.html | 8 +------- 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index fed326c..ad65af9 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,6 @@ | 基础行高 | `style.line_height` | 接受 `28px`, `1.75rem` 或 `calc(...)` 等 CSS 长度 | | 文章段落间距 | `style.post_paragraph_spacing` | 控制文章正文段落的上下间距 | | 元信息分隔符 | `style.post_meta_divider` | 控制文章时间, 作者和标签等元信息之间的分隔符 | -| 使用系统字体 | `style.system_font_enable` | 使用访问者的 `system-ui` 字体 | | 默认像素风格 | `style.pixel_style` | 使用像素字体和像素图标 | | 自定义字体 | `style.custom_font_enable` | 上传字体文件并填写字体内部名称 | | 无序列表标记 | `style.list_marker` | 可选 `-`, `*`, `+`, `>` 或默认标记 | diff --git a/settings.yaml b/settings.yaml index 46a52cc..bb0dc04 100644 --- a/settings.yaml +++ b/settings.yaml @@ -25,12 +25,14 @@ spec: name: default_font value: "JetBrains Mono" options: + - label: "系统默认" + value: "system-ui" - label: "JetBrains Mono" value: "JetBrains Mono" - label: "Hack" value: "Hack" - label: "Fira Code" - value: "Fira Code" + value: "Fira Code" - $formkit: checkbox label: 启用全屏布局 name: fullscreen_layout @@ -47,18 +49,10 @@ spec: value: false help: 开启后将默认使用像素风格字体及图标 - $formkit: checkbox - label: 使用系统字体 - name: system_font_enable - id: system_font_enable - value: false - help: 开启后将优先使用访问者的系统字体 - - $formkit: checkbox - if: "$get(system_font_enable).value != true" name: custom_font_enable id: custom_font_enable label: 启用自定义字体文件 value: false - help: '如果启用 "使用系统字体", 此配置项不生效' - $formkit: array if: "$get(custom_font_enable).value === true" name: custom_fonts diff --git a/src/styles/main.scss b/src/styles/main.scss index ae3af07..caee3b9 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -35,10 +35,6 @@ html[data-pixel-style='true'] { --family-theme-font: 'Fusion Pixel 12px Prop zh_hans'; } -html[data-system-font-enabled='true']:not([data-pixel-style='true']) { - --family-theme-font: system-ui; -} - * { scrollbar-width: var(--width-theme-scrollbar); scrollbar-color: var(--color-theme-scrollbar); diff --git a/templates/layout.html b/templates/layout.html index d2f638d..ee3ab8e 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -136,7 +136,6 @@ diff --git a/templates/modules/theme-preferences.html b/templates/modules/theme-preferences.html index 5e13847..5dc9d53 100644 --- a/templates/modules/theme-preferences.html +++ b/templates/modules/theme-preferences.html @@ -1,7 +1,6 @@