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

2017-07-19 16:16:06 +00:00 · 2017-07-19 16:16:06 +00:00 · 11ae3dd46c
parent edfa3c1980 3544c2b0c8
commit 11ae3dd46c
1 changed files with 6 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
@ -112,6 +112,12 @@ limitations under the License.
    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 {
    display: block;
    width: 100%;