LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-01 10:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into comment-border

Browse source
This commit is contained in:
SleeplessOne1917 2023-06-26 10:15:27 +00:00 committed by GitHub
commit 08ad1fb183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/assets/css/main.css
View file

@ -84,7 +84,7 @@
margin-top: -6.5px; margin-top: -6.5px;
} }
.post-title a:visited { .post-title a:visited:not(:hover) {
color: var(--bs-gray) !important; color: var(--bs-gray) !important;
} }

2
src/server/middleware/set-default-csp.ts
View file

@ -3,7 +3,7 @@ import type { NextFunction, Response } from "express";
export default function ({ res, next }: { res: Response; next: NextFunction }) { export default function ({ res, next }: { res: Response; next: NextFunction }) {
res.setHeader( res.setHeader(
"Content-Security-Policy", "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(); next();

2
src/shared/components/post/post-form.tsx
View file

@ -531,7 +531,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
checked={this.state.form.nsfw} checked={this.state.form.nsfw}
onChange={linkEvent(this, handlePostNsfwChange)} onChange={linkEvent(this, handlePostNsfwChange)}
/> />
<label className="form-check-label"> <label className="form-check-label" htmlFor="post-nsfw">
{I18NextService.i18n.t("nsfw")} {I18NextService.i18n.t("nsfw")}
</label> </label>
</div> </div>

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

@ -397,7 +397,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
const post_view = this.postView; const post_view = this.postView;
return ( return (
<span className="small"> <span className="small">
<PersonListing person={post_view.creator} /> <PersonListing person={post_view.creator} muted={true} />
{this.creatorIsMod_ && ( {this.creatorIsMod_ && (
<span className="mx-1 badge text-bg-light"> <span className="mx-1 badge text-bg-light">
{I18NextService.i18n.t("mod")} {I18NextService.i18n.t("mod")}
@ -444,8 +444,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<Link <Link
className={`d-inline ${ className={`d-inline ${
!post.featured_community && !post.featured_local !post.featured_community && !post.featured_local
? "text-body" ? "link-dark"
: "text-primary" : "link-primary"
}`} }`}
to={`/post/${post.id}`} to={`/post/${post.id}`}
title={I18NextService.i18n.t("comments")} title={I18NextService.i18n.t("comments")}
@ -470,8 +470,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<a <a
className={ className={
!post.featured_community && !post.featured_local !post.featured_community && !post.featured_local
? "text-body" ? "link-dark"
: "text-primary" : "link-primary"
} }
href={url} href={url}
title={url} title={url}
@ -554,10 +554,10 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
const url = post.url; const url = post.url;
return ( return (
<p className="d-flex text-muted align-items-center gap-1 small m-0"> <p className="small m-0">
{url && !(hostname(url) === getExternalHost()) && ( {url && !(hostname(url) === getExternalHost()) && (
<a <a
className="text-muted fst-italic" className="fst-italic link-dark link-opacity-75 link-opacity-100-hover"
href={url} href={url}
title={url} title={url}
rel={relTags} rel={relTags}
@ -741,9 +741,12 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<Icon icon="message-square" classes="me-1" inline /> <Icon icon="message-square" classes="me-1" inline />
{post_view.counts.comments} {post_view.counts.comments}
{this.unreadCount && ( {this.unreadCount && (
<span className="text-muted fst-italic"> <>
({this.unreadCount} {I18NextService.i18n.t("new")}) {" "}
</span> <span className="fst-italic">
({this.unreadCount} {I18NextService.i18n.t("new")})
</span>
</>
)} )}
</Link> </Link>
); );