Merge pull request #7759 from vector-im/bwindels/serverpresence

Add server presence alert vars to status theme
add vars to status theme
2018-11-28 17:09:16 +00:00 · 2018-11-28 11:00:59 +01:00 · 2018-11-23 16:35:56 +01:00 · 2018-11-23 14:53:53 +00:00 · 2018-11-23 14:36:20 +00:00 · 2018-11-23 14:11:36 +00:00
3 changed files with 16 additions and 2 deletions
--- a/res/themes/status/css/_status.scss
+++ b/res/themes/status/css/_status.scss
@ -215,6 +215,18 @@ $lightbox-bg-color: #454545;
 $lightbox-fg-color: #ffffff;
 $lightbox-border-color: #ffffff;
 $input-lighter-bg-color: #ff0000;
 // used by NewThreadBanner & ServerPresenceBanner
 $lost-alert-fg-color: #F56679;
 $lost-alert-bg-color: #FFF8FA;
 $reconnected-alert-fg-color: #8A6E3A;
 $reconnected-alert-bg-color: #FFFBE6;
 $received-messages-alert-fg-color: #7AC9A1;
 $received-messages-alert-bg-color: #F9FCFB;
 // unused?
 $progressbar-color: #000;
--- 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') {
--- a/webpack.config.js
+++ b/webpack.config.js
@ -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: {
Author	SHA1	Message	Date
Bruno Windels	f30ddeeb28	Merge pull request #7759 from vector-im/bwindels/serverpresence Add server presence alert vars to status theme	2018-11-28 17:09:16 +00:00
Bruno Windels	f94963e091	add vars to status theme	2018-11-28 11:00:59 +01:00
Bruno Windels	3667ef9a9e	newthreadbanner vars	2018-11-23 16:35:56 +01:00
Bruno Windels	26cb14b3c3	Merge pull request #7740 from vector-im/nadonomy/darkroom Added new WIP themes to webpack config	2018-11-23 14:53:53 +00:00
Nad Chishtie	2b781eb768	Added themes to webpack config	2018-11-23 14:36:20 +00:00
Nad Chishtie	d09a733eea	Added temp config for testing	2018-11-23 14:11:36 +00:00