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

group messages together from the same user

Browse source
This commit is contained in:
Matthew Hodgson 2015-07-14 00:25:51 +01:00
parent a5d24329c2
commit 341fe868e4
3 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
skins/base/css/molecules/MessageTile.css
View file

@ -29,6 +29,16 @@ limitations under the License.
float: left;
}
.mx_MessageTile_continuation {
margin-top: 8px ! important;
}
.mx_MessageTile_continuation .mx_MessageTile_avatar,
.mx_MessageTile_continuation .mx_SenderProfile
{
display: none ! important;
}
.mx_MessageTile .mx_SenderProfile {
color: #acacac;
font-size: 13px;
@ -43,6 +53,8 @@ limitations under the License.
}
.mx_MessageTile_content {
padding-right: 100px;
display: block;
}
.mx_MessageTile_sending {

3
skins/base/views/molecules/MessageTile.js
View file

@ -52,7 +52,8 @@ module.exports = React.createClass({
mx_MessageTile: true,
mx_MessageTile_sending: this.props.mxEvent.status == 'sending',
mx_MessageTile_notSent: this.props.mxEvent.status == 'not_sent',
mx_MessageTile_highlight: this.shouldHighlight()
mx_MessageTile_highlight: this.shouldHighlight(),
mx_MessageTile_continuation: this.props.continuation,
});
return (
<div className={classes}>