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

2017-05-26 23:21:48 +00:00 · 2017-05-26 23:21:48 +00:00 · 012cdf590a
commit 012cdf590a
parent ac42fbbd49 1ff6d4846c
5 changed files with 20 additions and 7 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@ -183,6 +183,10 @@ limitations under the License.
    visibility: visible;
 }

+.mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp {
+    visibility: visible;
+}
+
 .mx_EventTile_selected .mx_MessageTimestamp {
    left: 3px;
 }