diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 0040eba..38721f6 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -121,7 +121,7 @@ pub fn setup_app(app: &mut App) -> Result<(), Box> { fn setup_database(app: &mut App) -> Result<(), Box> { let handle = app.handle().clone(); - let db_path = if cfg!(debug_assertions) { + let db_path = if cfg!(all(debug_assertions, desktop)) { std::path::PathBuf::from("data.sql") } else { let app_data_dir = handle diff --git a/src/assets/main.css b/src/assets/main.css index f850701..4729437 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -2,9 +2,11 @@ :root { --ss-font-family: - "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Noto Sans SC", "Noto Sans CJK SC", - "Microsoft YaHei", "微软雅黑", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, - "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; + "PingFang SC", "PingFangTC-Regular", "Hiragino Sans GB", "Hiragino Sans", + "STHeiti", "Heiti SC", "Noto Sans CJK SC", "Noto Sans SC", "Source Han Sans SC", + "Microsoft YaHei UI", "Microsoft YaHei", "微软雅黑", -apple-system, BlinkMacSystemFont, + "Segoe UI", Roboto, "Helvetica Neue", Arial, "Apple Color Emoji", "Segoe UI Emoji", + sans-serif; } html, @@ -32,6 +34,16 @@ select { font-family: var(--ss-font-family); } +.ant-typography, +.ant-btn, +.ant-input, +.ant-input-affix-wrapper, +.ant-select, +.ant-select-selection-item, +.ant-message-notice-content { + font-family: var(--ss-font-family) !important; +} + .ss-sidebar { color: var(--ss-sidebar-text, var(--ss-text-main)); } diff --git a/src/components/OOBE/OOBE.tsx b/src/components/OOBE/OOBE.tsx index 994a7e5..eb9c36f 100644 --- a/src/components/OOBE/OOBE.tsx +++ b/src/components/OOBE/OOBE.tsx @@ -774,8 +774,7 @@ export const OOBE: React.FC = ({ visible, onComplete }) => { maxWidth: "90vw", boxShadow: isDark ? "0 8px 32px rgba(0, 0, 0, 0.3)" : "0 8px 32px rgba(0, 0, 0, 0.1)", border: isDark ? "1px solid rgba(255, 255, 255, 0.08)" : "1px solid rgba(0, 0, 0, 0.06)", - fontFamily: - '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", sans-serif, "Apple Color Emoji", "Segoe UI Emoji"', + fontFamily: "var(--ss-font-family)", }} > {contextHolder}