Merge pull request element-hq#2198 from vector-im/wmwragg/multi-invite-bugfix

ara4n · web-flow · commit c5a52d89be66 · 2016-09-14T22:06:44.000+01:00
Wmwragg/multi invite bugfix
diff --git 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" >
-                        <div className="mx_RightPanel_icon" onClick={ this.onInviteButtonClick } >
-                            <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>
         );
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
@@ -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
@@ -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;
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ limitations under the License.`
`44`	`44`	`padding-bottom: 1px;`
`45`	`45`	`max-height: 150px;`
`46`	`46`	`overflow-x: hidden;`
`47`		`- overflow-y: scroll;`
	`47`	`+ overflow-y: auto;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`.mx_ChatInviteDialog_error {`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ limitations under the License.`
`110`	`110`	`color: #4A4A4A;`
`111`	`111`	`padding-top: 13px;`
`112`	`112`	`padding-left: 5px;`
	`113`	`+ cursor: pointer;`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`.collapsed .mx_RightPanel_footer .mx_RightPanel_invite {`
`@@ -118,7 +119,6 @@ limitations under the License.`
`118`	`119`
`119`	`120`	`.mx_RightPanel_invite .mx_RightPanel_icon {`
`120`	`121`	`display: inline-block;`
`121`		`- cursor: pointer;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`.mx_RightPanel_invite .mx_RightPanel_icon object {`