From 227b6d248b6fee8847b70eb82c06c0caee307657 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Mon, 14 Jun 2021 12:09:29 +0100
Subject: Fix newmessageform layout bug

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue | 2 ++
 src/components/NewMessageForm/NewMessageForm.vue              | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/components/NewMessageForm')

diff --git a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue
index 222a51846..8267a0aff 100644
--- a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue
+++ b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue
@@ -428,6 +428,8 @@ div[contenteditable] {
 	min-height: $clickable-area;
 	border-radius: math.div($clickable-area, 2);
 	border: 1px solid var(--color-border-dark);
+	max-height: 180px;
+	overflow-y: scroll;
 	&:hover,
 	&:focus,
 	&:active {
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 8a3faba0c..a21b2cebc 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -482,7 +482,7 @@ export default {
 	justify-content: center;
 	padding: 12px 0;
 	border-top: 1px solid var(--color-border);
-	height: 69px;
+	min-height: 69px;
 	&--chatScrolledToBottom {
 		border-top: none;
 	}
@@ -493,6 +493,7 @@ export default {
 	display: flex;
 	justify-content: center;
 	&-form {
+		align-items: flex-end;
 		display: flex;
 		position:relative;
 		flex: 0 1 700px;
@@ -514,9 +515,7 @@ export default {
 
 		&__input {
 			flex-grow: 1;
-			max-height: $message-form-max-height;
-			overflow-y: auto;
-			overflow-x: hidden;
+			overflow: hidden;
 		}
 		&__quote {
 			margin: 0 16px 12px 24px;
-- 
cgit v1.2.3