gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5900 from Nostradamos/fix_4821 

Fix for `If riot is narrow enough, such that 'Send a message (unecrypted)' wraps to a second line, the timeline doesn't fit the window.`
This commit is contained in:
Luke Barnard 2018-01-03 15:48:38 +00:00 committed by GitHub
parent cf47b919d5 762f6aaf0f
commit 604d4e0a51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;