Skip to content

Commit 699246a

Browse files
committed
fix dark theme fonts, update metadata
1 parent 438c2e2 commit 699246a

File tree

7 files changed

+31
-15
lines changed

7 files changed

+31
-15
lines changed

dist/article/article.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
html,
44
body {
55
margin: 0;
6-
font-family: "Segoe UI", "Source Han Sans Regular",
7-
sans-serif;
6+
font-family: "Segoe UI", "Source Han Sans Regular", sans-serif;
87
}
98
body {
109
padding: 12px 96px 32px;

dist/styles/global.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ body.darwin {
4949
html,
5050
body {
5151
background-color: transparent;
52-
font-family: "Segoe UI", "Source Han Sans Regular",
53-
sans-serif;
52+
font-family: "Segoe UI", "Source Han Sans Regular", sans-serif;
5453
height: 100%;
5554
overflow: hidden;
5655
margin: 0;

electron-builder-mas.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
appId: DevHYLiu.FluentReader
2-
buildVersion: 25
2+
buildVersion: 26
33
productName: Fluent Reader
44
copyright: Copyright © 2020 Haoyuan Liu
55
files:
@@ -29,6 +29,7 @@ mac:
2929
- it
3030
- nl
3131
- ko
32+
- ru
3233
minimumSystemVersion: 10.14.0
3334
mas:
3435
entitlements: build/entitlements.mas.plist

electron-builder.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ mac:
2626
- it
2727
- nl
2828
- ko
29+
- ru
2930
win:
3031
target:
3132
- nsis
@@ -49,6 +50,7 @@ appx:
4950
- it
5051
- nl
5152
- ko
53+
- ru
5254
showNameOnTiles: true
5355
setBuildNumber: true
5456
nsis:

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fluent-reader",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"description": "Modern desktop RSS reader",
55
"main": "./dist/electron.js",
66
"scripts": {

src/scripts/settings.ts

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import { SourceTextDirection } from "./models/source"
77

88
let lightTheme: IPartialTheme = {
99
defaultFontStyle: {
10-
fontFamily:
11-
'"Segoe UI", "Source Han Sans Regular", sans-serif',
10+
fontFamily: '"Segoe UI", "Source Han Sans Regular", sans-serif',
1211
},
1312
}
1413
let darkTheme: IPartialTheme = {
@@ -42,13 +41,29 @@ let darkTheme: IPartialTheme = {
4241
}
4342

4443
export function setThemeDefaultFont(locale: string) {
45-
switch(locale) {
46-
case "zh-CN": lightTheme.defaultFontStyle.fontFamily = '"Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif'; break
47-
case "zh-TW": lightTheme.defaultFontStyle.fontFamily = '"Segoe UI", "Source Han Sans TC Regular", "Microsoft JhengHei", sans-serif'; break
48-
case "ja": lightTheme.defaultFontStyle.fontFamily = '"Segoe UI", "Source Han Sans JP Regular", "Yu Gothic UI", sans-serif'; break
49-
case "ko": lightTheme.defaultFontStyle.fontFamily = '"Segoe UI", "Source Han Sans KR Regular", "Malgun Gothic", sans-serif'; break
50-
default: lightTheme.defaultFontStyle.fontFamily = '"Segoe UI", "Source Han Sans Regular", sans-serif'
44+
switch (locale) {
45+
case "zh-CN":
46+
lightTheme.defaultFontStyle.fontFamily =
47+
'"Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif'
48+
break
49+
case "zh-TW":
50+
lightTheme.defaultFontStyle.fontFamily =
51+
'"Segoe UI", "Source Han Sans TC Regular", "Microsoft JhengHei", sans-serif'
52+
break
53+
case "ja":
54+
lightTheme.defaultFontStyle.fontFamily =
55+
'"Segoe UI", "Source Han Sans JP Regular", "Yu Gothic UI", sans-serif'
56+
break
57+
case "ko":
58+
lightTheme.defaultFontStyle.fontFamily =
59+
'"Segoe UI", "Source Han Sans KR Regular", "Malgun Gothic", sans-serif'
60+
break
61+
default:
62+
lightTheme.defaultFontStyle.fontFamily =
63+
'"Segoe UI", "Source Han Sans Regular", sans-serif'
5164
}
65+
darkTheme.defaultFontStyle.fontFamily =
66+
lightTheme.defaultFontStyle.fontFamily
5267
applyThemeSettings()
5368
}
5469
export function setThemeSettings(theme: ThemeSettings) {

0 commit comments

Comments
 (0)