Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from vector-im/timestamp_hover

Browse Source 
Show timestamp when you hover over a message
This commit is contained in:
David Baker 2015-07-27 14:57:10 +01:00
commit 7ac852d1fe
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
skins/base/css/molecules/MessageTile.css
View File

@ -26,7 +26,7 @@ limitations under the License.
padding-right: 12px; padding-right: 12px;
margin-left: -64px; margin-left: -64px;
margin-top: -7px; margin-top: -7px;
float: left; float: left;
} }
.mx_MessageTile_avatar img { .mx_MessageTile_avatar img {
@ -78,3 +78,15 @@ limitations under the License.
.mx_MessageTile_msgOption { .mx_MessageTile_msgOption {
float: right; float: right;
} }
.mx_MessageTimestamp {
display: none;
}
.mx_MessageTile_last .mx_MessageTimestamp {
display: block;
}
.mx_MessageTile:hover .mx_MessageTimestamp {
display: block;
}

4
skins/base/views/molecules/MessageTile.js
View File

@ -57,8 +57,9 @@ module.exports = React.createClass({
mx_MessageTile_notSent: this.props.mxEvent.status == 'not_sent', 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, mx_MessageTile_continuation: this.props.continuation,
mx_MessageTile_last: this.props.last
}); });
var timestamp = this.props.last ? <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null; var timestamp = <MessageTimestamp ts={this.props.mxEvent.getTs()} />
var avatar, sender, resend; var avatar, sender, resend;
if (!this.props.continuation) { if (!this.props.continuation) {
avatar = ( avatar = (
@ -84,4 +85,3 @@ module.exports = React.createClass({
); );
}, },
}); });