mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-11-20 03:25:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #575 from vector-im/bwindels/composer-layout-improvements

Browse Source 
Composer layout improvements
This commit is contained in:
Bruno Windels 2021-11-05 19:24:34 +01:00 committed by GitHub
commit 2dccd36a6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/platform/web/ui/css/themes/element/theme.css
View File

@ -502,7 +502,7 @@ a {
}
.MessageComposer_input, .MessageComposer_replyPreview {
padding: 8px 16px;
padding: 8px;
}
.MessageComposer_replyPreview > .replying {
@ -547,7 +547,7 @@ a {
padding: 14px;
box-sizing: border-box;
overflow: hidden;
max-height: 113px;
max-height: 113px; /* 5 lines */
}
.MessageComposer_input > button.send {
@ -563,6 +563,8 @@ a {
background-image: url('icons/send.svg');
background-repeat: no-repeat;
background-position: center;
align-self: end;
margin-bottom: 8px;
}
.MessageComposer_input > button.sendFile {
@ -579,8 +581,12 @@ a {
background-position: center;
}
.MessageComposer_input > button.send:disabled {
background-color: #E3E8F0;
.MessageComposer.MessageComposer_canSend button.sendFile {
display: none;
}
.MessageComposer:not(.MessageComposer_canSend) button.send {
display: none;
}
.SettingsBody {

6
src/platform/web/ui/session/room/MessageComposer.js
View File

@ -69,11 +69,13 @@ export class MessageComposer extends TemplateView {
t.button({
className: "send",
title: vm.i18n`Send`,
disabled: vm => !vm.canSend,
onClick: () => this._trySend(),
}, vm.i18n`Send`),
]);
return t.div({ className: "MessageComposer" }, [replyPreview, input]);
return t.div({ className: {
MessageComposer: true,
MessageComposer_canSend: vm => vm.canSend
} }, [replyPreview, input]);
}
unmount() {