From 21616f67bfcbcfc98ff317e60e5860879606db66 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Thu, 27 Aug 2020 16:37:58 +1000
Subject: [PATCH] most of the .nightMode redefinitions are no longer required

---
 qt/ts/scss/deckbrowser.scss | 29 ++--------------------
 qt/ts/scss/editor.scss      | 36 +++++++++++++---------------
 qt/ts/scss/overview.scss    |  6 -----
 qt/ts/scss/reviewer.scss    |  2 ++
 qt/ts/scss/toolbar.scss     | 32 +++++++++----------------
 qt/ts/scss/webview.scss     | 48 +++++++++++++++----------------------
 6 files changed, 50 insertions(+), 103 deletions(-)

diff --git a/qt/ts/scss/deckbrowser.scss b/qt/ts/scss/deckbrowser.scss
index 92cf2a9e6..a192fbc74 100644
--- a/qt/ts/scss/deckbrowser.scss
+++ b/qt/ts/scss/deckbrowser.scss
@@ -66,37 +66,12 @@ body {
 .gears {
     width: 1em;
     height: 1em;
-    opacity: .5;
+    opacity: 0.5;
     padding-top: 0.2em;
 }
 
 .nightMode {
-    a.deck {
-        color: var(--text-fg);
-    }
-
-    tr.deck td {
-        border-bottom-color: var(--faint-border);
-    }
-
-    tr.drag-hover td {
-        border-bottom-color: var(--border);
-    }
-
-    .current {
-        background-color: var(--faint-border);
-    }
-
-    .collapse {
-        color: var(--text-fg);
-    }
-
     .gears {
         filter: invert(180);
     }
-
-    .filtered {
-        color: var(--link) !important;
-    }
-
-}
\ No newline at end of file
+}
diff --git a/qt/ts/scss/editor.scss b/qt/ts/scss/editor.scss
index 7ef3f3169..1b4da129f 100644
--- a/qt/ts/scss/editor.scss
+++ b/qt/ts/scss/editor.scss
@@ -45,10 +45,14 @@ body {
 }
 
 .rainbow {
-    background-image: -webkit-gradient(linear, left top, left bottom,
-    color-stop(0.00, #f77),
-    color-stop(50%, #7f7),
-    color-stop(100%, #77f));
+    background-image: -webkit-gradient(
+        linear,
+        left top,
+        left bottom,
+        color-stop(0, #f77),
+        color-stop(50%, #7f7),
+        color-stop(100%, #77f)
+    );
 }
 
 button.linkb {
@@ -76,27 +80,19 @@ button.highlighted {
     background: var(--flag1-bg);
 }
 
-.nightMode {
-    .field {
-        border-color: var(--border);
-        background: var(--frame-bg);
-        color: var(--text-fg);
-    }
+#dupes a {
+    color: var(--link);
+}
 
+.nightMode {
     button.linkb > img {
         filter: invert(180);
     }
-
-    .dupe {
-        background: var(--flag1-bg);
-    }
-
-    #dupes a {
-        color: var(--link);
-    }
 }
 
-.drawing { zoom: 50%; }
+.drawing {
+    zoom: 50%;
+}
 .nightMode img.drawing {
-    filter: unquote("invert() hue-rotate(180deg)")
+    filter: unquote("invert() hue-rotate(180deg)");
 }
diff --git a/qt/ts/scss/overview.scss b/qt/ts/scss/overview.scss
index e72a00d5c..688d84d6e 100644
--- a/qt/ts/scss/overview.scss
+++ b/qt/ts/scss/overview.scss
@@ -33,9 +33,3 @@ h3 {
 .dyn {
     text-align: center;
 }
-
-.nightMode {
-    .descfont {
-        color: var(--slightly-grey-text);
-    }
-}
diff --git a/qt/ts/scss/reviewer.scss b/qt/ts/scss/reviewer.scss
index 4a926f514..fd04219a7 100644
--- a/qt/ts/scss/reviewer.scss
+++ b/qt/ts/scss/reviewer.scss
@@ -10,6 +10,8 @@ body {
     overflow-wrap: break-word;
 }
 
+// explicit nightMode definition required
+// to override default .card styling
 body.nightMode {
     background-color: var(--window-bg);
     color: var(--text-fg);
diff --git a/qt/ts/scss/toolbar.scss b/qt/ts/scss/toolbar.scss
index f6dd2f897..235387461 100644
--- a/qt/ts/scss/toolbar.scss
+++ b/qt/ts/scss/toolbar.scss
@@ -33,24 +33,12 @@ body {
     text-decoration: underline;
 }
 
-.hitem:focus { outline: 0; }
+.hitem:focus {
+    outline: 0;
+}
 
-.nightMode {
-    .hitem {
-        color: var(--text-fg);
-    }
-
-    #header {
-        border-bottom-color: var(--faint-border);
-    }
-
-    .normal-sync {
-        color: var(--new-count);
-    }
-
-    .full-sync {
-        color: var(--learn-count);
-    }
+.nightMode #header {
+    border-bottom-color: var(--faint-border);
 }
 
 .isMac.nightMode #header {
@@ -58,8 +46,12 @@ body {
 }
 
 @keyframes spin {
-    0% {-webkit-transform: rotate(0deg);}
-    100% {-webkit-transform: rotate(360deg);}
+    0% {
+        -webkit-transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform: rotate(360deg);
+    }
 }
 
 .spin {
@@ -85,5 +77,3 @@ body {
 .full-sync {
     color: var(--learn-count);
 }
-
-
diff --git a/qt/ts/scss/webview.scss b/qt/ts/scss/webview.scss
index 65d433218..421575a42 100644
--- a/qt/ts/scss/webview.scss
+++ b/qt/ts/scss/webview.scss
@@ -8,6 +8,7 @@ body {
     margin: 2em;
     color: var(--text-fg);
     background: var(--window-bg);
+    overscroll-behavior: none;
 }
 
 h1 {
@@ -19,39 +20,28 @@ a {
 }
 
 body.nightMode {
-    color: var(--text-fg);
-    background: var(--window-bg);
-}
+    &::-webkit-scrollbar {
+        background: var(--window-bg);
 
-body.nightMode::-webkit-scrollbar {
-    background: var(--window-bg);
-}
+        &:horizontal {
+            height: 12px;
+        }
 
-body.nightMode::-webkit-scrollbar:horizontal {
-    height: 12px;
-}
+        &:vertical {
+            width: 12px;
+        }
+    }
 
-body.nightMode::-webkit-scrollbar:vertical {
-    width: 12px;
-}
+    &::-webkit-scrollbar-thumb {
+        background: buttons.$fusion-button-hover-bg;
+        border-radius: 8px;
 
-body.nightMode::-webkit-scrollbar-thumb {
-    background: buttons.$fusion-button-hover-bg;
-    border-radius: 8px;
-}
+        &:horizontal {
+            min-width: 50px;
+        }
 
-body.nightMode::-webkit-scrollbar-thumb:horizontal {
-    min-width: 50px;
-}
-
-body.nightMode::-webkit-scrollbar-thumb:vertical {
-    min-height: 50px;
-}
-
-.nightMode {
-    a {
-        color: var(--link);
+        &:vertical {
+            min-height: 50px;
+        }
     }
 }
-
-body { overscroll-behavior: none; }