diff --git a/dist/article/article.css b/dist/article/article.css index 5893fc0..0de6099 100644 --- a/dist/article/article.css +++ b/dist/article/article.css @@ -1,5 +1,5 @@ html, body { - font-family: "Segoe UI Regular", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif; + font-family: "Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif; } html { overflow: hidden scroll; @@ -19,6 +19,9 @@ html { } } +h1, h2, h3, h4, h5, h6, b, strong { + font-weight: 600; +} a { color: var(--primary); text-decoration: none; @@ -63,4 +66,9 @@ article figure figcaption { } article iframe { width: 100%; +} +article code { + font-family: Monaco, Consolas, monospace; + font-size: .875rem; + line-height: 1; } \ No newline at end of file diff --git a/dist/styles.css b/dist/styles.css index 3eaf32c..c446e06 100644 --- a/dist/styles.css +++ b/dist/styles.css @@ -40,7 +40,7 @@ html, body { background-color: transparent; - font-family: "Segoe UI Regular", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif; + font-family: "Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", sans-serif; height: 100%; overflow: hidden; margin: 0; @@ -386,6 +386,10 @@ img.favicon.dropdown { height: 28px; box-shadow: 0 1.6px 3.6px 0 rgba(0,0,0,.132), 0 0.3px 0.9px 0 rgba(0,0,0,.108); } +.list-main .article-search { + max-width: 294px; + margin: 4px 10px; +} @media (min-width: 1441px) { #root > nav.menu-on { @@ -432,6 +436,10 @@ img.favicon.dropdown { left: 280px; max-width: calc(100% - 728px); } + .list-main.menu-on .article-search { + left: 0; + width: 330px; + } nav.hide-btns .btn-group .btn, nav.menu-on .btn-group .btn.hide-wide, .menu .btn-group .btn.hide-wide { display: none; @@ -546,11 +554,6 @@ img.favicon.dropdown { overflow: hidden; background: var(--white); } -.list-main .article-search { - left: 0; - max-width: 330px; - margin: 4px 10px; -} .list-feed-container { width: 350px; background-color: var(--neutralLighterAlt); diff --git a/package.json b/package.json index 92d7ae2..937e8bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fluent-reader", - "version": "0.3.3", + "version": "0.4.0", "description": "A simplistic, modern desktop RSS reader", "main": "./dist/electron.js", "scripts": { @@ -13,7 +13,7 @@ }, "keywords": [], "author": "Haoyuan Liu", - "license": "BSD", + "license": "BSD-3-Clause", "build": { "appId": "me.hyliu.fluentreader", "productName": "Fluent Reader", @@ -25,7 +25,8 @@ "win": { "target": [ "nsis", - "appx" + "appx", + "zip" ] }, "appx": { diff --git a/src/components/settings/about.tsx b/src/components/settings/about.tsx index 4baa065..9e46785 100644 --- a/src/components/settings/about.tsx +++ b/src/components/settings/about.tsx @@ -9,7 +9,7 @@ class AboutTab extends React.Component {
-

Fluent Reader

+

Fluent Reader

{intl.get("settings.version")} {remote.app.getVersion()}

Copyright © 2020 Haoyuan Liu. All rights reserved.

diff --git a/src/components/settings/app.tsx b/src/components/settings/app.tsx index 9d02b78..6ec3f0d 100644 --- a/src/components/settings/app.tsx +++ b/src/components/settings/app.tsx @@ -80,8 +80,8 @@ class AppTab extends React.Component { languageOptions = (): IDropdownOption[] => [ { key: "default", text: intl.get("followSystem") }, { key: "en-US", text: "English" }, - { key: "zh-CN", text: "中文(简体)"}, { key: "fr-FR", text: "Français"}, + { key: "zh-CN", text: "中文(简体)"}, ] toggleStatus = () => { diff --git a/src/components/settings/rules.tsx b/src/components/settings/rules.tsx index dd08e3b..b56ece5 100644 --- a/src/components/settings/rules.tsx +++ b/src/components/settings/rules.tsx @@ -149,6 +149,7 @@ class RulesTab extends React.Component { } onSourceOptionChange = (_, item: IDropdownOption) => { this.initRuleEdit() + this.rulesSelection.setAllSelected(false) this.setState({ sid: item.key as string, selectedRules: [], editIndex: -1, mockTitle: "", mockContent: "", mockResult: "" @@ -285,7 +286,9 @@ class RulesTab extends React.Component { {this.state.sid && ( this.state.editIndex > -1 || !this.getSourceRules() || this.getSourceRules().length === 0 ? <> - + diff --git a/src/scripts/i18n/fr-FR.json b/src/scripts/i18n/fr-FR.json index 33be189..57a4143 100644 --- a/src/scripts/i18n/fr-FR.json +++ b/src/scripts/i18n/fr-FR.json @@ -6,7 +6,10 @@ "name": "Nom", "openExternal": "Ouvrir dans le navigateur", "emptyName": "Ce champ ne peut pas être vide.", + "emptyField": "Ce champ ne peut pas être vide.", "followSystem": "Suivre le système", + "edit": "Modifier", + "delete": "Supprimer", "more": "Plus", "close": "Fermer", "search": "Rechercher",