Merge pull request #575 from vector-im/bwindels/composer-layout-improvements
Composer layout improvements
This commit is contained in:
commit
2dccd36a6d
2 changed files with 14 additions and 6 deletions
|
@ -502,7 +502,7 @@ a {
|
||||||
}
|
}
|
||||||
|
|
||||||
.MessageComposer_input, .MessageComposer_replyPreview {
|
.MessageComposer_input, .MessageComposer_replyPreview {
|
||||||
padding: 8px 16px;
|
padding: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.MessageComposer_replyPreview > .replying {
|
.MessageComposer_replyPreview > .replying {
|
||||||
|
@ -547,7 +547,7 @@ a {
|
||||||
padding: 14px;
|
padding: 14px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
max-height: 113px;
|
max-height: 113px; /* 5 lines */
|
||||||
}
|
}
|
||||||
|
|
||||||
.MessageComposer_input > button.send {
|
.MessageComposer_input > button.send {
|
||||||
|
@ -563,6 +563,8 @@ a {
|
||||||
background-image: url('icons/send.svg');
|
background-image: url('icons/send.svg');
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
|
align-self: end;
|
||||||
|
margin-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.MessageComposer_input > button.sendFile {
|
.MessageComposer_input > button.sendFile {
|
||||||
|
@ -579,8 +581,12 @@ a {
|
||||||
background-position: center;
|
background-position: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.MessageComposer_input > button.send:disabled {
|
.MessageComposer.MessageComposer_canSend button.sendFile {
|
||||||
background-color: #E3E8F0;
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.MessageComposer:not(.MessageComposer_canSend) button.send {
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.SettingsBody {
|
.SettingsBody {
|
||||||
|
|
|
@ -69,11 +69,13 @@ export class MessageComposer extends TemplateView {
|
||||||
t.button({
|
t.button({
|
||||||
className: "send",
|
className: "send",
|
||||||
title: vm.i18n`Send`,
|
title: vm.i18n`Send`,
|
||||||
disabled: vm => !vm.canSend,
|
|
||||||
onClick: () => this._trySend(),
|
onClick: () => this._trySend(),
|
||||||
}, vm.i18n`Send`),
|
}, vm.i18n`Send`),
|
||||||
]);
|
]);
|
||||||
return t.div({ className: "MessageComposer" }, [replyPreview, input]);
|
return t.div({ className: {
|
||||||
|
MessageComposer: true,
|
||||||
|
MessageComposer_canSend: vm => vm.canSend
|
||||||
|
} }, [replyPreview, input]);
|
||||||
}
|
}
|
||||||
|
|
||||||
unmount() {
|
unmount() {
|
||||||
|
|
Reference in a new issue