OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Merge branch 'nadonomy/use-element-theme' into 'element'" 

This reverts merge request !9
pull/21833/head
Bruno Windels 2020-07-14 16:23:06 +00:00
parent ea511faafe
commit f47268ce74
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings/Settings.js
View File

@ -310,7 +310,7 @@ export const SETTINGS = {
}, },
"theme": { "theme": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS, supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: "element", default: "light",
controller: new ThemeController(), controller: new ThemeController(),
}, },
"custom_themes": { "custom_themes": {

2
src/settings/controllers/ThemeController.js
View File

@ -24,7 +24,7 @@ export default class ThemeController extends SettingController {
getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) { getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
if (!calculatedValue) return null; // Don't override null themes if (!calculatedValue) return null; // Don't override null themes
if (ThemeController.isLogin) return 'element'; if (ThemeController.isLogin) return 'light';
const themes = enumerateThemes(); const themes = enumerateThemes();
// Override in case some no longer supported theme is stored here // Override in case some no longer supported theme is stored here

10
src/settings/watchers/ThemeWatcher.ts
View File

@ -99,7 +99,7 @@ export default class ThemeWatcher {
// controller that honours the same flag, although probablt better would be to // 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 // have the theme logic in one place rather than split between however many
// different places. // different places.
if (ThemeController.isLogin) return 'element'; if (ThemeController.isLogin) return 'light';
// If the user has specifically enabled the system matching option (excluding default), // 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 // 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); SettingLevel.DEVICE, "use_system_theme", null, false, true);
if (systemThemeExplicit) { if (systemThemeExplicit) {
console.log("returning explicit system theme"); console.log("returning explicit system theme");
if (this.preferDark.matches) return 'element-dark'; if (this.preferDark.matches) return 'dark';
if (this.preferLight.matches) return 'element'; if (this.preferLight.matches) return 'light';
} }
// If the user has specifically enabled the theme (without the system matching option being // If the user has specifically enabled the theme (without the system matching option being
@ -125,8 +125,8 @@ export default class ThemeWatcher {
// If the user hasn't really made a preference in either direction, assume the defaults of the // If the user hasn't really made a preference in either direction, assume the defaults of the
// settings and use those. // settings and use those.
if (SettingsStore.getValue('use_system_theme')) { if (SettingsStore.getValue('use_system_theme')) {
if (this.preferDark.matches) return 'element-dark'; if (this.preferDark.matches) return 'dark';
if (this.preferLight.matches) return 'element'; if (this.preferLight.matches) return 'light';
} }
console.log("returning theme value"); console.log("returning theme value");
return SettingsStore.getValue('theme'); return SettingsStore.getValue('theme');

2
src/theme.js
View File

@ -17,7 +17,7 @@ limitations under the License.
import {_t} from "./languageHandler"; import {_t} from "./languageHandler";
export const DEFAULT_THEME = "element"; export const DEFAULT_THEME = "light";
import Tinter from "./Tinter"; import Tinter from "./Tinter";
import SettingsStore from "./settings/SettingsStore"; import SettingsStore from "./settings/SettingsStore";
import ThemeWatcher from "./settings/watchers/ThemeWatcher"; import ThemeWatcher from "./settings/watchers/ThemeWatcher";