From 3c6d87b52b68d2612e9466405d092cc51cd407f7 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 25 May 2018 16:31:22 +0100 Subject: [PATCH 01/38] add skin --- webpack.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webpack.config.js b/webpack.config.js index 2a116f577..4b78c308b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -25,6 +25,7 @@ module.exports = { // 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-dharma": "./node_modules/matrix-react-sdk/res/themes/dharma/css/dharma.scss", "theme-status": "./res/themes/status/css/status.scss", }, module: { From dbd4d5e7797e35ae18c9ed77e7045081c0c417b6 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 16 Oct 2018 18:56:32 +0200 Subject: [PATCH 02/38] update /experimental --- foo | 1 + 1 file changed, 1 insertion(+) create mode 100644 foo diff --git a/foo b/foo new file mode 100644 index 000000000..f83ba2426 --- /dev/null +++ b/foo @@ -0,0 +1 @@ +please update /experimental From 9d33255850186474b0c397bbb6352b7e86cb3a09 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 17 Oct 2018 11:29:04 +0200 Subject: [PATCH 03/38] remove foo file to trigger jenkins --- foo | 1 - 1 file changed, 1 deletion(-) delete mode 100644 foo diff --git a/foo b/foo deleted file mode 100644 index f83ba2426..000000000 --- a/foo +++ /dev/null @@ -1 +0,0 @@ -please update /experimental From ab1f68df93e398d963780179ea99695ca6356db7 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 23 Oct 2018 15:50:09 +0200 Subject: [PATCH 04/38] apply changes from dharma theme to status theme --- res/themes/status/css/_status.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss index c99af14e9..f0259e454 100644 --- a/res/themes/status/css/_status.scss +++ b/res/themes/status/css/_status.scss @@ -128,6 +128,7 @@ $input-fg-color: rgba(74, 74, 74, 0.9); // context menus $menu-border-color: rgba(187, 187, 187, 0.5); $menu-bg-color: #f6f6f6; +$menu-selected-color: #f5f8fa; $avatar-initial-color: #ffffff; $avatar-bg-color: transparent; @@ -162,6 +163,15 @@ $roomtile-name-color: #ffffff; $roomtile-selected-bg-color: #465561; $roomtile-focused-bg-color: #6d8597; +$username-variant1-color: #1e7ddc; +$username-variant2-color: #a756a8; +$username-variant3-color: #7ac9a1; +$username-variant4-color: #f2809d; +$username-variant5-color: #ffc666; +$username-variant6-color: #76ddd7; +$username-variant7-color: #45529b; +$username-variant8-color: #bfd251; + $roomsublist-background: rgba(0, 0, 0, 0.2); $roomsublist-label-fg-color: #ffffff; $roomsublist-label-bg-color: $secondary-accent-color; From c68770c0aa85506ec5b42183bdf45240c2fe546b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 23 Oct 2018 15:51:06 +0200 Subject: [PATCH 05/38] ignore setting and always show dharma theme for now --- src/vector/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/index.js b/src/vector/index.js index 1d47491e4..dea1bfbc1 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -271,7 +271,7 @@ async function loadApp() { // as quickly as we possibly can, set a default theme... const styleElements = Object.create(null); let a; - const theme = 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; From 03dcc97ce922939592690b33e7e54b5024186488 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 24 Oct 2018 13:56:42 +0200 Subject: [PATCH 06/38] add new variables to status --- res/themes/status/css/_status.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss index f0259e454..d4035ebbb 100644 --- a/res/themes/status/css/_status.scss +++ b/res/themes/status/css/_status.scss @@ -117,7 +117,11 @@ $primary-hairline-color: #e5e5e5; // used for the border of input text fields $input-border-color: #c9cfd4; +$input-darker-bg-color: #c1c9d6; +$input-darker-fg-color: #9fa9ba; +$button-bg-color: #7ac9a1; +$button-fg-color: white; // apart from login forms, which have stronger border $strong-input-border-color: #c7c7c7; From 4274c7287a850b22b08c01f94bc4f75b808b6973 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 19 Dec 2018 22:05:04 +0000 Subject: [PATCH 07/38] Fix the IndexedDB worker Looks like this was broken in the webpack 4 upgrade due to the worker script setter and the bundle being re-ordered in index.html. * Remove the loop: we only use two scripts now, so import them explicitly * Remove outdated olm import code. * Stop generating a script import for each theme: we were pulling in 3 js files that did absolutely nothing. * Fix worker 'onmessage' scope (set it as a global rather than trying to make it an ES6 module which it isn't). * Fail hard if the indexeddb worker script isn't set to avoid this happening again. --- src/vector/index.html | 26 ++++---------------------- src/vector/index.js | 7 +++++++ src/vector/indexeddb-worker.js | 2 +- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/vector/index.html b/src/vector/index.html index 4ba65c3e0..a5f3af9b8 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -36,28 +36,10 @@
- <% for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) { - if (_.endsWith(htmlWebpackPlugin.files.js[i], 'olm.js')) { - var array = htmlWebpackPlugin.files.js; - htmlWebpackPlugin.files.js.unshift(htmlWebpackPlugin.files.js[i]); - htmlWebpackPlugin.files.js.splice(i, 1); - } - } - - for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) { - // Not a particularly graceful way of not putting the indexeddb worker script - // into the main page - if (_.endsWith(htmlWebpackPlugin.files.js[i], 'indexeddb-worker.js')) { - %> - - <% - continue; - } - %> - - <% } %> + +