mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

merge in matthew-css

Browse source
This commit is contained in:
Matthew Hodgson 2015-07-07 03:44:41 +01:00
commit a94f1664d8
15 changed files with 138 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

16
skins/base/views/organisms/RoomView.js
View file

@ -68,15 +68,17 @@ module.exports = React.createClass({
return (
<div className="mx_RoomView">
<RoomHeader room={this.state.room} />
<div className="mx_RoomView_HSplit">
<ul className="mx_RoomView_MessageList" ref="messageList" aria-live="polite" onScroll={this.onMessageListScroll}>
<li className={scrollheader_classes}>
</li>
{this.getEventTiles()}
</ul>
<div className="mx_RoomView_roomWrapper">
<div className="mx_RoomView_messagePanel">
<div className="mx_RoomView_messageListWrapper">
<div className="mx_RoomView_MessageList" ref="messageList" aria-live="polite" onScroll={this.onMessageListScroll}>
{this.getEventTiles()}
</div>
</div>
<MessageComposer roomId={this.props.roomId} />
</div>
<MemberList roomId={this.props.roomId} key={this.props.roomId} />
</div>
<MessageComposer roomId={this.props.roomId} />
</div>
);
}