Merge branch 'develop' into new-guest-access

2017-05-30 21:06:45 +01:00
parent e358ef5bf7 4493994dd5
commit d264426ece
25 changed files with 191 additions and 97 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
@@ -62,7 +62,7 @@ limitations under the License.
    visibility: hidden;
    white-space: nowrap;
    color: $event-timestamp-color;
-    font-size: 11px;
+    font-size: 10px;
    left: 8px;
    position: absolute;
 }