FreshRSS/FluentReader
1
0
Fork 0
mirror of https://github.com/yang991178/fluent-reader.git synced 2025-04-05 14:11:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

add macos vibrancy

Browse Source
This commit is contained in:
刘浩远 2020-06-21 11:38:59 +08:00
parent f7a1fc9b24
commit 5bb22c2ed6
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dist/styles.css vendored
View File

@ -45,9 +45,6 @@ html, body {
overflow: hidden; overflow: hidden;
margin: 0; margin: 0;
} }
body {
background-color: var(--neutralLighterAlt);
}
#root { #root {
height: 100%; height: 100%;
} }
@ -263,7 +260,7 @@ nav.menu-on .btn-group .btn.system, nav.item-on .btn-group .btn.system {
.settings-container { .settings-container {
position: fixed; position: fixed;
z-index: 5; z-index: 7;
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
@ -295,7 +292,7 @@ div[role="tabpanel"] {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #fffa; background-color: #fffa;
z-index: 6; z-index: 8;
} }
.settings .loading .ms-Spinner { .settings .loading .ms-Spinner {
margin-top: 180px; margin-top: 180px;
@ -346,16 +343,18 @@ img.favicon {
} }
.main { .main {
height: calc(100% - 32px); margin-top: -32px;
overflow-y: scroll; height: 100%;
overflow: hidden;
background-color: var(--neutralLighterAlt);
} }
.main::before { .main::before {
content: ""; content: "";
display: block; display: block;
position: sticky; position: sticky;
top: 0; top: 32px;
left: 0; left: 0;
width: 100%; width: calc(100% - 16px);
height: 32px; height: 32px;
margin-bottom: -32px; margin-bottom: -32px;
background: linear-gradient(var(--neutralLighterAlt), #faf9f800); background: linear-gradient(var(--neutralLighterAlt), #faf9f800);
@ -390,10 +389,15 @@ img.favicon {
} }
.menu-container { .menu-container {
width: 280px; width: 280px;
background: none;
backdrop-filter: none;
} }
.menu-container .menu { .menu-container .menu {
background-color: var(--neutralLight); background-color: var(--neutralLight);
} }
body.darwin .menu-container .menu {
background: none;
}
.menu-container .menu::after { .menu-container .menu::after {
content: ""; content: "";
display: block; display: block;
@ -564,6 +568,9 @@ img.favicon {
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-around; justify-content: space-around;
padding: 12px; padding: 12px;
height: calc(100% - 56px);
overflow: hidden scroll;
margin-top: 32px;
} }
.cards-feed-container > div.load-more-wrapper, .flex-fix { .cards-feed-container > div.load-more-wrapper, .flex-fix {
text-align: center; text-align: center;

5
src/electron.ts
View File

@ -29,7 +29,8 @@ function createWindow() {
// Create the browser window. // Create the browser window.
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
title: "Fluent Reader", title: "Fluent Reader",
backgroundColor: nativeTheme.shouldUseDarkColors ? "#282828" : "#faf9f8", backgroundColor: process.platform === "darwin" ? "#00000000" : (nativeTheme.shouldUseDarkColors ? "#282828" : "#faf9f8"),
vibrancy: "sidebar",
x: mainWindowState.x, x: mainWindowState.x,
y: mainWindowState.y, y: mainWindowState.y,
width: mainWindowState.width, width: mainWindowState.width,
@ -55,7 +56,7 @@ function createWindow() {
mainWindow.loadFile((app.isPackaged ? "dist/" : "") + "index.html") mainWindow.loadFile((app.isPackaged ? "dist/" : "") + "index.html")
} }
if (process.platform === 'darwin') { if (process.platform === "darwin") {
const template = [ const template = [
{ {
label: "Application", label: "Application",

1
src/scripts/models/app.ts
View File

@ -199,6 +199,7 @@ export function initIntl(): AppThunk<Promise<void>> {
export function initApp(): AppThunk { export function initApp(): AppThunk {
return (dispatch) => { return (dispatch) => {
document.body.classList.add(process.platform)
dispatch(initIntl()).then(() => dispatch(initIntl()).then(() =>
dispatch(initSources()) dispatch(initSources())
).then(() => ).then(() =>