Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-14 15:17:41 +00:00
commit a22cd487a0

View file

@ -310,7 +310,11 @@ async function loadApp() {
a.removeAttribute("disabled");
// in case the Tinter.tint() in MatrixChat fires before the
// CSS has actually loaded (which in practice happens)
// CSS has actually loaded (which in practice happens)...
// FIXME: we should probably block loading the app or even
// showing a spinner until the theme is loaded, to avoid
// flashes of unstyled content.
a.onload = () => {
Tinter.setTheme(theme);
Tinter.tint();