Skip to content

Commit 707d0e9

Browse files
fix(site): fixsidebar styles (#10891)
1 parent f441ad6 commit 707d0e9

File tree

3 files changed

+53
-5
lines changed

3 files changed

+53
-5
lines changed

site/src/components/SettingsLayout/Sidebar.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export const Sidebar: React.FC<{ user: User }> = ({ user }) => {
2626
title={user.username}
2727
subtitle={user.email}
2828
/>
29-
;
3029
<SidebarNavItem href="account" icon={AccountIcon}>
3130
Account
3231
</SidebarNavItem>
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import { Sidebar, SidebarHeader, SidebarNavItem } from "./Sidebar";
2+
import type { Meta, StoryObj } from "@storybook/react";
3+
import { UserAvatar } from "components/UserAvatar/UserAvatar";
4+
import VpnKeyOutlined from "@mui/icons-material/VpnKeyOutlined";
5+
import FingerprintOutlinedIcon from "@mui/icons-material/FingerprintOutlined";
6+
import AccountIcon from "@mui/icons-material/Person";
7+
import ScheduleIcon from "@mui/icons-material/EditCalendarOutlined";
8+
import SecurityIcon from "@mui/icons-material/LockOutlined";
9+
10+
const meta: Meta<typeof Sidebar> = {
11+
title: "components/Sidebar",
12+
component: Sidebar,
13+
};
14+
15+
export default meta;
16+
type Story = StoryObj<typeof Sidebar>;
17+
18+
export const Default: Story = {
19+
args: {
20+
children: (
21+
<Sidebar>
22+
<SidebarHeader
23+
avatar={<UserAvatar username="Jon" />}
24+
title="Jon"
25+
subtitle="jon@coder.com"
26+
/>
27+
<SidebarNavItem href="account" icon={AccountIcon}>
28+
Account
29+
</SidebarNavItem>
30+
<SidebarNavItem href="schedule" icon={ScheduleIcon}>
31+
Schedule
32+
</SidebarNavItem>
33+
<SidebarNavItem href="security" icon={SecurityIcon}>
34+
Security
35+
</SidebarNavItem>
36+
<SidebarNavItem href="ssh-keys" icon={FingerprintOutlinedIcon}>
37+
SSH Keys
38+
</SidebarNavItem>
39+
<SidebarNavItem href="tokens" icon={VpnKeyOutlined}>
40+
Tokens
41+
</SidebarNavItem>
42+
</Sidebar>
43+
),
44+
},
45+
};

site/src/components/Sidebar/Sidebar.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ export const SidebarHeader: FC<SidebarHeaderProps> = ({
2929
return (
3030
<Stack direction="row" alignItems="center" css={styles.info}>
3131
{avatar}
32-
<div css={styles.data}>
32+
<div
33+
css={{
34+
overflow: "hidden",
35+
display: "flex",
36+
flexDirection: "column",
37+
}}
38+
>
3339
{linkTo ? (
3440
<Link css={styles.title} to={linkTo}>
3541
{title}
@@ -80,9 +86,7 @@ const styles = {
8086
...(theme.typography.body2 as CSSObject),
8187
marginBottom: 16,
8288
}),
83-
data: {
84-
overflow: "hidden",
85-
},
89+
8690
title: (theme) => ({
8791
fontWeight: 600,
8892
overflow: "hidden",

0 commit comments

Comments
 (0)