gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into experimental

This commit is contained in:
David Baker 2017-06-07 13:28:30 +01:00
parent 65185a5fd0 80d912bb2c
commit bd76251fb5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/messages/MessageTimestamp.js
View File

@ -16,8 +16,8 @@ limitations under the License.
'use strict'; 'use strict';
const React = require('react'); import React from 'react';
const DateUtils = require('matrix-react-sdk/lib/DateUtils'); import DateUtils from 'matrix-react-sdk/lib/DateUtils';
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MessageTimestamp', displayName: 'MessageTimestamp',

10
src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View File

@ -63,7 +63,9 @@ limitations under the License.
white-space: nowrap; white-space: nowrap;
color: $event-timestamp-color; color: $event-timestamp-color;
font-size: 10px; font-size: 10px;
left: 8px; left: 0px;
width: 46px; /* 8 + 30 (avatar) + 8 */
text-align: center;
position: absolute; position: absolute;
} }
@ -189,6 +191,7 @@ limitations under the License.
.mx_EventTile_selected .mx_MessageTimestamp { .mx_EventTile_selected .mx_MessageTimestamp {
left: 3px; left: 3px;
width: auto;
} }
.mx_EventTile_editButton { .mx_EventTile_editButton {
@ -271,10 +274,6 @@ limitations under the License.
padding-left: 5px; padding-left: 5px;
} }
.mx_EventTile_12hr .mx_MessageTimestamp {
text-align: center;
}
.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line, .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line { .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
padding-left: 60px; padding-left: 60px;
@ -296,6 +295,7 @@ limitations under the License.
.mx_EventTile:hover.mx_EventTile_verified .mx_MessageTimestamp, .mx_EventTile:hover.mx_EventTile_verified .mx_MessageTimestamp,
.mx_EventTile:hover.mx_EventTile_unverified .mx_MessageTimestamp { .mx_EventTile:hover.mx_EventTile_unverified .mx_MessageTimestamp {
left: 3px; left: 3px;
width: auto;
} }
/* /*