From c3203fdacdc915a46d35a4bb65b2d843395a13c0 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 5 Nov 2021 19:05:09 +0100 Subject: [PATCH 1/3] explain this value --- src/platform/web/ui/css/themes/element/theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css index e417b62f..d74ac052 100644 --- a/src/platform/web/ui/css/themes/element/theme.css +++ b/src/platform/web/ui/css/themes/element/theme.css @@ -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 { From 2f15c9a4a70993617873b4c48ba2aa7b372bc9d0 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 5 Nov 2021 19:05:35 +0100 Subject: [PATCH 2/3] show either attachment or send button, depending on composer value --- src/platform/web/ui/css/themes/element/theme.css | 8 ++++++-- src/platform/web/ui/session/room/MessageComposer.js | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css index d74ac052..44ff2fa9 100644 --- a/src/platform/web/ui/css/themes/element/theme.css +++ b/src/platform/web/ui/css/themes/element/theme.css @@ -579,8 +579,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 { diff --git a/src/platform/web/ui/session/room/MessageComposer.js b/src/platform/web/ui/session/room/MessageComposer.js index 08048b80..77d501d0 100644 --- a/src/platform/web/ui/session/room/MessageComposer.js +++ b/src/platform/web/ui/session/room/MessageComposer.js @@ -65,11 +65,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() { From 23494ab630b44ccebb99f216fc0480520fdc70dc Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 5 Nov 2021 19:05:52 +0100 Subject: [PATCH 3/3] bottom align send button, adjust paddings --- src/platform/web/ui/css/themes/element/theme.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css index 44ff2fa9..1932ecdd 100644 --- a/src/platform/web/ui/css/themes/element/theme.css +++ b/src/platform/web/ui/css/themes/element/theme.css @@ -502,7 +502,7 @@ a { } .MessageComposer_input, .MessageComposer_replyPreview { - padding: 8px 16px; + padding: 8px; } .MessageComposer_replyPreview > .replying { @@ -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 {