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

2018-02-15 14:51:18 +00:00 · 2018-02-15 14:51:18 +00:00 · 5e8ec9f451
commit 5e8ec9f451
parent 19b6684089 1a880761e0
1 changed files with 3 additions and 3 deletions
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@ -1121,9 +1121,9 @@ var TimelinePanel = React.createClass({
        // exist.
        if (this.state.timelineLoading) {
            return (
-                    <div className={this.props.className + " mx_RoomView_messageListWrapper"}>
-                        <Loader />
-                    </div>
+                <div className="mx_RoomView_messagePanelSpinner">
+                    <Loader />
+                </div>
            );
        }