OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

make tinter coarsely theme aware

pull/21833/head
Matthew Hodgson 2017-10-25 22:48:27 +01:00
parent 6beb604cd0
commit b3a8593468
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Tinter.js
View File

@ -1,5 +1,6 @@
/* /*
Copyright 2015 OpenMarket Ltd Copyright 2015 OpenMarket Ltd
Copyright 2017 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -14,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import UserSettingsStore from './UserSettingsStore';
// FIXME: these vars should be bundled up and attached to // FIXME: these vars should be bundled up and attached to
// module.exports otherwise this will break when included by both // module.exports otherwise this will break when included by both
// react-sdk and apps layered on top. // react-sdk and apps layered on top.
@ -178,8 +181,11 @@ module.exports = {
} }
if (!primaryColor) { if (!primaryColor) {
primaryColor = "#76CFA6"; // Vector green const theme = UserSettingsStore.getTheme();
secondaryColor = "#EAF5F0"; // Vector light green // FIXME: get this out of the theme CSS itself somehow?
// we could store it in a string CSS attrib somewhere we could sniff...
primaryColor = theme === 'status' ? "#6CC1F6" : "#76CFA6"; // Vector green
secondaryColor = theme === 'status' ? "#586C7B" : "#EAF5F0"; // Vector light green
} }
if (!secondaryColor) { if (!secondaryColor) {