mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-05 05:38:41 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
07cc5dc6c9
1 changed files with 2 additions and 2 deletions
|
@ -77,7 +77,7 @@ import {parseQs, parseQsFromFragment} from './url_utils';
|
|||
import Platform from './platform';
|
||||
|
||||
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
|
||||
import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore";
|
||||
import SettingsStore, {SettingLevel} from "matrix-react-sdk/lib/settings/SettingsStore";
|
||||
import Tinter from 'matrix-react-sdk/lib/Tinter';
|
||||
|
||||
var lastLocationHashSet = null;
|
||||
|
@ -299,7 +299,7 @@ async function loadApp() {
|
|||
// as quickly as we possibly can, set a default theme...
|
||||
const styleElements = Object.create(null);
|
||||
let a;
|
||||
const theme = configJson.default_theme || 'light';
|
||||
const theme = SettingsStore.getValueAt(SettingLevel.DEFAULT, "theme");
|
||||
for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
|
||||
const href = a.getAttribute("href");
|
||||
if (!href) continue;
|
||||
|
|
Loading…
Reference in a new issue