OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/5777/head
Weblate 2018-01-03 15:48:44 +00:00
parent 33cf966f34 604d4e0a51
commit d2a676cad2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,9 @@ limitations under the License.
width: 100%; width: 100%;
flex: 1; flex: 1;
word-break: break-word; word-break: break-word;
max-height: 120px;
min-height: 21px;
overflow: auto;
} }
.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer { .mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
@ -105,12 +108,6 @@ limitations under the License.
padding-top: 2px; padding-top: 2px;
} }
.mx_MessageComposer_input .public-DraftEditor-content {
max-height: 120px;
min-height: 21px;
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;