From 370612135fe42e7d2b8b3f19caa1667cfd306752 Mon Sep 17 00:00:00 2001
From: wmwragg <wm.wragg@gmail.com>
Date: Wed, 14 Sep 2016 13:55:10 +0100
Subject: [PATCH 1/3] The scrollbars are nolonger always visible for the
 AddressSelector and ChatInviteDialog invite list

---
 .../css/matrix-react-sdk/views/dialogs/ChatInviteDialog.css     | 2 +-
 .../css/matrix-react-sdk/views/elements/AddressSelector.css     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/ChatInviteDialog.css b/src/skins/vector/css/matrix-react-sdk/views/dialogs/ChatInviteDialog.css
index 9fe5af9eee..aa1dced80a 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/ChatInviteDialog.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/ChatInviteDialog.css
@@ -44,7 +44,7 @@ limitations under the License.
     padding-bottom: 1px;
     max-height: 150px;
     overflow-x: hidden;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 .mx_ChatInviteDialog_error {
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/AddressSelector.css b/src/skins/vector/css/matrix-react-sdk/views/elements/AddressSelector.css
index 62efee7c05..aa0f8c6a4e 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/AddressSelector.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/AddressSelector.css
@@ -19,7 +19,7 @@ limitations under the License.
     background-color: #fff;
     width: 485px;
     max-height: 116px;
-    overflow-y: scroll;
+    overflow-y: auto;
 	border-radius: 3px;
 	background-color: #fff;
 	border: solid 1px #76cfa6;

From 66ef5213b88be196e62db03777495bd9c600915b Mon Sep 17 00:00:00 2001
From: wmwragg <wm.wragg@gmail.com>
Date: Wed, 14 Sep 2016 14:32:30 +0100
Subject: [PATCH 2/3] Increased hitbox area to the whole invite section, not
 just the icon

---
 src/components/structures/RightPanel.js                   | 4 ++--
 src/skins/vector/css/vector-web/structures/RightPanel.css | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 56de89dfe4..cc5c8da62d 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -244,8 +244,8 @@ module.exports = React.createClass({
                 </div>
                 { panel }
                 <div className="mx_RightPanel_footer">
-                    <div className="mx_RightPanel_invite" >
-                        <div className="mx_RightPanel_icon" onClick={ this.onInviteButtonClick } >
+                    <div className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+                        <div className="mx_RightPanel_icon" >
                             <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
                         </div>
                         <div className="mx_RightPanel_message">Invite to this room</div>
diff --git a/src/skins/vector/css/vector-web/structures/RightPanel.css b/src/skins/vector/css/vector-web/structures/RightPanel.css
index 0770f7df67..537fef4089 100644
--- a/src/skins/vector/css/vector-web/structures/RightPanel.css
+++ b/src/skins/vector/css/vector-web/structures/RightPanel.css
@@ -110,6 +110,7 @@ limitations under the License.
 	color: #4A4A4A;
     padding-top: 13px;
     padding-left: 5px;
+    cursor: pointer;
 }
 
 .collapsed .mx_RightPanel_footer .mx_RightPanel_invite {
@@ -118,7 +119,6 @@ limitations under the License.
 
 .mx_RightPanel_invite .mx_RightPanel_icon {
     display: inline-block;
-    cursor: pointer;
 }
 
 .mx_RightPanel_invite .mx_RightPanel_icon object {

From efa574c4527fe13c29777b8bde15a0f53f3e9713 Mon Sep 17 00:00:00 2001
From: wmwragg <wm.wragg@gmail.com>
Date: Wed, 14 Sep 2016 17:13:06 +0100
Subject: [PATCH 3/3] The invite group, will no longer be shown when the
 directory listing is being shown

---
 src/components/structures/RightPanel.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index cc5c8da62d..ef800c61e5 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -165,6 +165,7 @@ module.exports = React.createClass({
         var FilePanel = sdk.getComponent('structures.FilePanel');
         var TintableSvg = sdk.getComponent("elements.TintableSvg");
         var buttonGroup;
+        var inviteGroup;
         var panel;
 
         var filesHighlight;
@@ -210,6 +211,14 @@ module.exports = React.createClass({
                             { notificationsHighlight }
                         </div>
                     </div>;
+
+            inviteGroup =
+                <div className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+                    <div className="mx_RightPanel_icon" >
+                        <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
+                    </div>
+                    <div className="mx_RightPanel_message">Invite to this room</div>
+                </div>;
         }
 
         if (!this.props.collapsed) {
@@ -244,12 +253,7 @@ module.exports = React.createClass({
                 </div>
                 { panel }
                 <div className="mx_RightPanel_footer">
-                    <div className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
-                        <div className="mx_RightPanel_icon" >
-                            <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
-                        </div>
-                        <div className="mx_RightPanel_message">Invite to this room</div>
-                    </div>
+                    { inviteGroup }
                 </div>
             </aside>
         );