Merge remote-tracking branch 'origin/dev' into auth-menu
# Conflicts: # src/components/Views/Topic.tsx
This commit is contained in:
@@ -131,20 +131,18 @@ export const TopicView = (props: TopicProps) => {
|
|||||||
wrapper={'top-article'}
|
wrapper={'top-article'}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Row2 articles={sortedArticles().slice(13, 15)} isEqual={true} />
|
||||||
|
<Row1 article={sortedArticles()[15]} />
|
||||||
|
|
||||||
<Row2 articles={sortedArticles().slice(13, 15)} isEqual={true} />
|
<Slider
|
||||||
<Row1 article={sortedArticles()[15]} />
|
title={title()}
|
||||||
|
articles={sortedArticles().slice(16, 22)}
|
||||||
<Slider
|
slidesPerView={3}
|
||||||
title={title()}
|
isCardsWithCover={false}
|
||||||
articles={sortedArticles().slice(16, 22)}
|
/>
|
||||||
slidesPerView={3}
|
|
||||||
isCardsWithCover={false}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Row3 articles={sortedArticles().slice(23, 26)} />
|
|
||||||
<Row2 articles={sortedArticles().slice(26, 28)} />
|
|
||||||
|
|
||||||
|
<Row3 articles={sortedArticles().slice(23, 26)} />
|
||||||
|
<Row2 articles={sortedArticles().slice(26, 28)} />
|
||||||
|
|
||||||
<For each={pages()}>
|
<For each={pages()}>
|
||||||
{(page) => (
|
{(page) => (
|
||||||
|
Reference in New Issue
Block a user