Merge branch 'main' into fix/fix-post-creator-alignment

This commit is contained in:
Jay Sitter 2023-06-18 23:45:06 -04:00 committed by GitHub
commit 2348bbbf5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -865,10 +865,10 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<button <button
className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item" className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
onClick={linkEvent(this, this.handleShowReportDialog)} onClick={linkEvent(this, this.handleShowReportDialog)}
data-tippy-content={i18n.t("show_report_dialog")}
aria-label={i18n.t("show_report_dialog")} aria-label={i18n.t("show_report_dialog")}
> >
<Icon icon="flag" inline /> <Icon classes="mr-1" icon="flag" inline />
{i18n.t("create_report")}
</button> </button>
); );
} }
@ -878,10 +878,14 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<button <button
className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item" className="btn btn-link btn-sm d-flex align-items-center rounded-0 dropdown-item"
onClick={linkEvent(this, this.handleBlockPersonClick)} onClick={linkEvent(this, this.handleBlockPersonClick)}
data-tippy-content={i18n.t("block_user")}
aria-label={i18n.t("block_user")} aria-label={i18n.t("block_user")}
> >
{this.state.blockLoading ? <Spinner /> : <Icon icon="slash" inline />} {this.state.blockLoading ? (
<Spinner />
) : (
<Icon classes="mr-1" icon="slash" inline />
)}
{i18n.t("block_user")}
</button> </button>
); );
} }