From b1444146e632579e58575814786c7d0ba1fd9607 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 14 Jul 2020 18:40:32 +0200 Subject: [PATCH] rename traces of element(-dark) theme in code --- src/components/structures/UserMenu.tsx | 4 ++-- src/theme.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx index 798bfaa7fe..c9360d7ac3 100644 --- a/src/components/structures/UserMenu.tsx +++ b/src/components/structures/UserMenu.tsx @@ -98,7 +98,7 @@ export default class UserMenu extends React.Component { if (theme.startsWith("custom-")) { return getCustomTheme(theme.substring("custom-".length)).is_dark; } - return theme === "dark" || theme === "element-dark"; + return theme === "dark"; } private onProfileUpdate = async () => { @@ -152,7 +152,7 @@ export default class UserMenu extends React.Component { // Disable system theme matching if the user hits this button SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, false); - const newTheme = this.state.isDarkTheme ? "element" : "element-dark"; + const newTheme = this.state.isDarkTheme ? "light" : "dark"; SettingsStore.setValue("theme", null, SettingLevel.DEVICE, newTheme); // set at same level as Appearance tab }; diff --git a/src/theme.js b/src/theme.js index 7babf31cc0..c79e466933 100644 --- a/src/theme.js +++ b/src/theme.js @@ -26,8 +26,6 @@ export function enumerateThemes() { const BUILTIN_THEMES = { "light": _t("Light"), "dark": _t("Dark"), - "element": _t("Element Light"), - "element-dark": _t("Element Dark"), }; const customThemes = SettingsStore.getValue("custom_themes"); const customThemeNames = {};