From 5ead6554b3c76161ab8cc461e193affda29fac85 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 30 Sep 2019 11:00:14 +0200 Subject: [PATCH 1/4] add new theme to build --- webpack.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webpack.config.js b/webpack.config.js index fb16098ca5..a7df99b395 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -18,6 +18,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-light-custom": "./node_modules/matrix-react-sdk/res/themes/light-custom/css/light-custom.scss", }, module: { rules: [ From 4273f2cc552ee93bc7391ecee339340203b3d69b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 1 Oct 2019 17:01:16 +0200 Subject: [PATCH 2/4] add support for dark custom theme --- webpack.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webpack.config.js b/webpack.config.js index a7df99b395..5d02de3db9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -19,6 +19,7 @@ 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-light-custom": "./node_modules/matrix-react-sdk/res/themes/light-custom/css/light-custom.scss", + "theme-dark-custom": "./node_modules/matrix-react-sdk/res/themes/dark-custom/css/dark-custom.scss", }, module: { rules: [ From beaf6b0e0d5d2d3623bcd2d243f2f4cc4318f0a7 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 1 Oct 2019 17:01:45 +0200 Subject: [PATCH 3/4] document settingsDefault now I'm using it and had to look it up again --- docs/config.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/config.md b/docs/config.md index 1ff8a7cfb3..01a869a837 100644 --- a/docs/config.md +++ b/docs/config.md @@ -80,6 +80,7 @@ For a good example, see https://riot.im/develop/config.json. 1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing country selectors, like the phone number input on the registration page. Defaults to `GB` if the given code is unknown or not provided. +1. `settingDefaults`: Defaults for settings that support the `config` level, as an object mapping setting name to value (note that the "theme" setting is special cased to the `default_theme` in the config file). 1. `disable_custom_urls`: disallow the user to change the default homeserver when signing up or logging in. From 31dc423d1d84a32a019f87f6186801091cda4bc1 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 2 Oct 2019 09:04:36 +0200 Subject: [PATCH 4/4] line wrap --- docs/config.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index 01a869a837..2d71671b64 100644 --- a/docs/config.md +++ b/docs/config.md @@ -80,7 +80,9 @@ For a good example, see https://riot.im/develop/config.json. 1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing country selectors, like the phone number input on the registration page. Defaults to `GB` if the given code is unknown or not provided. -1. `settingDefaults`: Defaults for settings that support the `config` level, as an object mapping setting name to value (note that the "theme" setting is special cased to the `default_theme` in the config file). +1. `settingDefaults`: Defaults for settings that support the `config` level, + as an object mapping setting name to value (note that the "theme" setting + is special cased to the `default_theme` in the config file). 1. `disable_custom_urls`: disallow the user to change the default homeserver when signing up or logging in.