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

2018-03-29 21:22:25 +00:00 · 2018-03-29 21:22:25 +00:00 · 050f04bed7
parent 0930d7dbea e72422976d
commit 050f04bed7
1 changed files with 5 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_Stickers.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_Stickers.scss
@ -2,6 +2,11 @@
    overflow: hidden;
 }

+.mx_Stickers_content_container {
+    overflow: hidden;
+    height: 300px;
+}
+
 .mx_Stickers_content .mx_AppTileFullWidth {
    border: none;
 }