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

This commit is contained in:
Weblate 2017-07-19 16:16:06 +00:00
commit 11ae3dd46c

View File

@ -112,6 +112,12 @@ limitations under the License.
border-left: 4px solid $blockquote-bar-color; border-left: 4px solid $blockquote-bar-color;
} }
.mx_MessageComposer_input pre.public-DraftStyleDefault-pre pre {
background-color: $rte-code-bg-color;
border-radius: 3px;
padding: 10px;
}
.mx_MessageComposer_input textarea { .mx_MessageComposer_input textarea {
display: block; display: block;
width: 100%; width: 100%;