From f7154eb6e246780591c5f06d9a6befdab23dd101 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 11 May 2022 23:17:13 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Fix=20button=20width=20and=20align=20?= =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=20(emoji)=20on=20the=20user=20panel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Suguru Hirahara --- .../views/right_panel/_VerificationPanel.scss | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss index ff5b5f0dc15..ee09b618691 100644 --- a/res/css/views/right_panel/_VerificationPanel.scss +++ b/res/css/views/right_panel/_VerificationPanel.scss @@ -23,7 +23,22 @@ limitations under the License. } } -.mx_UserInfo { +.mx_UserInfo.mx_BaseCard { + .mx_UserInfo_container { + &:not(.mx_UserInfo_separator) { + .mx_VerificationPanel_verifyByEmojiButton, + .mx_UserInfo_wideButton { + width: fit-content; + } + + .mx_VerificationShowSas { + margin-inline-start: auto; + margin-inline-end: auto; + align-items: center; + } + } + } + .mx_EncryptionPanel_cancel { @mixin customisedCancelButton; width: 14px; From b8a8d6d2dff85360ed56526581d667b24e7d1c92 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 12 May 2022 01:53:50 +0900 Subject: [PATCH 2/6] mx_UserInfo_container:not(.mx_UserInfo_separator) Signed-off-by: Suguru Hirahara --- .../views/right_panel/_VerificationPanel.scss | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss index ee09b618691..ff37296425a 100644 --- a/res/css/views/right_panel/_VerificationPanel.scss +++ b/res/css/views/right_panel/_VerificationPanel.scss @@ -24,18 +24,16 @@ limitations under the License. } .mx_UserInfo.mx_BaseCard { - .mx_UserInfo_container { - &:not(.mx_UserInfo_separator) { - .mx_VerificationPanel_verifyByEmojiButton, - .mx_UserInfo_wideButton { - width: fit-content; - } + .mx_UserInfo_container:not(.mx_UserInfo_separator) { + .mx_VerificationPanel_verifyByEmojiButton, + .mx_UserInfo_wideButton { + width: fit-content; + } - .mx_VerificationShowSas { - margin-inline-start: auto; - margin-inline-end: auto; - align-items: center; - } + .mx_VerificationShowSas { + margin-inline-start: auto; + margin-inline-end: auto; + align-items: center; } } From b124fcfb76e36826f92200b5cfa75505994c4a6f Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 12 May 2022 19:18:31 +0900 Subject: [PATCH 3/6] Move the spinner to the center Signed-off-by: Suguru Hirahara --- res/css/views/right_panel/_VerificationPanel.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss index ff37296425a..4a25ab1a3a2 100644 --- a/res/css/views/right_panel/_VerificationPanel.scss +++ b/res/css/views/right_panel/_VerificationPanel.scss @@ -30,9 +30,13 @@ limitations under the License. width: fit-content; } + .mx_EncryptionInfo_spinner, .mx_VerificationShowSas { margin-inline-start: auto; margin-inline-end: auto; + } + + .mx_VerificationShowSas { align-items: center; } } From 9b9ef1791aaf7d1cac2e9c8322a6977eaff5c378 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 12 May 2022 19:25:08 +0900 Subject: [PATCH 4/6] Add indent to 'Unable to load session list' paragraph Because the indent style has been specified with ':not(h3)', wrapping with something is required for the indent. Signed-off-by: Suguru Hirahara --- src/components/views/right_panel/UserInfo.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx index 7b45746c770..f1c956bb8f3 100644 --- a/src/components/views/right_panel/UserInfo.tsx +++ b/src/components/views/right_panel/UserInfo.tsx @@ -249,7 +249,7 @@ function DevicesSection({ devices, userId, loading }: { devices: IDevice[], user return ; } if (devices === null) { - return <>{ _t("Unable to load session list") }; + return

{ _t("Unable to load session list") }

; } const isMe = userId === cli.getUserId(); const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId)); From 8e5eab8f857167fd8384a1a3a9632671c97d1282 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 12 May 2022 19:55:56 +0900 Subject: [PATCH 5/6] Align the spinner to the center Signed-off-by: Suguru Hirahara --- res/css/views/right_panel/_VerificationPanel.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss index 4a25ab1a3a2..ab4a73083a0 100644 --- a/res/css/views/right_panel/_VerificationPanel.scss +++ b/res/css/views/right_panel/_VerificationPanel.scss @@ -36,6 +36,7 @@ limitations under the License. margin-inline-end: auto; } + .mx_Spinner, .mx_VerificationShowSas { align-items: center; } From 77c420dc5ebe51f2840f5ca7ef61ce5067970f48 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 12 May 2022 20:12:52 +0900 Subject: [PATCH 6/6] Remove margin of paragraph inside div on verification panel Signed-off-by: Suguru Hirahara --- res/css/views/right_panel/_VerificationPanel.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss index ab4a73083a0..972eb9197f0 100644 --- a/res/css/views/right_panel/_VerificationPanel.scss +++ b/res/css/views/right_panel/_VerificationPanel.scss @@ -25,6 +25,12 @@ limitations under the License. .mx_UserInfo.mx_BaseCard { .mx_UserInfo_container:not(.mx_UserInfo_separator) { + + > div > p { + margin-top: 0; + margin-bottom: 0; + } + .mx_VerificationPanel_verifyByEmojiButton, .mx_UserInfo_wideButton { width: fit-content;