fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-10 02:15:11 +00:00
Code Issues Packages 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
parent 87350bd3b3 f6dd2a8f3d
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

3
.prettierignore
View file

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