LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2025-01-10 20:15:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into fix/add-labels-to-block-report

Browse source
This commit is contained in:
Jay Sitter 2023-06-18 23:23:44 -04:00 committed by GitHub
commit 6e4b2004dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 12 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

2
src/assets/css/themes/_variables.darkly.scss
View file

@ -92,6 +92,8 @@ $input-border-color: $body-bg;
$input-group-addon-color: $gray-500;
$input-group-addon-bg: $gray-700;
$hr-border-color: rgba($body-color, 0.25);
$table-accent-bg: $gray-800;
$table-border-color: $gray-700;

2
src/assets/css/themes/_variables.litely.scss
View file

@ -76,3 +76,5 @@ $border-radius: 0.5rem;
$border-radius-lg: 0.5rem;
$border-radius-sm: 1rem;
$rounded-pill: 0.25rem;
$hr-border-color: rgba($body-color, 0.25);

2
src/assets/css/themes/darkly-red.css
View file

@ -450,7 +450,7 @@ hr {
margin-top: 1rem;
margin-bottom: 1rem;
border: 0;
border-top: 1px solid rgba(0, 0, 0, 0.1);
border-top: 1px solid rgba(222, 226, 230, 0.25);
}
small,

2
src/assets/css/themes/darkly.css
View file

@ -450,7 +450,7 @@ hr {
margin-top: 1rem;
margin-bottom: 1rem;
border: 0;
border-top: 1px solid rgba(0, 0, 0, 0.1);
border-top: 1px solid rgba(222, 226, 230, 0.25);
}
small,

2
src/assets/css/themes/litely-red.css
View file

@ -450,7 +450,7 @@ hr {
margin-top: 1rem;
margin-bottom: 1rem;
border: 0;
border-top: 1px solid rgba(0, 0, 0, 0.1);
border-top: 1px solid rgba(222, 226, 230, 0.25);
}
small,

2
src/assets/css/themes/litely.css
View file

@ -449,7 +449,7 @@ hr {
margin-top: 1rem;
margin-bottom: 1rem;
border: 0;
border-top: 1px solid rgba(34, 34, 34, 0.1);
border-top: 1px solid rgba(73, 80, 87, 0.25);
}
small,

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>
);

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

@ -96,9 +96,7 @@ export class PostListings extends Component<PostListingsProps, any> {
onAddAdmin={this.props.onAddAdmin}
onTransferCommunity={this.props.onTransferCommunity}
/>
{idx + 1 !== this.posts.length && (
<hr className="my-3 border border-primary" />
)}
{idx + 1 !== this.posts.length && <hr className="my-3" />}
</>
))
) : (