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

Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element

pull/21833/head
Bruno Windels 2020-07-10 19:05:46 +02:00
parent 952200f031 23d96fbe25
commit b7ded18fde
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/UserMenu.tsx
View File

@ -98,7 +98,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
if (theme.startsWith("custom-")) {
return getCustomTheme(theme.substring("custom-".length)).is_dark;
}
return theme === "dark";
return theme === "dark" || theme === "element-dark";
}
private onProfileUpdate = async () => {
@ -152,7 +152,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
// Disable system theme matching if the user hits this button
SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, false);
const newTheme = this.state.isDarkTheme ? "light" : "dark";
const newTheme = this.state.isDarkTheme ? "element" : "element-dark";
SettingsStore.setValue("theme", null, SettingLevel.DEVICE, newTheme); // set at same level as Appearance tab
};