diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx index 030dab97..ffc4c512 100644 --- a/src/components/Article/FullArticle.tsx +++ b/src/components/Article/FullArticle.tsx @@ -36,7 +36,7 @@ import { CommentsTree } from './CommentsTree' import { SharePopup, getShareUrl } from './SharePopup' import { ShoutRatingControl } from './ShoutRatingControl' -import stylesFeed from '../Feed/Feed.module.scss' +import stylesFeed from '~/styles/views/Feed.module.scss' import stylesHeader from '../HeaderNav/Header.module.scss' import styles from './Article.module.scss' diff --git a/src/components/Feed/ArticleCard/ArticleCard.module.scss b/src/components/Feed/ArticleCard/ArticleCard.module.scss index 0ccb6f1b..bda315f6 100644 --- a/src/components/Feed/ArticleCard/ArticleCard.module.scss +++ b/src/components/Feed/ArticleCard/ArticleCard.module.scss @@ -685,34 +685,6 @@ } } -.floor--9 { - /* TODO: refactor these styles */ - .shoutCardTitle, - .shoutCardSubtitle { - // display: inline; - font-size: 2.2rem; - } - - .shoutCardTitle { - padding-right: 0.25em; - } - - .shoutAuthor, - .shoutDate { - margin-top: 0.8rem; - } - - .beside-column .shoutCardTitlesContainer { - position: relative; - - a:hover { - .shoutCardLinkContainer { - color: var(--default-color-invert); - } - } - } -} - .shoutCardBigTitle { .shoutCardTitle { font-size:3.2rem; diff --git a/src/components/Feed/Beside.tsx b/src/components/Feed/Beside.tsx index bbf886a5..0e251385 100644 --- a/src/components/Feed/Beside.tsx +++ b/src/components/Feed/Beside.tsx @@ -9,8 +9,8 @@ import { TopicCard } from '../Topic/Card' import { Icon } from '../_shared/Icon' import { ArticleCard } from './ArticleCard' +import stylesFeed from '~/styles/views/Feed.module.scss' import styles from './Beside.module.scss' -import stylesFeed from './Feed.module.scss' type Props = { title?: string diff --git a/src/components/Feed/Group.tsx b/src/components/Feed/Group.tsx index 9193cefe..bd89ff2a 100644 --- a/src/components/Feed/Group.tsx +++ b/src/components/Feed/Group.tsx @@ -5,7 +5,7 @@ import type { Shout } from '~/graphql/schema/core.gen' import { ArticleCard } from './ArticleCard' -import stylesFeed from './Feed.module.scss' +import stylesFeed from '~/styles/views/Feed.module.scss' import styles from './Group.module.scss' interface GroupProps { diff --git a/src/components/Feed/Row1.tsx b/src/components/Feed/Row1.tsx index 519cc918..5c2f2d7f 100644 --- a/src/components/Feed/Row1.tsx +++ b/src/components/Feed/Row1.tsx @@ -2,7 +2,8 @@ import clsx from 'clsx' import { Show } from 'solid-js' import type { Shout } from '~/graphql/schema/core.gen' import { ArticleCard } from './ArticleCard' -import stylesFeed from './Feed.module.scss' + +import stylesFeed from '~/styles/views/Feed.module.scss' export const Row1 = (props: { article: Shout @@ -11,7 +12,7 @@ export const Row1 = (props: { noauthor?: boolean }) => ( -
+
diff --git a/src/components/Feed/Row2.tsx b/src/components/Feed/Row2.tsx index 51df3471..a942305d 100644 --- a/src/components/Feed/Row2.tsx +++ b/src/components/Feed/Row2.tsx @@ -3,7 +3,8 @@ import type { Shout } from '~/graphql/schema/core.gen' import { For, Show, createEffect, createSignal } from 'solid-js' import { ArticleCard } from './ArticleCard' -import stylesFeed from './Feed.module.scss' + +import stylesFeed from '~/styles/views/Feed.module.scss' const columnSizes = ['col-md-12', 'col-md-8', 'col-md-16'] diff --git a/src/components/Feed/Row3.tsx b/src/components/Feed/Row3.tsx index 1742279d..2a8f200f 100644 --- a/src/components/Feed/Row3.tsx +++ b/src/components/Feed/Row3.tsx @@ -4,7 +4,8 @@ import type { Shout } from '~/graphql/schema/core.gen' import { For, Show } from 'solid-js' import { ArticleCard } from './ArticleCard' -import stylesFeed from './Feed.module.scss' + +import stylesFeed from '~/styles/views/Feed.module.scss' export const Row3 = (props: { articles: Shout[] diff --git a/src/components/Feed/Row5.tsx b/src/components/Feed/Row5.tsx index 95e76167..0dc53dd1 100644 --- a/src/components/Feed/Row5.tsx +++ b/src/components/Feed/Row5.tsx @@ -1,11 +1,12 @@ import clsx from 'clsx' import type { Shout } from '~/graphql/schema/core.gen' import { ArticleCard } from './ArticleCard' -import stylesFeed from './Feed.module.scss' + +import stylesFeed from '~/styles/views/Feed.module.scss' export const Row5 = (props: { articles: Shout[]; nodate?: boolean }) => { return ( -
+
diff --git a/src/components/Views/SearchView.tsx b/src/components/Views/SearchView.tsx index 62db1f74..8d564506 100644 --- a/src/components/Views/SearchView.tsx +++ b/src/components/Views/SearchView.tsx @@ -8,8 +8,8 @@ import { restoreScrollPosition, saveScrollPosition } from '~/utils/scroll' import { ArticleCard } from '../Feed/ArticleCard' import { LoadMoreItems, LoadMoreWrapper } from '../_shared/LoadMoreWrapper' +import stylesFeed from '~/styles/views/Feed.module.scss' import styles from '~/styles/views/Search.module.scss' -import stylesFeed from '../Feed/Feed.module.scss' type Props = { query: string diff --git a/src/styles/views/Feed.module.scss b/src/styles/views/Feed.module.scss index ae5d19d0..37d0320d 100644 --- a/src/styles/views/Feed.module.scss +++ b/src/styles/views/Feed.module.scss @@ -318,3 +318,30 @@ } } +.floor--9 { + /* TODO: refactor these styles */ + .shoutCardTitle, + .shoutCardSubtitle { + // display: inline; + font-size: 2.2rem; + } + + .shoutCardTitle { + padding-right: 0.25em; + } + + .shoutAuthor, + .shoutDate { + margin-top: 0.8rem; + } + + .beside-column .shoutCardTitlesContainer { + position: relative; + + a:hover { + .shoutCardLinkContainer { + color: var(--default-color-invert); + } + } + } +}