Skip to content

Commit ffda15a

Browse files
committed
refactor: nav page style perfect
1 parent bf800d0 commit ffda15a

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

client/pages/nav/[id].tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,6 @@ const Article: NextPage<IProps> = ({ siteKey }) => {
5454
<title>{(article?.title || t('unknownTitle')) + ' - ' + setting.systemTitle}</title>
5555
</Helmet>
5656
<div>
57-
<div className="container">
58-
<div className={style.breadcrump}>
59-
<Breadcrumb>
60-
<Breadcrumb.Item>
61-
<Link href="/nav">
62-
<a aria-label="nav">{'导航'}</a>
63-
</Link>
64-
</Breadcrumb.Item>
65-
<Breadcrumb.Item>{article.title}</Breadcrumb.Item>
66-
</Breadcrumb>
67-
</div>
68-
</div>
6957
<article id="js-article-wrapper" className={style.articleWrap}>
7058
{/* S 文章 Seo 信息 */}
7159
{setting.systemUrl && (
@@ -147,6 +135,18 @@ const Article: NextPage<IProps> = ({ siteKey }) => {
147135
return (
148136
<DoubleColumnLayout
149137
leftNode={Content}
138+
topNode={
139+
<div className={style.breadcrump}>
140+
<Breadcrumb>
141+
<Breadcrumb.Item>
142+
<Link href="/nav">
143+
<a aria-label="nav">{'导航'}</a>
144+
</Link>
145+
</Breadcrumb.Item>
146+
<Breadcrumb.Item>{article.title}</Breadcrumb.Item>
147+
</Breadcrumb>
148+
</div>
149+
}
150150
rightNode={
151151
<div className={'sticky'}>
152152
<Tags tags={tags} />

client/pages/nav/index.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
.wrapper {
2-
padding-top: 1rem;
32
padding-bottom: 2rem;
43
}
54
.search {
65
background-color: var(--bg-box) !important;
76
margin-bottom: 24px;
7+
margin-top: 16px;
88
div:not(:last-child) {
99
border: none !important;
1010
background-color: var(--bg-box) !important;
1111
}
1212
}
1313
.breadcrump {
14-
margin-bottom: 8px;
14+
margin-top: 8px;
1515
}
1616
.articleContent {
1717
line-height: 24px;

client/pages/nav/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { ArticleProvider } from '@/providers/article';
77
import { CategoryProvider } from '@/providers/category';
88
import { useContext } from 'react';
99
import { GlobalContext } from '@/context/global';
10+
import SystemNotification from '@/components/Setting/SystemNotification';
1011

1112
interface IHomeProps {
1213
articles?: IArticle[];
@@ -17,6 +18,7 @@ const Page: NextPage<IHomeProps> = ({}) => {
1718
return (
1819
<div className={style.wrapper}>
1920
<div className="container">
21+
<SystemNotification />
2022
<div className={style.search}>
2123
<AdvanceSearch />
2224
</div>

client/src/layout/DoubleColumnLayout/index.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ interface IProps {
1818
minHeight?: string | number;
1919
likesProps?: LikesProps;
2020
showComment?: boolean;
21+
topNode?: React.ReactNode;
2122
}
2223

2324
export const DoubleColumnLayout: React.FC<IProps> = ({
@@ -29,6 +30,7 @@ export const DoubleColumnLayout: React.FC<IProps> = ({
2930
minHeight = '100vh',
3031
likesProps,
3132
showComment = false,
33+
topNode
3234
}) => {
3335
const $aside = useRef<HTMLElement>();
3436
const [showWidge, toggleWidge] = useToggle(true);
@@ -76,6 +78,7 @@ export const DoubleColumnLayout: React.FC<IProps> = ({
7678
<div className={cls(style.outerWrap)} style={{ minHeight }}>
7779
<div className={cls('container')}>
7880
<SystemNotification />
81+
{topNode}
7982
<div className={style.wrap}>
8083
{(likesProps || showComment) && (
8184
<div

0 commit comments

Comments
 (0)