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

tint when theming correctly

pull/21833/head
Matthew Hodgson 2017-11-05 00:40:38 +00:00
parent 8587b36715
commit 68115f5b9c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Tinter.js
View File

@ -15,8 +15,6 @@ 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.
@ -122,6 +120,10 @@ module.exports = {
return keyRgb; return keyRgb;
}, },
getCurrentColors: function() {
return colors;
},
tint: function(primaryColor, secondaryColor, tertiaryColor) { tint: function(primaryColor, secondaryColor, tertiaryColor) {
if (!cached) { if (!cached) {
this.calcCssFixups(); this.calcCssFixups();
@ -129,7 +131,6 @@ module.exports = {
} }
if (!primaryColor) { if (!primaryColor) {
const theme = UserSettingsStore.getTheme();
primaryColor = keyRgb[0]; primaryColor = keyRgb[0];
secondaryColor = keyRgb[1]; secondaryColor = keyRgb[1];
} }
@ -191,6 +192,8 @@ module.exports = {
calcCssFixups: function() { calcCssFixups: function() {
if (DEBUG) console.log("calcCssFixups start"); if (DEBUG) console.log("calcCssFixups start");
cssFixups.length = 0;
// update keyRgb from the current theme CSS itself, if it defines it // update keyRgb from the current theme CSS itself, if it defines it
if (document.getElementById('mx_theme_accentColor')) { if (document.getElementById('mx_theme_accentColor')) {
keyRgb[0] = window.getComputedStyle( keyRgb[0] = window.getComputedStyle(

2
src/components/structures/MatrixChat.js
View File

@ -920,6 +920,8 @@ module.exports = React.createClass({
styleElements[theme].disabled = false; styleElements[theme].disabled = false;
Tinter.calcCssFixups(); Tinter.calcCssFixups();
const colors = Tinter.getCurrentColors();
Tinter.tint(colors[0], colors[1]);
if (theme === 'dark') { if (theme === 'dark') {
// abuse the tinter to change all the SVG's #fff to #2d2d2d // abuse the tinter to change all the SVG's #fff to #2d2d2d