Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour

This commit is contained in:
Richard Lewis 2017-11-15 13:26:29 +00:00
commit 7bab7813bb
57 changed files with 2199 additions and 756 deletions

View file

@ -243,6 +243,7 @@ class Tinter {
setTheme(theme) {
console.trace("setTheme " + theme);
this.theme = theme;
// update keyRgb from the current theme CSS itself, if it defines it
@ -322,6 +323,8 @@ class Tinter {
if (ss.disabled) continue;
if (!ss.cssRules) continue;
if (DEBUG) console.debug("calcCssFixups checking " + ss.cssRules.length + " rules for " + ss.href);
for (let j = 0; j < ss.cssRules.length; j++) {
const rule = ss.cssRules[j];
if (!rule.style) continue;