forked from matrix/element-web
Merge pull request #11442 from vector-im/dbkr/system_dark_mode
Use new theme API in react-sdk
This commit is contained in:
commit
135d5f4cc7
src/vector
|
@ -57,7 +57,7 @@ import WebPlatform from './platform/WebPlatform';
|
||||||
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
|
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
|
||||||
import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore";
|
import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore";
|
||||||
import SdkConfig from "matrix-react-sdk/lib/SdkConfig";
|
import SdkConfig from "matrix-react-sdk/lib/SdkConfig";
|
||||||
import {getBaseTheme, setTheme} from "matrix-react-sdk/lib/theme";
|
import {getBaseTheme, setTheme, ThemeWatcher} from "matrix-react-sdk/lib/theme";
|
||||||
|
|
||||||
import Olm from 'olm';
|
import Olm from 'olm';
|
||||||
|
|
||||||
|
@ -258,7 +258,8 @@ async function loadApp() {
|
||||||
// we do this by checking to see if the theme's "base" has loaded first so we can
|
// we do this by checking to see if the theme's "base" has loaded first so we can
|
||||||
// safely rely on the assets.
|
// safely rely on the assets.
|
||||||
let a;
|
let a;
|
||||||
const theme = SettingsStore.getValue("theme");
|
const themeWatcher = new ThemeWatcher();
|
||||||
|
const theme = themeWatcher.getEffectiveTheme();
|
||||||
const baseTheme = getBaseTheme(theme);
|
const baseTheme = getBaseTheme(theme);
|
||||||
for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
|
for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
|
||||||
const href = a.getAttribute("href");
|
const href = a.getAttribute("href");
|
||||||
|
|
Loading…
Reference in New Issue