gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Weblate 2017-07-26 15:58:35 +00:00
parent 5b3fb36ac7 068a2b869e
commit a5771c48ba
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
View File

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