Merge branch 'develop' into wmwragg/one-to-one-chat

2016-09-05 12:07:21 +01:00
parent 2acbad36a6 5e9a95fdfe
commit 059f5198e5
9 changed files with 34 additions and 18 deletions
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -153,6 +153,8 @@ input[type=text]:focus, textarea:focus {
    width: 60%;
    max-width: 704px;
    box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
+    max-height: 80%;
+    overflow-y: auto;
 }

 .mx_Dialog_background {