Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 997d8ab

Browse files
authored
Fix button width and align 絵文字 (emoji) on the user panel (#8562)
* Fix button width and align 絵文字 (emoji) on the user panel Signed-off-by: Suguru Hirahara <[email protected]> * mx_UserInfo_container:not(.mx_UserInfo_separator) Signed-off-by: Suguru Hirahara <[email protected]> * Move the spinner to the center Signed-off-by: Suguru Hirahara <[email protected]> * 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 <[email protected]> * Align the spinner to the center Signed-off-by: Suguru Hirahara <[email protected]> * Remove margin of paragraph inside div on verification panel Signed-off-by: Suguru Hirahara <[email protected]>
1 parent 7ed3089 commit 997d8ab

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

res/css/views/right_panel/_VerificationPanel.scss

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,31 @@ limitations under the License.
2323
}
2424
}
2525

26-
.mx_UserInfo {
26+
.mx_UserInfo.mx_BaseCard {
27+
.mx_UserInfo_container:not(.mx_UserInfo_separator) {
28+
29+
> div > p {
30+
margin-top: 0;
31+
margin-bottom: 0;
32+
}
33+
34+
.mx_VerificationPanel_verifyByEmojiButton,
35+
.mx_UserInfo_wideButton {
36+
width: fit-content;
37+
}
38+
39+
.mx_EncryptionInfo_spinner,
40+
.mx_VerificationShowSas {
41+
margin-inline-start: auto;
42+
margin-inline-end: auto;
43+
}
44+
45+
.mx_Spinner,
46+
.mx_VerificationShowSas {
47+
align-items: center;
48+
}
49+
}
50+
2751
.mx_EncryptionPanel_cancel {
2852
@mixin customisedCancelButton;
2953
width: 14px;

src/components/views/right_panel/UserInfo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function DevicesSection({ devices, userId, loading }: { devices: IDevice[], user
249249
return <Spinner />;
250250
}
251251
if (devices === null) {
252-
return <>{ _t("Unable to load session list") }</>;
252+
return <p>{ _t("Unable to load session list") }</p>;
253253
}
254254
const isMe = userId === cli.getUserId();
255255
const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));

0 commit comments

Comments
 (0)