From 35a996454a1788653e845710753a7f8d81726e2a Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp@philippdormann.de>
Date: Tue, 13 Jul 2021 12:49:34 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=91=20darkmode=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/app.scss     | 53 ++++++++++++++++++++++++++----
 src/assets/vars.scss    |  4 +++
 src/layouts/Layout.vue  | 73 ++++++++++++++++++++++++++---------------
 src/pages/Dashboard.vue |  2 +-
 4 files changed, 98 insertions(+), 34 deletions(-)

diff --git a/src/assets/app.scss b/src/assets/app.scss
index cb72fb9..289007a 100644
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -1,16 +1,46 @@
 @import "vars.scss";
 @import "node_modules/bootstrap/scss/bootstrap";
 
+html,
+body,
+input,
+.modal-content {
+    background: var(--page-background);
+    color: var(--main-font-color);
+}
+a,
+.table,
+.nav-link {
+    color: var(--main-font-color);
+}
+.nav-pills .nav-link.active,
+.nav-pills .show > .nav-link {
+    color: #0a0a0a;
+}
+
+.nav-link:hover,
+.nav-link:focus {
+    color: #5cdd8b;
+}
+
+.form-control,
+.form-control:focus,
+.form-select,
+.form-select:focus {
+    color: var(--main-font-color);
+    background-color: var(--background-4);
+}
+
 #app {
-    font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji;
+    font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
+        segoe ui, Roboto, helvetica neue, Arial, noto sans, sans-serif,
+        apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
 }
 
 .shadow-box {
     overflow: hidden;
-    box-shadow: 0 15px 70px rgba(0, 0, 0, .1);
+    box-shadow: 0 15px 70px rgba(0, 0, 0, 0.1);
     padding: 10px;
-    border-radius: 10px;
-
     &.big-padding {
         padding: 20px;
     }
@@ -22,10 +52,14 @@
 }
 
 .btn-primary {
-    color: white;
+    // color: white;
+    color: #0a0a0a;
 
-    &:hover, &:active, &:focus, &.active {
-        color: white;
+    &:hover,
+    &:active,
+    &:focus,
+    &.active {
+        color: #0a0a0a;
         background-color: $highlight;
         border-color: $highlight;
     }
@@ -36,3 +70,8 @@
     backdrop-filter: blur(3px);
 }
 
+@media (prefers-color-scheme: dark) {
+    a:hover {
+        color: #7ce8a4;
+    }
+}
\ No newline at end of file
diff --git a/src/assets/vars.scss b/src/assets/vars.scss
index bae12e9..a3ee277 100644
--- a/src/assets/vars.scss
+++ b/src/assets/vars.scss
@@ -13,6 +13,8 @@ $highlight-white: #e7faec;
     --background-secondary: #d0d3d5;
     --background-4: #d0d3d5;
     --background-ternary: #8e8e8e;
+    --background-sidebar-active: #e4e4e4;
+    --background-navbar: #8e8e8e;
     --main-font-color: #212529;
 }
 
@@ -22,6 +24,8 @@ $highlight-white: #e7faec;
         --background-secondary: #656565;
         --background-4: #313131;
         --background-ternary: #a7a7a7;
+        --background-sidebar-active: #777777;
+        --background-navbar: #333333;
         --main-font-color: #e4e4e4;
     }
 }
\ No newline at end of file
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index b9aca97..25d8b41 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -1,28 +1,35 @@
 <template>
-
-    <div class="lost-connection" v-if="! $root.socket.connected && ! $root.socket.firstConnect">
-        <div class="container-fluid">
-            Lost connection to the socket server. Reconnecting...
-        </div>
+    <div class="lost-connection" v-if="!$root.socket.connected && !$root.socket.firstConnect">
+        <div class="container-fluid">Lost connection to the socket server. Reconnecting...</div>
     </div>
 
     <!-- Desktop header -->
-    <header class="d-flex flex-wrap justify-content-center py-3 mb-3 border-bottom" v-if="! $root.isMobile">
-        <router-link to="/dashboard" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
-            <object class="bi me-2 ms-4" width="40" height="40" data="/icon.svg"></object>
+    <header
+        class="d-flex flex-wrap justify-content-center py-3 mb-3 border-bottom"
+        v-if="!$root.isMobile"
+    >
+        <router-link
+            to="/dashboard"
+            class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-decoration-none"
+        >
+            <img class="bi me-2 ms-4" width="40" height="40" src="/icon.svg" />
             <span class="fs-4 title">Uptime Kuma</span>
         </router-link>
 
-        <ul class="nav nav-pills" >
-            <li class="nav-item"><router-link to="/dashboard" class="nav-link">📊 Dashboard</router-link></li>
-            <li class="nav-item"><router-link to="/settings" class="nav-link">🔧 Settings</router-link></li>
+        <ul class="nav nav-pills">
+            <li class="nav-item">
+                <router-link to="/dashboard" class="nav-link">📊 Dashboard</router-link>
+            </li>
+            <li class="nav-item">
+                <router-link to="/settings" class="nav-link">🔧 Settings</router-link>
+            </li>
         </ul>
     </header>
 
     <!-- Mobile header -->
     <header class="d-flex flex-wrap justify-content-center mt-3 mb-3" v-else>
-        <router-link to="/dashboard" class="d-flex align-items-center  text-dark text-decoration-none">
-            <object class="bi" width="40" height="40" data="/icon.svg"></object>
+        <router-link to="/dashboard" class="d-flex align-items-center text-decoration-none">
+            <img style="height:2rem;" src="/icon.svg" />
             <span class="fs-4 title ms-2">Uptime Kuma</span>
         </router-link>
     </header>
@@ -30,24 +37,39 @@
     <main>
         <!-- Add :key to disable vue router re-use the same component -->
         <router-view v-if="$root.loggedIn" :key="$route.fullPath" />
-        <Login v-if="! $root.loggedIn && $root.allowLoginDialog" />
+        <Login v-if="!$root.loggedIn && $root.allowLoginDialog" />
     </main>
 
     <footer>
         <div class="container-fluid">
             Uptime Kuma -
             Version: {{ $root.info.version }} -
-            <a href="https://github.com/louislam/uptime-kuma/releases" target="_blank">Check Update On GitHub</a>
+            <a
+                href="https://github.com/louislam/uptime-kuma/releases"
+                target="_blank"
+            >Check Update On GitHub</a>
         </div>
     </footer>
 
     <!-- Mobile Only -->
     <div style="width: 100%;height: 60px;" v-if="$root.isMobile"></div>
     <nav class="bottom-nav" v-if="$root.isMobile">
-        <router-link to="/dashboard" class="nav-link" @click="$root.cancelActiveList"><div>📊</div>Dashboard</router-link>
-        <a href="#" :class=" { 'router-link-exact-active' : $root.showListMobile } " @click="$root.showListMobile = ! $root.showListMobile"><div>📃</div>List</a>
-        <router-link to="/add" class="nav-link" @click="$root.cancelActiveList"><div>➕</div>Add</router-link>
-        <router-link to="/settings" class="nav-link" @click="$root.cancelActiveList"><div>🔧</div>Settings</router-link>
+        <router-link to="/dashboard" class="nav-link" @click="$root.cancelActiveList">
+            <div>📊</div>Dashboard
+        </router-link>
+        <a
+            href="#"
+            :class="{ 'router-link-exact-active': $root.showListMobile }"
+            @click="$root.showListMobile = !$root.showListMobile"
+        >
+            <div>📃</div>List
+        </a>
+        <router-link to="/add" class="nav-link" @click="$root.cancelActiveList">
+            <div>➕</div>Add
+        </router-link>
+        <router-link to="/settings" class="nav-link" @click="$root.cancelActiveList">
+            <div>🔧</div>Settings
+        </router-link>
     </nav>
 </template>
 
@@ -70,7 +92,7 @@ export default {
         this.init();
     },
     watch: {
-        $route (to, from) {
+        $route(to, from) {
             this.init();
         }
     },
@@ -95,8 +117,9 @@ export default {
     height: 60px;
     width: 100%;
     left: 0;
-    background-color: #fff;
-    box-shadow: 0 15px 47px 0 rgba(0, 0, 0, 0.05), 0 5px 14px 0 rgba(0, 0, 0, 0.05);
+    background-color: var(--background-navbar);
+    box-shadow: 0 15px 47px 0 rgba(0, 0, 0, 0.05),
+        0 5px 14px 0 rgba(0, 0, 0, 0.05);
     text-align: center;
     white-space: nowrap;
     padding: 0 35px;
@@ -108,7 +131,7 @@ export default {
         height: 100%;
         padding: 8px 10px 0;
         font-size: 13px;
-        color: #c1c1c1;
+        color: var(--main-font-color);
         overflow: hidden;
         text-decoration: none;
 
@@ -138,14 +161,12 @@ export default {
 }
 
 main {
-
 }
 
 footer {
-    color: #AAA;
+    color: #aaa;
     font-size: 13px;
     margin-bottom: 30px;
     margin-left: 10px;
 }
-
 </style>
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index f1f9429..07af1e9 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -133,7 +133,7 @@ export default {
         }
 
         &.active {
-            background-color: #cdf8f4;
+            background-color: var(--background-sidebar-active);
         }
     }
 }