optimized for dark mode etc

RoderickQiu · Aug 7, 2020 · a3d2c6f · a3d2c6f
1 parent a023f4c
commit a3d2c6f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 31 deletions.
diff --git a/loader.css b/loader.css
@@ -64,7 +64,6 @@
     top: 0;
     width: 51%;
     height: 100%;
-    background: #fefefe;
     transform: translateX(0);
 }
 

diff --git a/locales/en.json b/locales/en.json
@@ -54,7 +54,7 @@
     "issues": "Issues",
     "time-settings": "Time Settings",
     "global-settings": "Global Settings",
-    "languages": "Language Settings",
+    "languages": "Languages",
     "language-setting": "Language: ",
     "language-setting-tip": "Select your language.",
     "language-contribute-tip-part-1": "If you practice another language, please",

diff --git a/main.js b/main.js
@@ -216,7 +216,7 @@ function touchBarSolution(mode) {
                 if (mode == "index") {
                     let settingsSubmitter = new TouchBarButton({
                         label: i18n.__('settings'),
-                        click: () => settings()
+                        click: () => settings("normal")
                     });
                     let helperSubmitter = new TouchBarButton({
                         label: i18n.__('website'),
@@ -634,7 +634,7 @@ function traySolution(isFullScreen) {
                 enabled: (!store.get('islocked')) && (!isTimerWin),
                 label: i18n.__('settings'),
                 click: function () {
-                    settings();
+                    settings("normal");
                 }
             }, {
                 enabled: !isTimerWin,
@@ -901,8 +901,13 @@ function leanCloudSolution() {
 function isDarkMode() {
     if (app.isReady()) {
         if (store.has("dark-or-white")) {
-            if (store.get("dark-or-white") == "light") return false;
-            else return true;
+            if (store.get("dark-or-white") == "light") {
+                win.setBackgroundColor('#fefefe');
+                return false;
+            } else {
+                win.setBackgroundColor('#191919');
+                return true;
+            }
         } else {
             styleCache.set('isdark', false);
             darkModeSettingsFinder();
@@ -1500,7 +1505,7 @@ function settings(mode) {
             settingsWin = new BrowserWindow({
                 parent: win,
                 width: isChinese ? 780 : 888,
-                height: 480,
+                height: 453,
                 backgroundColor: isDarkMode() ? "#191919" : "#fefefe",
                 resizable: false,
                 maximizable: false,

diff --git a/style.css b/style.css
@@ -13,6 +13,7 @@ html, body {
     width: 100%;
     height: 100%;
     display: -webkit-flex;
+    background-color: #00000000;
     overflow: hidden;
     align-items: center;
     /* center in v/h */
@@ -408,7 +409,7 @@ li input[type="checkbox"]::after {
     top: 88px;
     left: 32%;
     overflow-y: scroll;
-    height: 375px;
+    height: 350px;
     width: 63%;
     word-break: normal;
 }

diff --git a/supporter.js b/supporter.js
@@ -51,29 +51,7 @@ function isInDark() {
     const isDarkMode = (store.get("dark-or-white") == "dark") || styleCache.get('isdark');
     if (isDarkMode) {
         $('body').append(
-            '<style id="darkmode-jetplane">\
-            ::-webkit-scrollbar-track {background-color: #191919;}\
-            ::-webkit-scrollbar-thumb {background-color: #999999;}\
-            .dropdown-menu {border-color: #aaaaaa; background-color: #393939;}\
-            .dropdown-item:hover {background-color: #555555; color: #fefefe;}\
-            input[type="range"] {background-color: #aaaaaa33;}\
-            body {background-color: #191919;}\
-            hr {border-color: #666666;}\
-            #title {color: #aaaaaa;}\
-            #settings-sidebar {border-right-color: #aaaaaa33;}\
-            .settings-sidebar-block {color: #fefefe; background-color: #191919;}\
-            #loader-wrapper .loader-section {background: #191919;}\
-            .dropdown-item, .dropdown-item .text-info {color: #f5f5f5!important;}\
-            label, li, select, #personalization input[type="text"] {color: #f5f5f5;}\
-            input[type="text"]:focus, input[type="number"]:focus, input[type="password"]:focus,\
-            #settings-container input[type="text"]:focus, #settings-container input[type="number"]:focus, #settings-container input:focus,\
-            #settings-container .dropdown .btn:focus, #dropdown-menu-button:focus\ {border-bottom-color: #cccccc33 !important;}\
-            input[type="text"]:hover, input[type="number"]:hover, input[type="password"]:hover,\
-            #settings-container input[type="text"]:hover, #settings-container input[type="number"]:hover, #settings-container input:hover,\
-            #settings-container .dropdown .btn:hover, #dropdown-menu-button:hover{border-bottom-color: #cccccc28 !important;}\
-            .hotkey-setting {color: #aaaaaa;}\
-            html {border: #ffffff33 1px solid;}\
-            </style>'
+            '<style id="darkmode-jetplane">::-webkit-scrollbar-track {background-color: #191919;} ::-webkit-scrollbar-thumb {background-color: #999999;} .dropdown-menu {border-color: #aaaaaa; background-color: #393939;} .dropdown-item:hover {background-color: #555555; color: #fefefe;} input[type="range"] {background-color: #aaaaaa33;}body {background-color: #191919;} hr {border-color: #666666;} #title {color: #aaaaaa;} #settings-sidebar {border-right-color: #aaaaaa33;} .settings-sidebar-block {color: #fefefe; background-color: #191919;} #loader-wrapper .loader-section {background: #191919;} .dropdown-item, .dropdown-item .text-info {color: #f5f5f5!important;} label, li, select, #personalization input[type="text"] {color: #f5f5f5;} #settings-container input[type="text"], #settings-container input[type="number"], #settings-container input[type="password"], #settings-container input[type="text"], #settings-container .dropdown .btn, #dropdown-menu-button {border-bottom-color: #cccccc23 !important;} input[type="text"]:focus, input[type="number"]:focus, input[type="password"]:focus, #settings-container input[type="text"]:focus, #settings-container input[type="number"]:focus, #settings-container input:focus, #settings-container .dropdown .btn:focus, #dropdown-menu-button:focus {border-bottom-color: #cccccc33 !important;} input[type="text"]:hover, input[type="number"]:hover, input[type="password"]:hover, #settings-container input[type="text"]:hover, #settings-container input[type="number"]:hover, #settings-container input:hover, #settings-container .dropdown .btn:hover, #dropdown-menu-button:hover {border-bottom-color: #cccccc28 !important;} .hotkey-setting {color: #aaaaaa;} html {border: #ffffff33 1px solid;}</style>'
         );
     } else {
         $('#darkmode-jetplane').remove();