From 1ca91024423a0723a1718f4429e52d6a66c6d55a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 27 Sep 2017 10:36:44 +0100
Subject: [PATCH] Fix spinner appearing above RP header

By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
---
 src/components/structures/GroupView.js         | 4 ++--
 src/components/views/groups/GroupMemberList.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 41e58851ff..f90ba31653 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -843,8 +843,8 @@ export default React.createClass({
                     </AccessibleButton>,
                 );
                 rightButtons.push(
-                    <AccessibleButton className='mx_GroupView_textButton' onClick={this._onCancelClick} key="_cancelButton">
-                        <img src="img/cancel.svg" className='mx_filterFlipColor'
+                    <AccessibleButton className="mx_RoomHeader_cancelButton" onClick={this._onCancelClick} key="_cancelButton">
+                        <img src="img/cancel.svg" className="mx_filterFlipColor"
                             width="18" height="18" alt={_t("Cancel")}/>
                     </AccessibleButton>,
                 );
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 809dac93d0..fdaf815fe1 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -124,7 +124,9 @@ export default withMatrixClient(React.createClass({
     render: function() {
         if (this.state.fetching) {
             const Spinner = sdk.getComponent("elements.Spinner");
-            return <Spinner />;
+            return (<div className="mx_MemberList">
+                <Spinner />
+            </div>);
         } else if (this.state.members === null) {
             return null;
         }