mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-11-01 01:59:56 +00:00
Merge branch 'main' into comment-border
This commit is contained in:
commit
08ad1fb183
4 changed files with 16 additions and 13 deletions
|
@ -84,7 +84,7 @@
|
|||
margin-top: -6.5px;
|
||||
}
|
||||
|
||||
.post-title a:visited {
|
||||
.post-title a:visited:not(:hover) {
|
||||
color: var(--bs-gray) !important;
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ import type { NextFunction, Response } from "express";
|
|||
export default function ({ res, next }: { res: Response; next: NextFunction }) {
|
||||
res.setHeader(
|
||||
"Content-Security-Policy",
|
||||
`default-src 'self'; manifest-src *; connect-src *; img-src * data:; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; form-action 'self'; base-uri 'self'; frame-src *; media-src *`
|
||||
`default-src 'self'; manifest-src *; connect-src *; img-src * data:; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; form-action 'self'; base-uri 'self'; frame-src *; media-src * data:`
|
||||
);
|
||||
|
||||
next();
|
||||
|
|
|
@ -531,7 +531,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
|
|||
checked={this.state.form.nsfw}
|
||||
onChange={linkEvent(this, handlePostNsfwChange)}
|
||||
/>
|
||||
<label className="form-check-label">
|
||||
<label className="form-check-label" htmlFor="post-nsfw">
|
||||
{I18NextService.i18n.t("nsfw")}
|
||||
</label>
|
||||
</div>
|
||||
|
|
|
@ -397,7 +397,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
|||
const post_view = this.postView;
|
||||
return (
|
||||
<span className="small">
|
||||
<PersonListing person={post_view.creator} />
|
||||
<PersonListing person={post_view.creator} muted={true} />
|
||||
{this.creatorIsMod_ && (
|
||||
<span className="mx-1 badge text-bg-light">
|
||||
{I18NextService.i18n.t("mod")}
|
||||
|
@ -444,8 +444,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
|||
<Link
|
||||
className={`d-inline ${
|
||||
!post.featured_community && !post.featured_local
|
||||
? "text-body"
|
||||
: "text-primary"
|
||||
? "link-dark"
|
||||
: "link-primary"
|
||||
}`}
|
||||
to={`/post/${post.id}`}
|
||||
title={I18NextService.i18n.t("comments")}
|
||||
|
@ -470,8 +470,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
|||
<a
|
||||
className={
|
||||
!post.featured_community && !post.featured_local
|
||||
? "text-body"
|
||||
: "text-primary"
|
||||
? "link-dark"
|
||||
: "link-primary"
|
||||
}
|
||||
href={url}
|
||||
title={url}
|
||||
|
@ -554,10 +554,10 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
|||
const url = post.url;
|
||||
|
||||
return (
|
||||
<p className="d-flex text-muted align-items-center gap-1 small m-0">
|
||||
<p className="small m-0">
|
||||
{url && !(hostname(url) === getExternalHost()) && (
|
||||
<a
|
||||
className="text-muted fst-italic"
|
||||
className="fst-italic link-dark link-opacity-75 link-opacity-100-hover"
|
||||
href={url}
|
||||
title={url}
|
||||
rel={relTags}
|
||||
|
@ -741,9 +741,12 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
|||
<Icon icon="message-square" classes="me-1" inline />
|
||||
{post_view.counts.comments}
|
||||
{this.unreadCount && (
|
||||
<span className="text-muted fst-italic">
|
||||
<>
|
||||
{" "}
|
||||
<span className="fst-italic">
|
||||
({this.unreadCount} {I18NextService.i18n.t("new")})
|
||||
</span>
|
||||
</>
|
||||
)}
|
||||
</Link>
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue