diff --git a/src/components/Feed/ArticleCard.module.scss b/src/components/Feed/ArticleCard.module.scss index 76845704..35195a03 100644 --- a/src/components/Feed/ArticleCard.module.scss +++ b/src/components/Feed/ArticleCard.module.scss @@ -457,7 +457,7 @@ } .shoutTopic a { - &, + &:link, &:visited { &:hover { background: #fff !important; @@ -775,3 +775,7 @@ .shoutTopicTop { margin-bottom: 0.4rem !important; } + +.shoutCardNoImage { + background: rgb(0 0 0 / 50%); +} diff --git a/src/components/Feed/ArticleCard.tsx b/src/components/Feed/ArticleCard.tsx index 3000a2d5..9855b5cd 100644 --- a/src/components/Feed/ArticleCard.tsx +++ b/src/components/Feed/ArticleCard.tsx @@ -38,6 +38,7 @@ interface ArticleCardProps { isSingle?: boolean isBeside?: boolean withViewed?: boolean + noAuthorLink?: boolean } article: Shout } @@ -176,7 +177,7 @@ export const ArticleCard = (props: ArticleCardProps) => { hideWriteButton={true} hideFollow={true} isFeedMode={true} - hasLink={props.settings?.isFeedMode} + hasLink={!props.settings?.noAuthorLink} /> ) }} diff --git a/src/components/Feed/Row1.tsx b/src/components/Feed/Row1.tsx index 263e4e96..b6b1f13c 100644 --- a/src/components/Feed/Row1.tsx +++ b/src/components/Feed/Row1.tsx @@ -2,13 +2,16 @@ import { Show } from 'solid-js' import type { Shout } from '../../graphql/types.gen' import { ArticleCard } from './ArticleCard' -export const Row1 = (props: { article: Shout; nodate?: boolean }) => ( +export const Row1 = (props: { article: Shout; nodate?: boolean; noAuthorLink?: boolean }) => (
- +
diff --git a/src/components/Feed/Row2.tsx b/src/components/Feed/Row2.tsx index d435b111..81be784c 100644 --- a/src/components/Feed/Row2.tsx +++ b/src/components/Feed/Row2.tsx @@ -8,7 +8,12 @@ const x = [ ['16', '8'] ] -export const Row2 = (props: { articles: Shout[]; isEqual?: boolean; nodate?: boolean }) => { +export const Row2 = (props: { + articles: Shout[] + isEqual?: boolean + nodate?: boolean + noAuthorLink?: boolean +}) => { const [y, setY] = createSignal(0) createComputed(() => setY(Math.floor(Math.random() * x.length))) @@ -26,7 +31,8 @@ export const Row2 = (props: { articles: Shout[]; isEqual?: boolean; nodate?: boo article={a} settings={{ isWithCover: props.isEqual || x[y()][i()] === '16', - nodate: props.isEqual || props.nodate + nodate: props.isEqual || props.nodate, + noAuthorLink: props.noAuthorLink }} />
diff --git a/src/components/Feed/Row3.tsx b/src/components/Feed/Row3.tsx index 03ea2058..2a352b21 100644 --- a/src/components/Feed/Row3.tsx +++ b/src/components/Feed/Row3.tsx @@ -3,7 +3,12 @@ import { For } from 'solid-js' import type { Shout } from '../../graphql/types.gen' import { ArticleCard } from './ArticleCard' -export const Row3 = (props: { articles: Shout[]; header?: JSX.Element; nodate?: boolean }) => { +export const Row3 = (props: { + articles: Shout[] + header?: JSX.Element + nodate?: boolean + noAuthorLink?: boolean +}) => { return (
@@ -12,7 +17,10 @@ export const Row3 = (props: { articles: Shout[]; header?: JSX.Element; nodate?: {(a) => (
- +
)}
diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx index cd88f6d0..82f2b8e8 100644 --- a/src/components/Views/Author/Author.tsx +++ b/src/components/Views/Author/Author.tsx @@ -285,22 +285,22 @@ export const AuthorView = (props: AuthorProps) => {
- - - - - - + + + + + + {(page) => ( <> - - - - - - + + + + + + )}