From 1f136ba89260a51fb1d050e0046a442f54d37838 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Sun, 21 Jun 2020 20:27:39 +0200
Subject: [PATCH] Minor fixes for dark mode

---
 src/css/common.scss             | 2 +-
 src/css/ingame_hud/dialogs.scss | 6 ++++--
 src/css/main.scss               | 2 +-
 src/css/states/settings.scss    | 6 +++---
 src/css/textual_game_state.scss | 4 ++--
 src/css/variables.scss          | 2 ++
 src/js/changelog.js             | 2 ++
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/css/common.scss b/src/css/common.scss
index f616eace..6a87012e 100644
--- a/src/css/common.scss
+++ b/src/css/common.scss
@@ -40,7 +40,7 @@ html {
     background: #dee1ea;
 
     @include DarkThemeOverride {
-        background: #5c606c;
+        background: $darkModeGameBackground;
     }
 }
 
diff --git a/src/css/ingame_hud/dialogs.scss b/src/css/ingame_hud/dialogs.scss
index cd681a9e..d72265e7 100644
--- a/src/css/ingame_hud/dialogs.scss
+++ b/src/css/ingame_hud/dialogs.scss
@@ -21,15 +21,17 @@
         }
     }
 
+    $darkModeDialogBg: darken($darkModeGameBackground, 10);
+
     @include DarkThemeOverride {
-        background: rgba(#33363d, 0.9);
+        background: rgba($darkModeDialogBg, 0.9);
         @include InlineAnimation(0.12s ease-in-out) {
             0% {
                 background-color: transparent;
                 opacity: 0.5;
             }
             100% {
-                background-color: rgba(#33363d, 0.9);
+                background-color: rgba($darkModeDialogBg, 0.9);
             }
         }
 
diff --git a/src/css/main.scss b/src/css/main.scss
index 598e9e92..178f398b 100644
--- a/src/css/main.scss
+++ b/src/css/main.scss
@@ -112,6 +112,6 @@ body.modalDialogActive,
 body.externalAdOpen,
 body.ingameDialogOpen {
     > *:not(.ingameDialog):not(.modalDialogParent):not(.loadingDialog):not(.gameLoadingOverlay):not(#ingame_HUD_ModalDialogs):not(.noBlur) {
-        filter: blur(5px) !important;
+        // filter: blur(5px) !important;
     }
 }
diff --git a/src/css/states/settings.scss b/src/css/states/settings.scss
index 6c3df736..f06c9b31 100644
--- a/src/css/states/settings.scss
+++ b/src/css/states/settings.scss
@@ -92,11 +92,11 @@
     @include DarkThemeOverride {
         .content {
             .setting {
-                background: #424345;
+                background: darken($darkModeGameBackground, 10);
 
                 .value.enum {
                     // dirty but works
-                    filter: invert(0.8);
+                    filter: invert(0.85);
                     color: #222;
                 }
 
@@ -104,7 +104,7 @@
                     background-color: #74767b;
 
                     &.checked {
-                        background-color: #605b7d;
+                        background-color: $colorBlueBright;
                     }
                 }
             }
diff --git a/src/css/textual_game_state.scss b/src/css/textual_game_state.scss
index 1f9dc356..a8d7a31f 100644
--- a/src/css/textual_game_state.scss
+++ b/src/css/textual_game_state.scss
@@ -65,7 +65,7 @@
     @include DarkThemeOverride {
         .headerBar {
             h1 {
-                color: #cfceca;
+                color: #e2e0db;
             }
 
             .backButton {
@@ -74,7 +74,7 @@
         }
 
         > .container > .content {
-            background: #4b4c50;
+            background: darken($darkModeGameBackground, 3);
             color: #eee;
         }
     }
diff --git a/src/css/variables.scss b/src/css/variables.scss
index 5f056a00..c1c69371 100644
--- a/src/css/variables.scss
+++ b/src/css/variables.scss
@@ -38,6 +38,8 @@ $ingameHudBg: rgba(#333438, 0.9);
 
 $text3dColor: #f4ffff;
 
+$darkModeGameBackground: #5c606c;
+
 // Dialog properties
 $modalDialogBg: rgba(160, 165, 180, 0.8);
 $dialogBgColor: lighten($mainBgColor, 10);
diff --git a/src/js/changelog.js b/src/js/changelog.js
index c5be2056..0d980695 100644
--- a/src/js/changelog.js
+++ b/src/js/changelog.js
@@ -9,10 +9,12 @@ export const CHANGELOG = [
             "Automatically deselect area when selecting a new building",
             "Raise markers limit from 14 characters to 71 (by Joker-vD)",
             "Optimize performance by caching miner items (by Phlosioneer)",
+            "Apply dark theme to menu as well (by dengr1065)",
             "Fix belt planner not placing the last belt",
             "Fix buildings getting deleted when right clicking while placing a blueprint",
             "Fix for exporting screenshots for huge bases (It was showing an empty file) (by xSparfuchs)",
             "Fix buttons not responding when using right click directly after left click (by davidburhans)",
+            "Disable dialog background blur since it can cause performance issues",
             "Added simplified chinese translations",
             "Update translations (Thanks to all translators!)",
         ],