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

Merge remote-tracking branch 'origin/main' into fix/fix-post-creator-alignment

Browse source 
* origin/main:
  fix: Prettier ignore generated themes, as they aren't written by humans
  feat: Badge-ify NSFW and removed by mod title info
This commit is contained in:
Jay Sitter 2023-06-18 23:18:03 -04:00
commit b55cf01e72
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.prettierignore
View file

@ -1,2 +1,3 @@
src/shared/translations src/shared/translations
lemmy-translations lemmy-translations
src/assets/css/themes/*.css

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

@ -552,7 +552,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
</button> </button>
))} ))}
{post.removed && ( {post.removed && (
<small className="ml-2 text-muted font-italic"> <small className="ml-2 badge text-bg-secondary">
{i18n.t("removed")} {i18n.t("removed")}
</small> </small>
)} )}
@ -589,9 +589,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
</small> </small>
)} )}
{post.nsfw && ( {post.nsfw && (
<small className="ml-2 text-muted font-italic"> <small className="ml-2 badge text-bg-danger">{i18n.t("nsfw")}</small>
{i18n.t("nsfw")}
</small>
)} )}
</div> </div>
); );