Skip to content

Commit d19163b

Browse files
committed
chore(site): update site
1 parent bca330d commit d19163b

5 files changed

Lines changed: 30 additions & 22 deletions

File tree

packages/site/src/app/components/layout/Layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function AppLayout() {
1616
return (
1717
<>
1818
<AppHeader aMenuOpen={menuOpen} onMenuOpenChange={setMenuOpen} />
19-
{location.pathname !== '/' && <AppSidebar aMenuOpen={menuOpen} onMenuOpenChange={setMenuOpen} />}
19+
<AppSidebar aMenuOpen={menuOpen} onMenuOpenChange={setMenuOpen} />
2020
</>
2121
);
2222
}

packages/site/src/app/components/layout/header/Header.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@
111111
inset: 0;
112112
content: '';
113113
}
114-
115-
&.disabled {
116-
pointer-events: none;
117-
}
118114
}
119115
}
120116

packages/site/src/app/components/layout/header/Header.tsx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,12 @@ export function AppHeader(props: { aMenuOpen: boolean; onMenuOpenChange: (open:
6262
dList={[
6363
{
6464
id: 'docs',
65-
title: (
66-
<Link className={activeId === 'docs' ? 'disabled' : undefined} to="/docs">
67-
{t('Docs')}
68-
</Link>
69-
),
65+
title: <Link to="/docs">{t('Docs')}</Link>,
7066
type: 'item',
7167
},
7268
{
7369
id: 'components',
74-
title: (
75-
<Link className={activeId === 'components' ? 'disabled' : undefined} to="/components">
76-
{t('Components')}
77-
</Link>
78-
),
70+
title: <Link to="/components">{t('Components')}</Link>,
7971
type: 'item',
8072
},
8173
]}

packages/site/src/app/components/layout/sidebar/Sidebar.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@
5454
}
5555
}
5656

57+
.app-sidebar__header-link {
58+
display: flex;
59+
align-items: center;
60+
font: inherit;
61+
color: inherit;
62+
text-decoration: none;
63+
}
64+
5765
.app-sidebar__link-button {
5866
display: flex;
5967
gap: 0 4px;
@@ -67,4 +75,8 @@
6775
border: 1px solid var(--d-color-border);
6876
/* stylelint-disable-next-line declaration-property-value-allowed-list */
6977
border-radius: 10px;
78+
79+
& + & {
80+
margin-top: 12px;
81+
}
7082
}

packages/site/src/app/components/layout/sidebar/Sidebar.tsx

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,33 @@ export function AppSidebar(props: { aMenuOpen: boolean; onMenuOpenChange: (open:
7474
const mediaMatch = useMediaMatch();
7575

7676
return mediaMatch.includes('md') ? (
77-
<div className="app-sidebar">{menuNode}</div>
77+
page ? (
78+
<div className="app-sidebar">{menuNode}</div>
79+
) : null
7880
) : (
7981
<DDrawer
8082
className="app-sidebar__drawer"
8183
dVisible={aMenuOpen}
8284
dHeader={
8385
<DDrawer.Header>
84-
<img className="app-sidebar__logo" src="/assets/logo.svg" alt="Logo" width="24" height="24" />
85-
<span className="app-sidebar__title">{page}</span>
86+
<Link className="app-sidebar__header-link" to="/">
87+
<img className="app-sidebar__logo" src="/assets/logo.svg" alt="Logo" width="24" height="24" />
88+
<span className="app-sidebar__title">DevUI</span>
89+
</Link>
8690
</DDrawer.Header>
8791
}
8892
dWidth={280}
8993
onVisibleChange={onMenuOpenChange}
9094
>
91-
<Link className="app-sidebar__link-button" to={page === 'Docs' ? '/components/Button' : '/docs/Overview'}>
92-
{page === 'Docs' ? <AppstoreOutlined /> : <BookOutlined />}
93-
{t(page === 'Docs' ? 'Components' : 'Docs')}
95+
<Link className="app-sidebar__link-button" to="/docs">
96+
<BookOutlined />
97+
{t('Docs')}
9498
</Link>
95-
{menuNode}
99+
<Link className="app-sidebar__link-button" to="/components">
100+
<AppstoreOutlined />
101+
{t('Components')}
102+
</Link>
103+
{page && menuNode}
96104
</DDrawer>
97105
);
98106
}

0 commit comments

Comments
 (0)