From 169c77bad5efd72ee26d2af8f2718f5b9dd0956f Mon Sep 17 00:00:00 2001 From: manancodes Date: Wed, 17 Jan 2024 03:37:49 +0530 Subject: [PATCH 1/4] Fixed shield alignment on message Input --- res/css/views/rooms/_MessageComposer.pcss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss index 56a7da7ec66..dc6681d84d5 100644 --- a/res/css/views/rooms/_MessageComposer.pcss +++ b/res/css/views/rooms/_MessageComposer.pcss @@ -20,7 +20,7 @@ limitations under the License. margin: auto; border-top: 1px solid $primary-hairline-color; position: relative; - padding-left: 42px; + padding-left: 16px; padding-right: 16px; } @@ -81,10 +81,6 @@ limitations under the License. } .mx_MessageComposer_e2eIcon.mx_E2EIcon { - position: absolute; - left: 20px; - margin-right: 0; /* Counteract the E2EIcon class */ - margin-left: 3px; /* Counteract the E2EIcon class */ width: 12px; height: 12px; } From 6f39f4b15f117b638cc197275944252961508441 Mon Sep 17 00:00:00 2001 From: manancodes Date: Wed, 17 Jan 2024 03:37:49 +0530 Subject: [PATCH 2/4] Fixed shield alignment on message Input --- res/css/views/rooms/_MessageComposer.pcss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss index 56a7da7ec66..dc6681d84d5 100644 --- a/res/css/views/rooms/_MessageComposer.pcss +++ b/res/css/views/rooms/_MessageComposer.pcss @@ -20,7 +20,7 @@ limitations under the License. margin: auto; border-top: 1px solid $primary-hairline-color; position: relative; - padding-left: 42px; + padding-left: 16px; padding-right: 16px; } @@ -81,10 +81,6 @@ limitations under the License. } .mx_MessageComposer_e2eIcon.mx_E2EIcon { - position: absolute; - left: 20px; - margin-right: 0; /* Counteract the E2EIcon class */ - margin-left: 3px; /* Counteract the E2EIcon class */ width: 12px; height: 12px; } From 696765cc5685a1dff68d1bed93a51ad46d09254b Mon Sep 17 00:00:00 2001 From: manancodes Date: Wed, 17 Jan 2024 23:52:00 +0530 Subject: [PATCH 3/4] Updated fix --- res/css/views/rooms/_MessageComposer.pcss | 10 ++++++++-- src/components/views/rooms/MessageComposer.tsx | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss index dc6681d84d5..138c6c11510 100644 --- a/res/css/views/rooms/_MessageComposer.pcss +++ b/res/css/views/rooms/_MessageComposer.pcss @@ -20,7 +20,7 @@ limitations under the License. margin: auto; border-top: 1px solid $primary-hairline-color; position: relative; - padding-left: 16px; + padding-left: 42px; padding-right: 16px; } @@ -79,8 +79,14 @@ limitations under the License. .mx_MessageComposer_composecontrols { width: 100%; } - +.mx_MessageComposer_e2eIconWrapper { + height: 12px; /* Match the height of the E2E icon for alignment*/ +} .mx_MessageComposer_e2eIcon.mx_E2EIcon { + position: absolute; + left: 20px; + margin-right: 0; /* Counteract the E2EIcon class */ + margin-left: 3px; /* Counteract the E2EIcon class */ width: 12px; height: 12px; } diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx index 53e05e69a17..f9aae433feb 100644 --- a/src/components/views/rooms/MessageComposer.tsx +++ b/src/components/views/rooms/MessageComposer.tsx @@ -475,7 +475,9 @@ export class MessageComposer extends React.Component { public render(): React.ReactNode { const hasE2EIcon = Boolean(!this.state.isWysiwygLabEnabled && this.props.e2eStatus); const e2eIcon = hasE2EIcon && ( - +
+ +
); const controls: ReactNode[] = []; From dd3de23401ee45fef7d444d5984c0584b904647e Mon Sep 17 00:00:00 2001 From: manancodes Date: Thu, 18 Jan 2024 00:03:05 +0530 Subject: [PATCH 4/4] reversing merged changes --- res/css/views/rooms/_MessageComposer.pcss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss index 52da654b6bb..b6e97fac391 100644 --- a/res/css/views/rooms/_MessageComposer.pcss +++ b/res/css/views/rooms/_MessageComposer.pcss @@ -20,7 +20,7 @@ limitations under the License. margin: auto; border-top: 1px solid $primary-hairline-color; position: relative; - padding-left: 16px; + padding-left: 42px; padding-right: 16px; } @@ -80,9 +80,13 @@ limitations under the License. width: 100%; } .mx_MessageComposer_e2eIconWrapper { - height: 12px; /* Match the height of the E2E icon for alignment*/ + height: 12px; /* Match the height of the E2E icon for alignment */ } .mx_MessageComposer_e2eIcon.mx_E2EIcon { + position: absolute; + left: 20px; + margin-right: 0; /* Counteract the E2EIcon class */ + margin-left: 3px; /* Counteract the E2EIcon class */ width: 12px; height: 12px; }