styles updates

This commit is contained in:
刘浩远 2020-06-25 10:18:49 +08:00
parent b3e594ee27
commit 2e4e400811
7 changed files with 31 additions and 13 deletions

View File

@ -1,5 +1,5 @@
html, body { 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 { html {
overflow: hidden scroll; overflow: hidden scroll;
@ -19,6 +19,9 @@ html {
} }
} }
h1, h2, h3, h4, h5, h6, b, strong {
font-weight: 600;
}
a { a {
color: var(--primary); color: var(--primary);
text-decoration: none; text-decoration: none;
@ -63,4 +66,9 @@ article figure figcaption {
} }
article iframe { article iframe {
width: 100%; width: 100%;
}
article code {
font-family: Monaco, Consolas, monospace;
font-size: .875rem;
line-height: 1;
} }

15
dist/styles.css vendored
View File

@ -40,7 +40,7 @@
html, body { html, body {
background-color: transparent; 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%; height: 100%;
overflow: hidden; overflow: hidden;
margin: 0; margin: 0;
@ -386,6 +386,10 @@ img.favicon.dropdown {
height: 28px; 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); 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) { @media (min-width: 1441px) {
#root > nav.menu-on { #root > nav.menu-on {
@ -432,6 +436,10 @@ img.favicon.dropdown {
left: 280px; left: 280px;
max-width: calc(100% - 728px); 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 { nav.hide-btns .btn-group .btn, nav.menu-on .btn-group .btn.hide-wide, .menu .btn-group .btn.hide-wide {
display: none; display: none;
@ -546,11 +554,6 @@ img.favicon.dropdown {
overflow: hidden; overflow: hidden;
background: var(--white); background: var(--white);
} }
.list-main .article-search {
left: 0;
max-width: 330px;
margin: 4px 10px;
}
.list-feed-container { .list-feed-container {
width: 350px; width: 350px;
background-color: var(--neutralLighterAlt); background-color: var(--neutralLighterAlt);

View File

@ -1,6 +1,6 @@
{ {
"name": "fluent-reader", "name": "fluent-reader",
"version": "0.3.3", "version": "0.4.0",
"description": "A simplistic, modern desktop RSS reader", "description": "A simplistic, modern desktop RSS reader",
"main": "./dist/electron.js", "main": "./dist/electron.js",
"scripts": { "scripts": {
@ -13,7 +13,7 @@
}, },
"keywords": [], "keywords": [],
"author": "Haoyuan Liu", "author": "Haoyuan Liu",
"license": "BSD", "license": "BSD-3-Clause",
"build": { "build": {
"appId": "me.hyliu.fluentreader", "appId": "me.hyliu.fluentreader",
"productName": "Fluent Reader", "productName": "Fluent Reader",
@ -25,7 +25,8 @@
"win": { "win": {
"target": [ "target": [
"nsis", "nsis",
"appx" "appx",
"zip"
] ]
}, },
"appx": { "appx": {

View File

@ -9,7 +9,7 @@ class AboutTab extends React.Component {
<div className="tab-body"> <div className="tab-body">
<Stack className="settings-about" horizontalAlign="center"> <Stack className="settings-about" horizontalAlign="center">
<img src="icons/logo.svg" style={{width: 120, height: 120}} /> <img src="icons/logo.svg" style={{width: 120, height: 120}} />
<h3>Fluent Reader</h3> <h3 style={{fontWeight: 600}}>Fluent Reader</h3>
<small>{intl.get("settings.version")} {remote.app.getVersion()}</small> <small>{intl.get("settings.version")} {remote.app.getVersion()}</small>
<p className="settings-hint">Copyright © 2020 Haoyuan Liu. All rights reserved.</p> <p className="settings-hint">Copyright © 2020 Haoyuan Liu. All rights reserved.</p>
<Stack horizontal horizontalAlign="center" tokens={{childrenGap: 12}}> <Stack horizontal horizontalAlign="center" tokens={{childrenGap: 12}}>

View File

@ -80,8 +80,8 @@ class AppTab extends React.Component<AppTabProps, AppTabState> {
languageOptions = (): IDropdownOption[] => [ languageOptions = (): IDropdownOption[] => [
{ key: "default", text: intl.get("followSystem") }, { key: "default", text: intl.get("followSystem") },
{ key: "en-US", text: "English" }, { key: "en-US", text: "English" },
{ key: "zh-CN", text: "中文(简体)"},
{ key: "fr-FR", text: "Français"}, { key: "fr-FR", text: "Français"},
{ key: "zh-CN", text: "中文(简体)"},
] ]
toggleStatus = () => { toggleStatus = () => {

View File

@ -149,6 +149,7 @@ class RulesTab extends React.Component<RulesTabProps, RulesTabState> {
} }
onSourceOptionChange = (_, item: IDropdownOption) => { onSourceOptionChange = (_, item: IDropdownOption) => {
this.initRuleEdit() this.initRuleEdit()
this.rulesSelection.setAllSelected(false)
this.setState({ this.setState({
sid: item.key as string, selectedRules: [], editIndex: -1, sid: item.key as string, selectedRules: [], editIndex: -1,
mockTitle: "", mockContent: "", mockResult: "" mockTitle: "", mockContent: "", mockResult: ""
@ -285,7 +286,9 @@ class RulesTab extends React.Component<RulesTabProps, RulesTabState> {
{this.state.sid && ( {this.state.sid && (
this.state.editIndex > -1 || !this.getSourceRules() || this.getSourceRules().length === 0 this.state.editIndex > -1 || !this.getSourceRules() || this.getSourceRules().length === 0
? <> ? <>
<Label>{intl.get("rules.new")}</Label> <Label>
{intl.get((this.state.editIndex >= 0 && this.state.editIndex < this.getSourceRules().length) ? "edit" : "rules.new")}
</Label>
<Stack horizontal> <Stack horizontal>
<Stack.Item> <Stack.Item>
<Label>{intl.get("rules.if")}</Label> <Label>{intl.get("rules.if")}</Label>

View File

@ -6,7 +6,10 @@
"name": "Nom", "name": "Nom",
"openExternal": "Ouvrir dans le navigateur", "openExternal": "Ouvrir dans le navigateur",
"emptyName": "Ce champ ne peut pas être vide.", "emptyName": "Ce champ ne peut pas être vide.",
"emptyField": "Ce champ ne peut pas être vide.",
"followSystem": "Suivre le système", "followSystem": "Suivre le système",
"edit": "Modifier",
"delete": "Supprimer",
"more": "Plus", "more": "Plus",
"close": "Fermer", "close": "Fermer",
"search": "Rechercher", "search": "Rechercher",