From 128859fdb71d93c00a26e0e4d6f305185b06df02 Mon Sep 17 00:00:00 2001 From: Josh Perez <60019601+josh-signal@users.noreply.github.com> Date: Mon, 20 Jul 2020 14:32:23 -0400 Subject: [PATCH] Support system theme on all platforms --- js/views/app_view.js | 2 +- js/views/settings_view.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/views/app_view.js b/js/views/app_view.js index d2a6d09ee..d05b31394 100644 --- a/js/views/app_view.js +++ b/js/views/app_view.js @@ -10,7 +10,7 @@ function resolveTheme() { const theme = storage.get('theme-setting') || 'system'; - if (window.platform === 'darwin' && theme === 'system') { + if (theme === 'system') { return window.systemTheme; } return theme; diff --git a/js/views/settings_view.js b/js/views/settings_view.js index 6efb03aec..9d5526cf2 100644 --- a/js/views/settings_view.js +++ b/js/views/settings_view.js @@ -159,7 +159,7 @@ audioNotificationDescription: i18n('audioNotificationDescription'), isAudioNotificationSupported: Settings.isAudioNotificationSupported(), isHideMenuBarSupported: Settings.isHideMenuBarSupported(), - hasSystemTheme: window.platform === 'darwin', + hasSystemTheme: true, themeLight: i18n('themeLight'), themeDark: i18n('themeDark'), themeSystem: i18n('themeSystem'),