LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-29 15:51:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into tweak/thumbnail-fixed-width-height

Browse source
This commit is contained in:
SleeplessOne1917 2023-06-27 20:12:04 -04:00 committed by GitHub
commit 31daff70cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/shared/components/comment/comment-node.tsx
View file

@ -322,7 +322,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
getRoleLabelPill({ getRoleLabelPill({
label: I18NextService.i18n.t("op").toUpperCase(), label: I18NextService.i18n.t("op").toUpperCase(),
tooltip: I18NextService.i18n.t("creator"), tooltip: I18NextService.i18n.t("creator"),
classes: "text-bg-info text-black", classes: "text-bg-info",
shrink: false, shrink: false,
})} })}
@ -330,14 +330,14 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
getRoleLabelPill({ getRoleLabelPill({
label: I18NextService.i18n.t("mod"), label: I18NextService.i18n.t("mod"),
tooltip: I18NextService.i18n.t("mod"), tooltip: I18NextService.i18n.t("mod"),
classes: "text-bg-primary text-black", classes: "text-bg-primary",
})} })}
{isAdmin_ && {isAdmin_ &&
getRoleLabelPill({ getRoleLabelPill({
label: I18NextService.i18n.t("admin"), label: I18NextService.i18n.t("admin"),
tooltip: I18NextService.i18n.t("admin"), tooltip: I18NextService.i18n.t("admin"),
classes: "text-bg-danger text-white", classes: "text-bg-danger",
})} })}
{cv.creator.bot_account && {cv.creator.bot_account &&

48
src/shared/components/community/sidebar.tsx
View file

@ -260,20 +260,18 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
subscribe() { subscribe() {
const community_view = this.props.community_view; const community_view = this.props.community_view;
return ( return (
<> community_view.subscribed === "NotSubscribed" && (
{community_view.subscribed == "NotSubscribed" && ( <button
<button className="btn btn-secondary d-block mb-2 w-100"
className="btn btn-secondary d-block mb-2 w-100" onClick={linkEvent(this, this.handleFollowCommunity)}
onClick={linkEvent(this, this.handleFollowCommunity)} >
> {this.state.followCommunityLoading ? (
{this.state.followCommunityLoading ? ( <Spinner />
<Spinner /> ) : (
) : ( I18NextService.i18n.t("subscribe")
I18NextService.i18n.t("subscribe") )}
)} </button>
</button> )
)}
</>
); );
} }
@ -281,18 +279,16 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
const { subscribed, blocked } = this.props.community_view; const { subscribed, blocked } = this.props.community_view;
return ( return (
<> subscribed === "NotSubscribed" && (
{subscribed == "NotSubscribed" && ( <button
<button className="btn btn-danger d-block mb-2 w-100"
className="btn btn-danger d-block mb-2 w-100" onClick={linkEvent(this, this.handleBlockCommunity)}
onClick={linkEvent(this, this.handleBlockCommunity)} >
> {I18NextService.i18n.t(
{I18NextService.i18n.t( blocked ? "unblock_community" : "block_community"
blocked ? "unblock_community" : "block_community" )}
)} </button>
</button> )
)}
</>
); );
} }

4
src/shared/components/person/profile.tsx
View file

@ -489,7 +489,7 @@ export class Profile extends Component<
{getRoleLabelPill({ {getRoleLabelPill({
label: I18NextService.i18n.t("banned"), label: I18NextService.i18n.t("banned"),
tooltip: I18NextService.i18n.t("banned"), tooltip: I18NextService.i18n.t("banned"),
classes: "text-bg-danger text-white", classes: "text-bg-danger",
shrink: false, shrink: false,
})} })}
</li> </li>
@ -499,7 +499,7 @@ export class Profile extends Component<
{getRoleLabelPill({ {getRoleLabelPill({
label: I18NextService.i18n.t("deleted"), label: I18NextService.i18n.t("deleted"),
tooltip: I18NextService.i18n.t("deleted"), tooltip: I18NextService.i18n.t("deleted"),
classes: "text-bg-danger text-white", classes: "text-bg-danger",
shrink: false, shrink: false,
})} })}
</li> </li>

4
src/shared/components/post/post-listing.tsx
View file

@ -412,13 +412,13 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
getRoleLabelPill({ getRoleLabelPill({
label: I18NextService.i18n.t("mod"), label: I18NextService.i18n.t("mod"),
tooltip: I18NextService.i18n.t("mod"), tooltip: I18NextService.i18n.t("mod"),
classes: "text-bg-primary text-black", classes: "text-bg-primary",
})} })}
{this.creatorIsAdmin_ && {this.creatorIsAdmin_ &&
getRoleLabelPill({ getRoleLabelPill({
label: I18NextService.i18n.t("admin"), label: I18NextService.i18n.t("admin"),
tooltip: I18NextService.i18n.t("admin"), tooltip: I18NextService.i18n.t("admin"),
classes: "text-bg-danger text-white", classes: "text-bg-danger",
})} })}
{post_view.creator.bot_account && {post_view.creator.bot_account &&
getRoleLabelPill({ getRoleLabelPill({