Merge remote-tracking branch 'origin/dev' into auth-menu

# Conflicts:
#	src/components/Views/Topic.tsx
This commit is contained in:
Igor Lobanov
2022-11-14 02:18:41 +01:00

View File

@@ -131,7 +131,6 @@ export const TopicView = (props: TopicProps) => {
wrapper={'top-article'}
/>
<Row2 articles={sortedArticles().slice(13, 15)} isEqual={true} />
<Row1 article={sortedArticles()[15]} />
@@ -145,7 +144,6 @@ export const TopicView = (props: TopicProps) => {
<Row3 articles={sortedArticles().slice(23, 26)} />
<Row2 articles={sortedArticles().slice(26, 28)} />
<For each={pages()}>
{(page) => (
<>