matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-15 11:01:52 +03:00
Code Activity

fix layout for blunt join msgs

Browse Source
This commit is contained in:
Matthew Hodgson
2016-01-18 20:15:12 +00:00
parent f22519f10c
commit c29ec28dfd
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/RoomView.js
View File

@ -1457,6 +1457,7 @@ module.exports = React.createClass({
canJoin={ true } canPreview={ false }/> canJoin={ true } canPreview={ false }/>
<div className="error">{joinErrorText}</div> <div className="error">{joinErrorText}</div>
</div> </div>
<div className="mx_RoomView_messagePanel"></div>
</div> </div>
); );
} }
@ -1489,6 +1490,7 @@ module.exports = React.createClass({
// We deliberately don't try to peek into invites, even if we have permission to peek // We deliberately don't try to peek into invites, even if we have permission to peek
// as they could be a spam vector. // as they could be a spam vector.
// XXX: in future we could give the option of a 'Preview' button which lets them view anyway. // XXX: in future we could give the option of a 'Preview' button which lets them view anyway.
return ( return (
<div className="mx_RoomView"> <div className="mx_RoomView">
<RoomHeader ref="header" room={this.state.room} simpleHeader="Room invite"/> <RoomHeader ref="header" room={this.state.room} simpleHeader="Room invite"/>
@ -1500,6 +1502,7 @@ module.exports = React.createClass({
<div className="error">{joinErrorText}</div> <div className="error">{joinErrorText}</div>
<div className="error">{rejectErrorText}</div> <div className="error">{rejectErrorText}</div>
</div> </div>
<div className="mx_RoomView_messagePanel"></div>
</div> </div>
); );
} }