From d09a733eea7d7e9a536e4747a39dce0cfaa1752d Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Fri, 23 Nov 2018 14:11:36 +0000 Subject: [PATCH 1/2] Added temp config for testing --- src/vector/index.js | 4 ++-- webpack.config.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vector/index.js b/src/vector/index.js index 13586cd1..a947cc01 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -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') { diff --git a/webpack.config.js b/webpack.config.js index 366929e1..65d44c82 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -16,10 +16,12 @@ module.exports = { "mobileguide": "./src/vector/mobile_guide/index.js", // CSS themes - "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-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-status": "./res/themes/status/css/status.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: { rules: [ From 2b781eb768741124278440edf2b5d977c35dbc12 Mon Sep 17 00:00:00 2001 From: Nad Chishtie Date: Fri, 23 Nov 2018 14:36:20 +0000 Subject: [PATCH 2/2] Added themes to webpack config --- webpack.config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 65d44c82..9b30fad2 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -16,12 +16,12 @@ module.exports = { "mobileguide": "./src/vector/mobile_guide/index.js", // CSS themes - // "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-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-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", + "theme-status": "./res/themes/status/css/status.scss", }, module: { rules: [