From 29c247e9b33386f0dea91fa80285577738b3a547 Mon Sep 17 00:00:00 2001
From: Roderick Qiu <scrisqiu@hotmail.com>
Date: Sun, 16 Feb 2020 21:36:44 +0800
Subject: [PATCH] bugs fixed & dark mode optimized

---
 package.json       | 2 +-
 renderer.js        | 2 ++
 res/builder/mac.js | 6 +++++-
 style.css          | 4 ++--
 timer.html         | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index b9bc032..e883c98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wnr",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "It's a timer app with strong expansibility for computers. The name is an abbr of \"Work and Rest\".",
   "main": "main.js",
   "scripts": {
diff --git a/renderer.js b/renderer.js
index 3124bf3..7173173 100644
--- a/renderer.js
+++ b/renderer.js
@@ -10,6 +10,8 @@ function isInDark() {
         $('body').css('color', '#aaaaaa');
         $('hr').css('border-color', '#666666');
         $('#title').css('color', '#aaaaaa');
+        $('.settings-sidebar-block').css('color', '#fefefe');
+        $('.settings-sidebar-block').css('background-color', '#393939');
     } else {
         $('body').append('<style>::-webkit-scrollbar-track {background-color: #fefefe;}</style>');
         $('body').append('<style>::-webkit-scrollbar-thumb {background-color: #5555558f;}</style>');
diff --git a/res/builder/mac.js b/res/builder/mac.js
index 5e6f3fc..998e673 100644
--- a/res/builder/mac.js
+++ b/res/builder/mac.js
@@ -4,7 +4,7 @@ const Platform = builder.Platform
 const config = {
     "mac": {
         "target": [
-            "dir"
+            "dmg"
         ],
         "icon": "res/icons/iconMac.icns",
         "darkModeSupport": true,
@@ -14,6 +14,10 @@ const config = {
             "!res/icons/*Win*",
             "!res/icons/*.psd",
         ]
+    },
+    "dmg": {
+        icon: "res/icons/iconMac.icns",
+        backgroundColor: "#fefefe"
     }
 }
 
diff --git a/style.css b/style.css
index 002bbb0..b45574d 100644
--- a/style.css
+++ b/style.css
@@ -126,8 +126,8 @@ li {
 }
 
 .settings-sidebar-block-highlighted {
-    color: #fefefe;
-    background-color: #5490eac2;
+    color: #fefefe !important;
+    background-color: #5490eac2 !important;
 }
 
 .underlined {
diff --git a/timer.html b/timer.html
index a457a17..1fd99ae 100644
--- a/timer.html
+++ b/timer.html
@@ -68,13 +68,13 @@ <h3>
                 $('#backindex2').attr('title', i18n.__('back-index'));
                 $('#backer').css('display', 'none');
                 $('#skipper').attr('title', i18n.__('skipper'));
-                if (systemName == "darwin") $("#controller").css("display", "none");
+                if (process.platform == "darwin") $("#controller").css("display", "none");
             </script>
         </div>
     </div><!-- for things with 'work' mark, when it's resting, the color should be changed -->
     <div id="bottom-bar">&nbsp;</div>
     <script>
-        if (systemName == "darwin") {
+        if (process.platform == "darwin") {
             $("#win-hider").css("display", "none");
             $("#no-use-space").css("display", "none");
         }