Commit Graph

26 Commits (303691eb7294c44475f60bdc6e69a13389e21f6b)

Author SHA1 Message Date
Jorik Schellekens 6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Travis Ralston 90a898d03f Move dispatcher into a subdirectory
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
Jorik Schellekens 33a5b5142d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-07 18:01:20 +01:00
Dan Jenkins 1767a611a6
set the meta tag for theme-color to the same theme css background 2020-05-06 16:23:06 +01:00
Jorik Schellekens 1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Bruno Windels 76e04fbdfa update comment 2020-04-27 19:39:07 +02:00
Bruno Windels b1870660d8 support theming username colors 2020-04-27 17:31:22 +02:00
Bruno Windels 2f68f608c5 add 15pct value of accent color for FormButton backgrounds
so the button in the toasts has the correct background color
2020-04-27 17:30:28 +02:00
Jorik Schellekens 4397658bb3 Update file name in comments
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-23 10:45:48 +01:00
Jorik Schellekens 269621ad24 Move theme settings to a new tab 2020-04-23 10:45:47 +01:00
Michael Telatynski b77c2df2be Fix theme being overridden to light even after login is completed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:40:42 +00:00
David Baker a3ef0aa6e8 Honour the isLogin flag in theme.js
Horrendous hack to fix the fact that if 'match system theme' was
set, the isLogin flag in the controller would do nothing because
theme.js would have decided to use the system theme before even
asking what the theme setting was.
2020-02-01 12:09:41 +00:00
Travis Ralston 37ec7e6f7e Ensure the settings page accurately represents theme choices
Fixes https://github.com/vector-im/riot-web/issues/11518

This also fixes a bug where the the theme logic can incorrectly get stuck in the light theme - the ThemeController was overriding *all* values, not just supposed themes. Null values aren't overridden so that the various theme logic bits don't assume the user has chosen the light theme explicitly.
2019-11-28 13:40:28 -07:00
Travis Ralston d50d8877e0 Appease the linter 2019-11-26 09:56:04 -07:00
Travis Ralston 4cec7c41b1 Fix override behaviour of system vs defined themes
Fixes https://github.com/vector-im/riot-web/issues/11509
2019-11-26 09:52:35 -07:00
David Baker fd5a5e13ee Make addEventListener conditional
Safari doesn't support addEventListener
2019-11-22 12:59:51 +00:00
David Baker 04641a0f87
Merge pull request #3638 from matrix-org/dbkr/dedup_theming_code
Remove getBaseTheme
2019-11-21 09:44:37 +00:00
David Baker e36f4375b0 Bugfix & clearer setting name 2019-11-20 16:12:14 +00:00
David Baker b69cee0c67 Remove getBaseTheme
This was only used by vector/index.js, in the code removed by
https://github.com/vector-im/riot-web/pull/11445

React SDK does a very similar thing in setTheme but also gets the
rest of the custom theme name.

Requires https://github.com/vector-im/riot-web/pull/11445
2019-11-20 15:45:32 +00:00
David Baker 518130c912 add bug link 2019-11-20 15:37:48 +00:00
David Baker a744415221 Add hack to work around mystery settings bug 2019-11-20 15:34:32 +00:00
David Baker 5a700b518a Get theme automatically from system setting
Uses CSS `prefers-color-scheme` to get the user's preferred colour
scheme. Also bundles up some theme logic into its own class.
2019-11-20 13:41:06 +00:00
Travis Ralston 56ad164c69 Add a function to get the "base" theme for a theme
Useful for trying to load the right assets first. 

See https://github.com/vector-im/riot-web/pull/11381
2019-11-13 14:01:07 -07:00
Bruno Windels 27ca73bf63 add copyright headers 2019-10-02 11:06:31 +02:00
Bruno Windels fc6a68cd1d add support for dark theme 2019-10-01 17:00:29 +02:00
Bruno Windels 558f8daeeb support custom themes from setting
also move theme setting code from MatrixChat to own file.
2019-10-01 15:21:22 +02:00