deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Работа над ночным режимом

Browse Source
This commit is contained in:
Book Pauk
2023-01-11 14:07:08 +07:00
parent f4ce1f337e
commit bf4f5bc88b
6 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
client/components/App.vue
View File

@@ -50,8 +50,9 @@ class App {
if (darkMode !== value) {
const vars = [
'--bg-app-color', '--text-app-color', '--text-anchor-color',
'--bg-loader-color', '--bg-input-color', '--bg-btn1-color',
'--bg-header1-color', '--bg-header2-color',
'--bg-loader-color', '--bg-input-color', '--bg-btn-color1',
'--bg-header-color1', '--bg-header-color2', '--bg-header-color3',
'--bg-menu-color1', '--bg-menu-color2', '--text-menu-color',
];
let root = document.querySelector(':root');
@@ -226,9 +227,13 @@ export default vueComponent(App);
--text-anchor-color: #00f;
--bg-loader-color: #ebe2c9;
--bg-input-color: #fff;
--bg-btn1-color: #1976d2;/* primary */
--bg-header1-color: #007000;
--bg-header2-color: #59B04F;
--bg-btn-color1: #1976d2;/* primary */
--bg-header-color1: #007000;
--bg-header-color2: #59b04f;
--bg-header-color3: #bbdefb;
--bg-menu-color1: #eee;
--bg-menu-color2: #e0e0e0;
--text-menu-color: #757575;
/* light */
--bg-app-color-light: #fff;
@@ -236,9 +241,13 @@ export default vueComponent(App);
--text-anchor-color-light: #00f;
--bg-loader-color-light: #ebe2c9;
--bg-input-color-light: #fff;
--bg-btn1-color-light: #1976d2;/* primary */
--bg-header1-color-light: #007000;
--bg-header2-color-light: #59B04F;
--bg-btn-color1-light: #1976d2;/* primary */
--bg-header-color1-light: #007000;
--bg-header-color2-light: #59b04f;
--bg-header-color3-light: #bbdefb;
--bg-menu-color1-light: #eee;
--bg-menu-color2-light: #e0e0e0;
--text-menu-color-light: #757575;
/* dark */
--bg-app-color-dark: #222;
@@ -246,9 +255,13 @@ export default vueComponent(App);
--text-anchor-color-dark: #09f;
--bg-loader-color-dark: #222;
--bg-input-color-dark: #333;
--bg-btn1-color-dark: #00695c;/* teal-9 */
--bg-header1-color-dark: #004000;
--bg-header2-color-dark: #29901F;
--bg-btn-color1-dark: #00695c;/* teal-9 */
--bg-header-color1-dark: #004000;
--bg-header-color2-dark: #29901f;
--bg-header-color3-dark: #335673;
--bg-menu-color1-dark: #333;
--bg-menu-color2-dark: #424242;
--text-menu-color-dark: #858585;
}
@@ -256,12 +269,36 @@ a {
color: var(--text-anchor-color);
}
.bg-app, .text-bg-app {
background-color: var(--bg-app-color);
}
.text-app {
color: var(--text-app-color);
}
.bg-input {
background-color: var(--bg-input-color);
}
.bg-btn1 {
background-color: var(--bg-btn1-color);
background-color: var(--bg-btn-color1);
}
.bg-menu-1 {
background-color: var(--bg-menu-color1);
}
.bg-menu-2 {
background-color: var(--bg-menu-color2);
}
.text-menu {
color: var(--text-menu-color);
}
.bg-header-3 {
background-color: var(--bg-header-color3);
}
/* main section */

2
client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
View File

@@ -88,6 +88,6 @@ export default vueComponent(CommonHelpPage);
margin-left: 10px;
cursor: pointer;
font-size: 120%;
color: blue;
color: var(--text-anchor-color);
}
</style>

12
client/components/Reader/HelpPage/HelpPage.vue
View File

@@ -1,20 +1,20 @@
<template>
<Window @close="close" style="z-index: 200">
<Window style="z-index: 200" @close="close">
<template #header>
Справка
</template>
<div class="col column" style="min-width: 600px">
<div class="bg-grey-3 row">
<div class="bg-menu-1 row">
<q-tabs
v-model="selectedTab"
active-color="black"
active-bg-color="white"
indicator-color="white"
active-color="app"
active-bg-color="app"
indicator-color="bg-app"
dense
no-caps
inline-label
class="bg-grey-4 text-grey-7"
class="bg-menu-2 text-menu"
>
<q-tab v-for="btn in buttons" :key="btn.value" :name="btn.value" :label="btn.label" />
</q-tabs>

2
client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue
View File

@@ -72,7 +72,7 @@ p {
}
.clickable {
color: blue;
color: var(--text-anchor-color);
text-decoration: underline;
cursor: pointer;
}

10
client/components/Reader/SettingsPage/KeysTab/UserHotKeys/UserHotKeys.vue
View File

@@ -2,10 +2,10 @@
<div class="table col column no-wrap">
<!-- header -->
<div class="table-row row">
<div class="desc q-pa-sm bg-blue-2">
<div class="desc q-pa-sm bg-header-3">
Команда
</div>
<div class="hotKeys col q-pa-sm bg-blue-2 row no-wrap">
<div class="hotKeys col q-pa-sm bg-header-3 row no-wrap">
<div style="width: 80px">
Сочетание клавиш
</div>
@@ -14,7 +14,7 @@
v-model="search"
class="q-ml-sm col"
outlined dense
bg-color="grey-4"
bg-color="input"
placeholder="Найти"
@click.stop
/>
@@ -234,11 +234,11 @@ export default vueComponent(UserHotKeys);
}
.table-row:nth-child(even) {
background-color: #f7f7f7;
background-color: var(--bg-menu-color1);
}
.table-row:hover {
background-color: #f0f0f0;
background-color: var(--bg-menu-color2);
}
.desc {

2
client/components/share/Window.vue
View File

@@ -155,7 +155,7 @@ export default vueComponent(Window);
}
.header {
background: linear-gradient(to bottom right, var(--bg-header1-color), var(--bg-header2-color));
background: linear-gradient(to bottom right, var(--bg-header-color1), var(--bg-header-color2));
align-items: center;
height: 30px;
}