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

Fix button width and align 絵文字 (emoji) on the user panel #8562

Merged
merged 7 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion res/css/views/right_panel/_VerificationPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,31 @@ limitations under the License.
}
}

.mx_UserInfo {
.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;
}

.mx_EncryptionInfo_spinner,
.mx_VerificationShowSas {
margin-inline-start: auto;
margin-inline-end: auto;
}

.mx_Spinner,
.mx_VerificationShowSas {
align-items: center;
}
}

.mx_EncryptionPanel_cancel {
@mixin customisedCancelButton;
width: 14px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/right_panel/UserInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function DevicesSection({ devices, userId, loading }: { devices: IDevice[], user
return <Spinner />;
}
if (devices === null) {
return <>{ _t("Unable to load session list") }</>;
return <p>{ _t("Unable to load session list") }</p>;
}
const isMe = userId === cli.getUserId();
const deviceTrusts = devices.map(d => cli.checkDeviceTrust(userId, d.deviceId));
Expand Down