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

2017-08-11 16:48:32 +00:00
parent 2ff23f3b62 07ca70fd44
commit d5038b35f6
1 changed files with 1 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
@@ -105,6 +105,7 @@ limitations under the License.

 .mx_MessageComposer_input .public-DraftEditor-content {
    max-height: 120px;
+    min-height: 21px;
    overflow: auto;
 }