diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css index 530e45e14..c1efff32c 100644 --- a/app/appearance/themes/daylight/theme.css +++ b/app/appearance/themes/daylight/theme.css @@ -29,6 +29,7 @@ --b3-font-family-graph: arial; --b3-font-family-emoji: "Emojis Additional", emojis; --b3-font-family-math: KaTeX_Math; + --b3-font-family-kbd: SFMono-Regular, Consolas, "Liberation Mono", var(--b3-font-family); --b3-font-size: 14px; /* 顶部工具栏 */ diff --git a/app/appearance/themes/daylight/theme.json b/app/appearance/themes/daylight/theme.json index dbe8da6c7..d2c140c1d 100644 --- a/app/appearance/themes/daylight/theme.json +++ b/app/appearance/themes/daylight/theme.json @@ -2,7 +2,7 @@ "name": "daylight", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.9", + "version": "1.1.0", "modes": [ "light" ] diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css index 61d0fcdcf..f70ecda11 100644 --- a/app/appearance/themes/midnight/theme.css +++ b/app/appearance/themes/midnight/theme.css @@ -28,6 +28,7 @@ --b3-font-family-graph: arial; --b3-font-family-emoji: "Emojis Additional", emojis; --b3-font-family-math: KaTeX_Math; + --b3-font-family-kbd: SFMono-Regular, Consolas, "Liberation Mono", var(--b3-font-family); --b3-font-size: 14px; /* 顶部工具栏 */ diff --git a/app/appearance/themes/midnight/theme.json b/app/appearance/themes/midnight/theme.json index a436b3856..890de3abc 100644 --- a/app/appearance/themes/midnight/theme.json +++ b/app/appearance/themes/midnight/theme.json @@ -2,7 +2,7 @@ "name": "midnight", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.0.9", + "version": "1.1.0", "modes": [ "dark" ] diff --git a/app/electron/init.html b/app/electron/init.html index 0a5cfdb6b..b491b9bb5 100644 --- a/app/electron/init.html +++ b/app/electron/init.html @@ -163,7 +163,7 @@ kbd { padding: 2px 4px; - font: 75% Consolas, "Liberation Mono", Menlo, Courier, monospace; + font: 75% SFMono-Regular, Consolas, "Liberation Mono"; line-height: 1; color: #5f6368; vertical-align: middle; diff --git a/app/src/assets/scss/business/_config.scss b/app/src/assets/scss/business/_config.scss index d2842d4df..7b0682858 100644 --- a/app/src/assets/scss/business/_config.scss +++ b/app/src/assets/scss/business/_config.scss @@ -221,7 +221,7 @@ &-keymap { &__key { padding: 2px 4px; - font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family); + font-family: var(--b3-font-family-kbd); line-height: 1; color: var(--b3-theme-on-surface); vertical-align: middle; diff --git a/app/src/assets/scss/business/_search.scss b/app/src/assets/scss/business/_search.scss index 8e4ef7331..5b566760d 100644 --- a/app/src/assets/scss/business/_search.scss +++ b/app/src/assets/scss/business/_search.scss @@ -165,7 +165,7 @@ } padding: 1px 3px; - font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family); + font-family: var(--b3-font-family-kbd); background-color: var(--b3-theme-surface); border: solid 1px var(--b3-theme-surface-lighter); border-radius: var(--b3-border-radius); diff --git a/app/src/assets/scss/component/_menu.scss b/app/src/assets/scss/component/_menu.scss index 95ea7a115..890947f5b 100644 --- a/app/src/assets/scss/component/_menu.scss +++ b/app/src/assets/scss/component/_menu.scss @@ -382,7 +382,7 @@ font-size: .75rem; margin-left: 16px; color: var(--b3-theme-on-surface); - font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family); + font-family: var(--b3-font-family-kbd); } // for protyle hint diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss index ba97150cd..d8fcd9e10 100644 --- a/app/src/assets/scss/component/_typography.scss +++ b/app/src/assets/scss/component/_typography.scss @@ -81,7 +81,7 @@ kbd, span[data-type~="kbd"] { padding: 2px 4px; - font: 75% Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family); + font: 75% var(--b3-font-family-kbd); line-height: 1; color: var(--b3-theme-on-surface); vertical-align: middle; diff --git a/app/src/assets/scss/util/_function.scss b/app/src/assets/scss/util/_function.scss index be152ba2d..b127c016e 100644 --- a/app/src/assets/scss/util/_function.scss +++ b/app/src/assets/scss/util/_function.scss @@ -150,7 +150,7 @@ &__kbd { padding: 2px 4px; - font: 75% Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family); + font: 75% var(--b3-font-family-kbd); line-height: 1; color: var(--b3-theme-on-surface); vertical-align: middle; @@ -164,7 +164,7 @@ padding-left: 2em; } - &__progress { + &__progress { height: 4px; border-radius: var(--b3-border-radius); overflow: hidden;