gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Wmwragg/multi invite bugfix
This commit is contained in:
Matthew Hodgson 2016-09-14 22:06:44 +01:00 committed by GitHub
parent ec05d1b9bd efa574c452
commit c5a52d89be
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/structures/RightPanel.js
View File

@ -165,6 +165,7 @@ module.exports = React.createClass({
var FilePanel = sdk.getComponent('structures.FilePanel'); var FilePanel = sdk.getComponent('structures.FilePanel');
var TintableSvg = sdk.getComponent("elements.TintableSvg"); var TintableSvg = sdk.getComponent("elements.TintableSvg");
var buttonGroup; var buttonGroup;
var inviteGroup;
var panel; var panel;
var filesHighlight; var filesHighlight;
@ -210,6 +211,14 @@ module.exports = React.createClass({
{ notificationsHighlight } { notificationsHighlight }
</div> </div>
</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) { if (!this.props.collapsed) {
@ -244,12 +253,7 @@ module.exports = React.createClass({
</div> </div>
{ panel } { panel }
<div className="mx_RightPanel_footer"> <div className="mx_RightPanel_footer">
<div className="mx_RightPanel_invite" > { inviteGroup }
<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>
</div> </div>
</aside> </aside>
); );

2
src/skins/vector/css/matrix-react-sdk/views/dialogs/ChatInviteDialog.css
View File

@ -44,7 +44,7 @@ limitations under the License.
padding-bottom: 1px; padding-bottom: 1px;
max-height: 150px; max-height: 150px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: auto;
} }
.mx_ChatInviteDialog_error { .mx_ChatInviteDialog_error {

2
src/skins/vector/css/matrix-react-sdk/views/elements/AddressSelector.css
View File

@ -19,7 +19,7 @@ limitations under the License.
background-color: #fff; background-color: #fff;
width: 485px; width: 485px;
max-height: 116px; max-height: 116px;
overflow-y: scroll; overflow-y: auto;
border-radius: 3px; border-radius: 3px;
background-color: #fff; background-color: #fff;
border: solid 1px #76cfa6; border: solid 1px #76cfa6;

2
src/skins/vector/css/vector-web/structures/RightPanel.css
View File

@ -110,6 +110,7 @@ limitations under the License.
color: #4A4A4A; color: #4A4A4A;
padding-top: 13px; padding-top: 13px;
padding-left: 5px; padding-left: 5px;
cursor: pointer;
} }
.collapsed .mx_RightPanel_footer .mx_RightPanel_invite { .collapsed .mx_RightPanel_footer .mx_RightPanel_invite {
@ -118,7 +119,6 @@ limitations under the License.
.mx_RightPanel_invite .mx_RightPanel_icon { .mx_RightPanel_invite .mx_RightPanel_icon {
display: inline-block; display: inline-block;
cursor: pointer;
} }
.mx_RightPanel_invite .mx_RightPanel_icon object { .mx_RightPanel_invite .mx_RightPanel_icon object {