forked from matrix/element-web
improve css consistency
This commit is contained in:
parent
a1ab40064e
commit
98baa0cb0a
|
@ -27,7 +27,7 @@ module.exports = React.createClass({
|
||||||
render: function() {
|
render: function() {
|
||||||
var content = this.props.mxEvent.getContent();
|
var content = this.props.mxEvent.getContent();
|
||||||
return (
|
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}
|
{content.body}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
|
@ -19,7 +19,7 @@ limitations under the License.
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_RoomHeader {
|
.mx_RoomView .mx_RoomHeader {
|
||||||
height: 30px;
|
height: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ limitations under the License.
|
||||||
.mx_RoomView_invitePrompt {
|
.mx_RoomView_invitePrompt {
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_MemberList {
|
.mx_RoomView .mx_MemberList {
|
||||||
-webkit-box-ordinal-group: 2;
|
-webkit-box-ordinal-group: 2;
|
||||||
-moz-box-ordinal-group: 2;
|
-moz-box-ordinal-group: 2;
|
||||||
-ms-flex-order: 2;
|
-ms-flex-order: 2;
|
||||||
|
@ -71,12 +71,12 @@ limitations under the License.
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_MemberList ul {
|
.mx_RoomView .mx_MemberList ul {
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_MessageComposer {
|
.mx_RoomView .mx_MessageComposer {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ module.exports = React.createClass({
|
||||||
var content = mxEvent.getContent();
|
var content = mxEvent.getContent();
|
||||||
var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
|
var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
|
||||||
return (
|
return (
|
||||||
<span className="mx_MEmoteTile mx_messageTileType">
|
<span className="mx_MEmoteTile mx_MessageTile_content">
|
||||||
* {name} {content.body}
|
* {name} {content.body}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
|
@ -27,7 +27,7 @@ module.exports = React.createClass({
|
||||||
render: function() {
|
render: function() {
|
||||||
var content = this.props.mxEvent.getContent();
|
var content = this.props.mxEvent.getContent();
|
||||||
return (
|
return (
|
||||||
<span ref="content" className="mx_MNoticeTile mx_messageTileType">
|
<span ref="content" className="mx_MNoticeTile mx_MessageTile_content">
|
||||||
{content.body}
|
{content.body}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
|
@ -47,7 +47,7 @@ module.exports = React.createClass({
|
||||||
<div className="mx_MessageTile">
|
<div className="mx_MessageTile">
|
||||||
<MessageTimestamp ts={this.props.mxEvent.getTs()} />
|
<MessageTimestamp ts={this.props.mxEvent.getTs()} />
|
||||||
<span className="mx_SenderProfile"></span>
|
<span className="mx_SenderProfile"></span>
|
||||||
<span className="mx_messageTileType">
|
<span className="mx_MessageTile_content">
|
||||||
{this.getMemberEventText()}
|
{this.getMemberEventText()}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -27,7 +27,7 @@ module.exports = React.createClass({
|
||||||
render: function() {
|
render: function() {
|
||||||
var content = this.props.mxEvent.getContent();
|
var content = this.props.mxEvent.getContent();
|
||||||
return (
|
return (
|
||||||
<span ref="content" className="mx_MTextTile mx_messageTileType">
|
<span ref="content" className="mx_MTextTile mx_MessageTile_content">
|
||||||
{content.body}
|
{content.body}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
|
@ -40,8 +40,8 @@ module.exports = React.createClass({
|
||||||
<div className="mx_MatrixChat">
|
<div className="mx_MatrixChat">
|
||||||
<div className="mx_MatrixChat_chatWrapper">
|
<div className="mx_MatrixChat_chatWrapper">
|
||||||
<div className="mx_MatrixChat_leftPanel">
|
<div className="mx_MatrixChat_leftPanel">
|
||||||
<MatrixToolbar />
|
|
||||||
<RoomList selectedRoom={this.state.currentRoom} />
|
<RoomList selectedRoom={this.state.currentRoom} />
|
||||||
|
<MatrixToolbar />
|
||||||
</div>
|
</div>
|
||||||
<RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
|
<RoomView roomId={this.state.currentRoom} key={this.state.currentRoom} />
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue