improve css consistency

pull/1/head
Matthew Hodgson 2015-07-12 16:36:43 +01:00
parent a1ab40064e
commit 98baa0cb0a
7 changed files with 10 additions and 10 deletions

View File

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

View File

@ -19,7 +19,7 @@ limitations under the License.
position: relative;
}
.mx_RoomHeader {
.mx_RoomView .mx_RoomHeader {
height: 30px;
}
@ -58,7 +58,7 @@ limitations under the License.
.mx_RoomView_invitePrompt {
}
.mx_MemberList {
.mx_RoomView .mx_MemberList {
-webkit-box-ordinal-group: 2;
-moz-box-ordinal-group: 2;
-ms-flex-order: 2;
@ -71,12 +71,12 @@ limitations under the License.
height: 100%;
}
.mx_MemberList ul {
.mx_RoomView .mx_MemberList ul {
margin: 0px;
padding: 0px;
}
.mx_MessageComposer {
.mx_RoomView .mx_MessageComposer {
width: 100%;
bottom: 0px;
}

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 mx_messageTileType">
<span className="mx_MEmoteTile mx_MessageTile_content">
* {name} {content.body}
</span>
);

View File

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

View File

@ -47,7 +47,7 @@ module.exports = React.createClass({
<div className="mx_MessageTile">
<MessageTimestamp ts={this.props.mxEvent.getTs()} />
<span className="mx_SenderProfile"></span>
<span className="mx_messageTileType">
<span className="mx_MessageTile_content">
{this.getMemberEventText()}
</span>
</div>

View File

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

View File

@ -40,8 +40,8 @@ module.exports = React.createClass({
<div className="mx_MatrixChat">
<div className="mx_MatrixChat_chatWrapper">
<div className="mx_MatrixChat_leftPanel">
<MatrixToolbar />
<RoomList selectedRoom={this.state.currentRoom} />
<MatrixToolbar />
</div>
<RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
</div>