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

2
skins/base/views/molecules/MEmoteTile.js
View file

@ -29,7 +29,7 @@ module.exports = React.createClass({
var content = mxEvent.getContent();
var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
return (
<span className="mx_MEmoteTile">
<span className="mx_MEmoteTile mx_messageTileType">
{name} {content.body}
</span>
);

2
skins/base/views/molecules/MNoticeTile.js
View file

@ -27,7 +27,7 @@ module.exports = React.createClass({
render: function() {
var content = this.props.mxEvent.getContent();
return (
<span className="mx_MNoticeTile">
<span className="mx_MNoticeTile mx_messageTileType">
{content.body}
</span>
);

2
skins/base/views/molecules/MTextTile.js
View file

@ -27,7 +27,7 @@ module.exports = React.createClass({
render: function() {
var content = this.props.mxEvent.getContent();
return (
<span className="mx_MTextTile">
<span className="mx_MTextTile mx_messageTileType">
{content.body}
</span>
);

4
skins/base/views/organisms/RoomList.js
View file

@ -28,9 +28,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_RoomList">
<ul>
{this.makeRoomTiles()}
</ul>
{this.makeRoomTiles()}
</div>
);
}

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>
);
}

10
skins/base/views/pages/MatrixChat.js
View file

@ -38,11 +38,13 @@ module.exports = React.createClass({
if (this.state.logged_in && this.state.ready) {
return (
<div className="mx_MatrixChat">
<div className="mx_MatrixChat_leftPanel">
<MatrixToolbar />
<RoomList selectedRoom={this.state.currentRoom} />
<div className="mx_MatrixChat_chatWrapper">
<div className="mx_MatrixChat_leftPanel">
<MatrixToolbar />
<RoomList selectedRoom={this.state.currentRoom} />
</div>
<RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
</div>
<RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
</div>
);
} else if (this.state.logged_in) {