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

2018-05-09 15:52:16 +00:00 · 2018-05-09 15:52:16 +00:00 · 60d85d3a44
parent 147459d338 bcf003757c
commit 60d85d3a44
1 changed files with 5 additions and 1 deletions
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@ -539,7 +539,11 @@ export default class AppTile extends React.Component {
                </div>
            );
            if (this.state.initialising) {
-                appTileBody = loadingElement;
+                appTileBody = (
+                    <div className={'mx_AppTileBody ' + (this.state.loading ? 'mx_AppLoading' : '')}>
+                        { loadingElement }
+                    </div>
+                );
            } else if (this.state.hasPermissionToLoad == true) {
                if (this.isMixedContent()) {
                    appTileBody = (