Merge branch 'main' into fix/wider-max-width-1536

This commit is contained in:
SleeplessOne1917 2023-06-26 20:29:13 -04:00 committed by GitHub
commit eef3ac41d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View file

@ -360,8 +360,9 @@ br.big {
} }
.img-icon { .img-icon {
width: 2rem; width: calc(var(--bs-body-line-height) * 1em);
height: 2rem; height: calc(var(--bs-body-line-height) * 1em);
border-radius: 0.25em;
} }
.tribute-container ul { .tribute-container ul {

View file

@ -39,7 +39,7 @@ export class PictrsImage extends Component<PictrsImageProps, any> {
"img-expanded slight-radius": "img-expanded slight-radius":
!this.props.thumbnail && !this.props.icon, !this.props.thumbnail && !this.props.icon,
"img-blur": this.props.thumbnail && this.props.nsfw, "img-blur": this.props.thumbnail && this.props.nsfw,
"rounded-circle img-cover img-icon me-2": this.props.icon, "img-cover img-icon me-1": this.props.icon,
"ms-2 mb-0 rounded-circle img-cover avatar-overlay": "ms-2 mb-0 rounded-circle img-cover avatar-overlay":
this.props.iconOverlay, this.props.iconOverlay,
"avatar-pushup": this.props.pushup, "avatar-pushup": this.props.pushup,

View file

@ -396,7 +396,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
const post_view = this.postView; const post_view = this.postView;
return ( return (
<span className="small"> <span className="small">
<PersonListing person={post_view.creator} muted={true} /> <PersonListing person={post_view.creator} />
{this.creatorIsMod_ && ( {this.creatorIsMod_ && (
<span className="mx-1 badge text-bg-light"> <span className="mx-1 badge text-bg-light">
{I18NextService.i18n.t("mod")} {I18NextService.i18n.t("mod")}