From e6b1d4b032445fd1cf8ba99e518cc881572c8104 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 11 Jan 2023 14:46:27 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20=D0=BD=D0=BE=D1=87=D0=BD=D1=8B=D0=BC=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B6=D0=B8=D0=BC=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/App.vue                     | 20 ++++++++++++++++---
 client/components/Reader/Reader.vue           |  2 --
 .../Reader/SearchPage/SearchPage.vue          |  1 +
 .../SetPositionPage/SetPositionPage.vue       |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index 8f544b7e..45bd8f2e 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -30,7 +30,10 @@ const componentOptions = {
         mode: function() {
             this.setAppTitle();
             this.redirectIfNeeded();
-        }
+        },
+        nightMode() {
+            this.setNightMode();
+        },
     },
 
 };
@@ -138,6 +141,8 @@ class App {
         window.addEventListener('resize', (event) => {
             this.$root.eventHook('resize', event);
         });
+
+        this.setNightMode();
     }
 
     mounted() {
@@ -179,6 +184,15 @@ class App {
         return this.$root.getRootRoute();
     }
 
+    get nightMode() {
+        return this.$store.state.reader.settings.nightMode;
+    }
+
+    setNightMode() {
+        this.$root.setDarkMode(this.nightMode);
+        this.$q.dark.set(this.nightMode);
+    }
+
     setAppTitle(title) {
         if (!title) {
             if (this.mode == 'liberama') {
@@ -229,7 +243,7 @@ export default vueComponent(App);
     --text-app-color: #000;
     --text-anchor-color: #00f;
     --bg-loader-color: #ebe2c9;
-    --bg-input-color: #fff;
+    --bg-input-color: #eee;
     --bg-btn-color1: #1976d2;/* primary */
     --bg-header-color1: #007000;
     --bg-header-color2: #59b04f;
@@ -252,7 +266,7 @@ export default vueComponent(App);
     --text-app-color-light: #000;
     --text-anchor-color-light: #00f;
     --bg-loader-color-light: #ebe2c9;
-    --bg-input-color-light: #fff;
+    --bg-input-color-light: #eee;
     --bg-btn-color1-light: #1976d2;/* primary */
     --bg-header-color1-light: #007000;
     --bg-header-color2-light: #59b04f;
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index c8b69822..44b8573c 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -473,8 +473,6 @@ class Reader {
 
         //dark mode
         this.nightModeActive = settings.nightMode;
-        this.$root.setDarkMode(this.nightModeActive);
-        this.$q.dark.set(this.nightModeActive);
 
         this.clickControlActive = settings.clickControl;
         this.blinkCachedLoad = settings.blinkCachedLoad;
diff --git a/client/components/Reader/SearchPage/SearchPage.vue b/client/components/Reader/SearchPage/SearchPage.vue
index 1997a433..d559c61d 100644
--- a/client/components/Reader/SearchPage/SearchPage.vue
+++ b/client/components/Reader/SearchPage/SearchPage.vue
@@ -11,6 +11,7 @@
                 <q-input
                     ref="input" v-model="needle"
                     class="col" outlined dense
+                    bg-color="input"
                     placeholder="Найти"
                     @keydown="inputKeyDown"         
                 />
diff --git a/client/components/Reader/SetPositionPage/SetPositionPage.vue b/client/components/Reader/SetPositionPage/SetPositionPage.vue
index dde7f0fb..773a62f9 100644
--- a/client/components/Reader/SetPositionPage/SetPositionPage.vue
+++ b/client/components/Reader/SetPositionPage/SetPositionPage.vue
@@ -80,7 +80,7 @@ export default vueComponent(SetPositionPage);
 .slider {
     margin: 0 20px 0 20px;
     height: 35px;
-    background-color: #efefef;
+    background-color: var(--bg-input-color);
     border-radius: 15px;
 }
 </style>