From 5b3c3f53fe5b636235b73bc81f2cf35ce1cfcfde Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Tue, 14 Jul 2020 13:56:24 +0100 Subject: [PATCH] Use element theme by default --- src/settings/controllers/ThemeController.js | 2 +- src/settings/watchers/ThemeWatcher.ts | 6 +++--- src/theme.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/settings/controllers/ThemeController.js b/src/settings/controllers/ThemeController.js index 4098a5ca3e..f2f3e95a97 100644 --- a/src/settings/controllers/ThemeController.js +++ b/src/settings/controllers/ThemeController.js @@ -24,7 +24,7 @@ export default class ThemeController extends SettingController { getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) { if (!calculatedValue) return null; // Don't override null themes - if (ThemeController.isLogin) return 'light'; + if (ThemeController.isLogin) return 'element'; const themes = enumerateThemes(); // Override in case some no longer supported theme is stored here diff --git a/src/settings/watchers/ThemeWatcher.ts b/src/settings/watchers/ThemeWatcher.ts index ce0db881c0..1dddff1273 100644 --- a/src/settings/watchers/ThemeWatcher.ts +++ b/src/settings/watchers/ThemeWatcher.ts @@ -99,7 +99,7 @@ export default class ThemeWatcher { // controller that honours the same flag, although probablt better would be to // have the theme logic in one place rather than split between however many // different places. - if (ThemeController.isLogin) return 'light'; + if (ThemeController.isLogin) return 'element'; // If the user has specifically enabled the system matching option (excluding default), // then use that over anything else. We pick the lowest possible level for the setting @@ -108,8 +108,8 @@ export default class ThemeWatcher { SettingLevel.DEVICE, "use_system_theme", null, false, true); if (systemThemeExplicit) { console.log("returning explicit system theme"); - if (this.preferDark.matches) return 'dark'; - if (this.preferLight.matches) return 'light'; + if (this.preferDark.matches) return 'element-dark'; + if (this.preferLight.matches) return 'element'; } // If the user has specifically enabled the theme (without the system matching option being diff --git a/src/theme.js b/src/theme.js index 7babf31cc0..2797e7d556 100644 --- a/src/theme.js +++ b/src/theme.js @@ -17,7 +17,7 @@ limitations under the License. import {_t} from "./languageHandler"; -export const DEFAULT_THEME = "light"; +export const DEFAULT_THEME = "element"; import Tinter from "./Tinter"; import SettingsStore from "./settings/SettingsStore"; import ThemeWatcher from "./settings/watchers/ThemeWatcher";