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

2017-06-06 20:37:25 +00:00 · 2017-06-06 20:37:25 +00:00 · c117ceb0b6
commit c117ceb0b6
parent f815097ee9 080cbea080
5 changed files with 19 additions and 4 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
@ -410,6 +410,10 @@ limitations under the License.
        top: 7px;
    }

+    .mx_EventTile_editButton {
+        top: 3px;
+    }
+
    .mx_EventTile_readAvatars {
        top: 27px;
    }