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

concept of default theme

pull/21833/head
Matthew Hodgson 2017-10-20 18:42:29 +01:00
parent a85a011db9
commit 37fd19290f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/MatrixChat.js
View File

@ -888,7 +888,7 @@ module.exports = React.createClass({
*/ */
_onSetTheme: function(theme) { _onSetTheme: function(theme) {
if (!theme) { if (!theme) {
theme = 'light'; theme = this.props.config.default_theme || 'light';
} }
// look for the stylesheet elements. // look for the stylesheet elements.

7
src/components/structures/UserSettings.js
View File

@ -179,6 +179,11 @@ const THEMES = [
label: _td('Dark theme'), label: _td('Dark theme'),
value: 'dark', value: 'dark',
}, },
{
id: 'theme',
label: _td('Status.im theme'),
value: 'status',
},
]; ];
const IgnoredUser = React.createClass({ const IgnoredUser = React.createClass({
@ -279,7 +284,7 @@ module.exports = React.createClass({
const syncedSettings = UserSettingsStore.getSyncedSettings(); const syncedSettings = UserSettingsStore.getSyncedSettings();
if (!syncedSettings.theme) { if (!syncedSettings.theme) {
syncedSettings.theme = 'light'; syncedSettings.theme = SdkConfig.get().default_theme || 'light';
} }
this._syncedSettings = syncedSettings; this._syncedSettings = syncedSettings;