gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7740 from vector-im/nadonomy/darkroom 

Added new WIP themes to webpack config
This commit is contained in:
Bruno Windels 2018-11-23 14:53:53 +00:00 committed by GitHub
parent c7c271fb01 2b781eb768
commit 26cb14b3c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vector/index.js
View File

@ -275,7 +275,7 @@ async function loadApp() {
// as quickly as we possibly can, set a default theme...
const styleElements = Object.create(null);
let a;
const theme = "dharma";//SettingsStore.getValue("theme");
const theme = "dharma"; //SettingsStore.getValue("theme");
for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
const href = a.getAttribute("href");
if (!href) continue;
@ -297,7 +297,7 @@ async function loadApp() {
// in case it is the first time loading Riot.
// `InstallTrigger` is a Object which only exists on Firefox
// (it is used for their Plugins) and can be used as a
// feature check.
// feature check.
// Firefox loads css always before js. This is why we dont use
// onload or it's EventListener as thoose will never trigger.
if (typeof InstallTrigger !== 'undefined') {

2
webpack.config.js
View File

@ -19,6 +19,8 @@ module.exports = {
"theme-light": "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
"theme-dark": "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
"theme-dharma": "./node_modules/matrix-react-sdk/res/themes/dharma/css/dharma.scss",
"theme-dharma-dark": "./node_modules/matrix-react-sdk/res/themes/dharma-dark/css/dharma-dark.scss",
"theme-dharma-darkroom": "./node_modules/matrix-react-sdk/res/themes/dharma-darkroom/css/dharma-darkroom.scss",
"theme-status": "./res/themes/status/css/status.scss",
},
module: {