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

2018-02-07 12:14:15 +00:00
parent 0f475a0e10 5c3e2dca17
commit 2d0ea28a39
1 changed files with 4 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
@@ -108,6 +108,10 @@ limitations under the License.
    padding-top: 2px;
 }

+.mx_MessageComposer .public-DraftStyleDefault-block {
+    overflow-x: hidden;
+}
+
 .mx_MessageComposer_input blockquote {
    color: $blockquote-fg-color;
    margin: 0 0 16px;