Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
d2a676cad2
|
@ -98,6 +98,9 @@ limitations under the License.
|
|||
width: 100%;
|
||||
flex: 1;
|
||||
word-break: break-word;
|
||||
max-height: 120px;
|
||||
min-height: 21px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
|
||||
|
@ -105,12 +108,6 @@ limitations under the License.
|
|||
padding-top: 2px;
|
||||
}
|
||||
|
||||
.mx_MessageComposer_input .public-DraftEditor-content {
|
||||
max-height: 120px;
|
||||
min-height: 21px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.mx_MessageComposer_input blockquote {
|
||||
color: $blockquote-fg-color;
|
||||
margin: 0 0 16px;
|
||||
|
|
Loading…
Reference in New Issue