Add toggle to disable dark mode on per-service basis

2 files changed, 3 insertions, 5 deletions

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index bcff62280..76138aa15 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -354,9 +354,7 @@ export default @observer class EditServiceForm extends Component {
 
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
-                  {recipe.hasDarkMode && (
-                    <Toggle field={form.$('isDarkModeEnabled')} />
-                  )}
+                  <Toggle field={form.$('isDarkModeEnabled')} />
                   <Toggle field={form.$('isEnabled')} />
                 </div>
               </div>
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index d18d16082..ddfd0e139 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -120,7 +120,7 @@ class RecipeController {
       }
     }
 
-    if (this.settings.service.isDarkModeEnabled || this.settings.app.darkMode) {
+    if (this.settings.service.isDarkModeEnabled) {
       debug('Enable dark mode');
 
       // Check if recipe has a darkmode.css
@@ -148,7 +148,7 @@ class RecipeController {
     }
 
     // Remove dark reader if (universal) dark mode was just disabled
-    if (this.universalDarkModeInjected && (!this.settings.app.darkMode || !this.settings.app.universalDarkMode)) {
+    if (this.universalDarkModeInjected && (!this.settings.service.isDarkModeEnabled || !this.settings.app.universalDarkMode)) {
       disableDarkMode();
       this.universalDarkModeInjected = false;
     }