diff --git a/src/components/Feed/Beside.module.scss b/src/components/Feed/Beside.module.scss
index 1e5486ab..fb3d7b66 100644
--- a/src/components/Feed/Beside.module.scss
+++ b/src/components/Feed/Beside.module.scss
@@ -12,6 +12,8 @@
}
li {
+ margin-bottom: 1em;
+
&.top {
border-bottom: 1px solid #e1e1e1;
display: flex;
diff --git a/src/components/Nav/Modal.scss b/src/components/Nav/Modal.scss
index 6be20367..8c7bc2f0 100644
--- a/src/components/Nav/Modal.scss
+++ b/src/components/Nav/Modal.scss
@@ -1,11 +1,12 @@
.modalwrap {
- pointer-events: all;
align-items: center;
background: rgb(20 20 20 / 70%);
display: flex;
justify-content: center;
height: 100%;
left: 0;
+ overflow: auto;
+ pointer-events: all;
position: fixed;
top: 0;
width: 100%;
diff --git a/src/components/Topic/Full.scss b/src/components/Topic/Full.module.scss
similarity index 66%
rename from src/components/Topic/Full.scss
rename to src/components/Topic/Full.module.scss
index ef8c4baf..f0c39156 100644
--- a/src/components/Topic/Full.scss
+++ b/src/components/Topic/Full.module.scss
@@ -1,11 +1,19 @@
-.topic__header {
+.topicHeader {
@include font-size(1.7rem);
padding-top: 5.8rem;
text-align: center;
+
+ h1 {
+ color: #2638d9;
+ font-weight: 500;
+ text-transform: uppercase;
+
+ @include font-size(2rem);
+ }
}
-.topic__actions {
+.topicActions {
margin-top: 2.8rem;
button,
diff --git a/src/components/Topic/Full.tsx b/src/components/Topic/Full.tsx
index 5923ead9..c6bb57fa 100644
--- a/src/components/Topic/Full.tsx
+++ b/src/components/Topic/Full.tsx
@@ -1,10 +1,11 @@
import { createMemo, Show } from 'solid-js'
import type { Topic } from '../../graphql/types.gen'
import { FollowingEntity } from '../../graphql/types.gen'
-import './Full.scss'
+import styles from './Full.module.scss'
import { useAuthStore } from '../../stores/auth'
import { follow, unfollow } from '../../stores/zine/common'
import { t } from '../../utils/intl'
+import { clsx } from 'clsx'
type Props = {
topic: Topic
@@ -15,37 +16,35 @@ export const FullTopic = (props: Props) => {
const subscribed = createMemo(() => session()?.news?.topics?.includes(props.topic?.slug))
return (
-
-
-
-
)
}
diff --git a/src/components/Views/Author.tsx b/src/components/Views/Author.tsx
index 52cd189f..59278d34 100644
--- a/src/components/Views/Author.tsx
+++ b/src/components/Views/Author.tsx
@@ -7,7 +7,6 @@ import { t } from '../../utils/intl'
import { useAuthorsStore } from '../../stores/zine/authors'
import { loadAuthorArticles, useArticlesStore } from '../../stores/zine/articles'
-import '../../styles/Topic.scss'
import { useTopicsStore } from '../../stores/zine/topics'
import { useRouter } from '../../stores/router'
import { Beside } from '../Feed/Beside'
diff --git a/src/components/Views/Topic.tsx b/src/components/Views/Topic.tsx
index 8e96ea6f..a50bf23a 100644
--- a/src/components/Views/Topic.tsx
+++ b/src/components/Views/Topic.tsx
@@ -4,7 +4,7 @@ import { Row3 } from '../Feed/Row3'
import { Row2 } from '../Feed/Row2'
import { Beside } from '../Feed/Beside'
import { ArticleCard } from '../Feed/Card'
-import '../../styles/Topic.scss'
+import styles from '../../styles/Topic.module.scss'
import { FullTopic } from '../Topic/Full'
import { t } from '../../utils/intl'
import { useRouter } from '../../stores/router'
@@ -13,6 +13,9 @@ import { loadPublishedArticles, useArticlesStore } from '../../stores/zine/artic
import { useAuthorsStore } from '../../stores/zine/authors'
import { restoreScrollPosition, saveScrollPosition } from '../../utils/scroll'
import { splitToPages } from '../../utils/splitToPages'
+import { clsx } from 'clsx'
+import Slider from '../Feed/Slider'
+import { Row1 } from '../Feed/Row1'
type TopicsPageSearchParams = {
by: 'comments' | '' | 'recent' | 'viewed' | 'rating' | 'commented'
@@ -70,94 +73,111 @@ export const TopicView = (props: TopicProps) => {
)
return (
-
+
-
-
-
- -
-
-
- {/*TODO: server sort*/}
- {/*- */}
- {/* */}
- {/*
*/}
- {/*- */}
- {/* */}
- {/*
*/}
- {/*- */}
- {/* */}
- {/*
*/}
-
-
-
-
- {`${t('Show')} `}
-
{t('All posts')}
+
+
+
+
+ -
+
+
+ {/*TODO: server sort*/}
+ {/*- */}
+ {/* */}
+ {/*
*/}
+ {/*- */}
+ {/* */}
+ {/*
*/}
+ {/*- */}
+ {/* */}
+ {/*
*/}
+
+
+
+
+ {`${t('Show')} `}
+ {t('All posts')}
+
-
-
-
-
{title()}
-
- {(article) => (
-
- )}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{title()}
+
+ {(article) => (
+
+ )}
+
+
-
+
-
-
5}>
-
-
-
-
-
-
-
+
5}>
+
+
+
+
+
+
-
- {(page) => (
- <>
-
-
-
- >
- )}
-
+
+ {(page) => (
+ <>
+
+
+
+ >
+ )}
+
-
-
-
-
-
-
+
+
+
+
+
)
diff --git a/src/styles/Topic.scss b/src/styles/Topic.module.scss
similarity index 82%
rename from src/styles/Topic.scss
rename to src/styles/Topic.module.scss
index 20b16c28..fa18beab 100644
--- a/src/styles/Topic.scss
+++ b/src/styles/Topic.module.scss
@@ -1,11 +1,11 @@
-.topic-page {
- .group__controls {
+.topicPage {
+ .groupControls {
align-items: baseline;
margin-bottom: 4rem;
margin-top: 7rem;
}
- .floor--important {
+ .floorImportant {
a:hover {
background: #fff;
color: #000 !important;