Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into subscribe-fix

Browse source
This commit is contained in:
SleeplessOne1917 2023-06-27 19:28:52 -04:00 committed by GitHub
commit cf26c3d8e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 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 &&

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({