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

This commit is contained in:
Weblate 2017-07-26 15:58:35 +00:00
commit a5771c48ba

View File

@ -95,8 +95,6 @@ limitations under the License.
.mx_MessageComposer_input .DraftEditor-root {
width: 100%;
flex: 1;
max-height: 120px;
overflow: auto;
word-break: break-word;
}
@ -105,6 +103,11 @@ limitations under the License.
padding-top: 2px;
}
.mx_MessageComposer_input .public-DraftEditor-content {
max-height: 120px;
overflow: auto;
}
.mx_MessageComposer_input blockquote {
color: $blockquote-fg-color;
margin: 0 0 16px;