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

Commit

Permalink
Fix button width and align 絵文字 (emoji) on the user panel (#8562)
Browse files Browse the repository at this point in the history
* Fix button width and align 絵文字 (emoji) on the user panel

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* mx_UserInfo_container:not(.mx_UserInfo_separator)

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move the spinner to the center

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* 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 <luixxiul@users.noreply.github.com>

* Align the spinner to the center

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove margin of paragraph inside div on verification panel

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
  • Loading branch information
luixxiul authored May 12, 2022
1 parent 7ed3089 commit 997d8ab
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
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

0 comments on commit 997d8ab

Please sign in to comment.