Skip to content

Commit 7a09992

Browse files
style: header height, button icon size, nav-user, some cursor-pointer
1 parent 8efd2e3 commit 7a09992

File tree

8 files changed

+27
-24
lines changed

8 files changed

+27
-24
lines changed

src/assets/svg/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

src/components/header.tsx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1-
import Image from "next/image";
21
import { GlobeIcon } from "lucide-react";
32
import Link from "next/link";
3+
import Image from "next/image";
4+
import logo from "@/assets/svg/logo.svg";
45
import { ThemeButton } from "@/components/theme-button";
56
import { Button } from "./ui/button";
67

7-
export const HEADER_HEIGHT = "4.5rem";
8+
export const HEADER_HEIGHT = "3.3rem";
89

910
export async function Header() {
1011
return (
11-
<header className="sticky top-0 isolate z-20 flex h-(--header-height) w-full shrink-0 items-center justify-center border-b bg-card">
12+
<header className="bg-card sticky top-0 isolate z-20 flex h-(--header-height) w-full shrink-0 items-center justify-center">
1213
<div className="container mx-auto flex items-center justify-center space-x-6 px-4">
13-
<Link href="/">
14+
<Link href="/dashboard">
1415
<div className="flex items-center space-x-4">
1516
<Image
16-
src="https://raw.githubusercontent.com/PoliNetworkOrg/Logo/refs/heads/master/Logo.svg"
17+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
18+
src={logo}
1719
alt="PoliNetwork Logo"
18-
width={40}
19-
height={40}
20+
height={32}
21+
width={32}
2022
/>
21-
<h1 className="hidden text-2xl font-bold text-accent-foreground md:block">
23+
<h1 className="text-accent-foreground hidden text-lg font-bold md:block">
2224
PoliNetwork Admin
2325
</h1>
2426
</div>
2527
</Link>
2628
<nav className="flex grow items-center justify-end space-x-8"></nav>
27-
<nav className="flex items-center space-x-6">
29+
<nav className="flex items-center space-x-3">
2830
<ThemeButton />
2931
<Button
3032
disabled
31-
className="hover:text-accent-foreground [&_svg]:size-6"
3233
variant="ghost"
3334
size="icon"
3435
>
35-
<GlobeIcon />
36+
<GlobeIcon size={20} />
3637
</Button>
3738
</nav>
3839
</div>

src/components/sidebar/admin-sidebar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,13 @@ export function AdminSidebar({
9191
>
9292
<SidebarHeader>
9393
<div className="flex items-center justify-start gap-2">
94-
<SidebarTrigger className="h-8 w-8" />
94+
<SidebarTrigger />
9595
</div>
9696
</SidebarHeader>
9797
<SidebarContent>
9898
<NavMain items={data.navMain} />
9999
</SidebarContent>
100100
<SidebarFooter>{user && <NavUser user={user} />}</SidebarFooter>{" "}
101-
<SidebarRail />
102101
</Sidebar>
103102
);
104103
}

src/components/sidebar/nav-user.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function NavUser({
3838
<DropdownMenuTrigger asChild>
3939
<SidebarMenuButton
4040
size="lg"
41-
className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
41+
className="cursor-pointer data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
4242
>
4343
<Avatar className="h-8 w-8 rounded-lg">
4444
<AvatarImage src={user.image ?? ""} alt={user.name} />

src/components/theme-button.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
"use client";
22
import { MoonIcon, SunIcon } from "lucide-react";
33
import { useTheme } from "next-themes";
4+
import { Button } from "./ui/button";
45

56
export function ThemeButton() {
67
const { resolvedTheme, setTheme } = useTheme();
78
return (
8-
<button
9+
<Button
10+
size="icon"
11+
variant="ghost"
912
onClick={() => setTheme(resolvedTheme === "light" ? "dark" : "light")}
10-
className="text-foreground hover:text-accent-foreground"
1113
>
12-
<SunIcon className="block h-6 w-6 dark:hidden" />
13-
<MoonIcon className="hidden h-6 w-6 dark:block" />
14-
</button>
14+
<SunIcon className="block dark:hidden" size={20} />
15+
<MoonIcon className="hidden dark:block" size={20} />
16+
</Button>
1517
);
1618
}

src/components/ui/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
55
import { cn } from "@/lib/utils";
66

77
const buttonVariants = cva(
8-
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-30 [&_svg]:pointer-events-none [&_svg]:shrink-0",
8+
"inline-flex cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-30 [&_svg]:pointer-events-none [&_svg]:shrink-0",
99
{
1010
variants: {
1111
variant: {

src/components/ui/dropdown-menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const DropdownMenuItem = React.forwardRef<
8484
<DropdownMenuPrimitive.Item
8585
ref={ref}
8686
className={cn(
87-
"relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
87+
"relative flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
8888
inset && "pl-8",
8989
className,
9090
)}

src/components/ui/sidebar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,14 +279,14 @@ const SidebarTrigger = React.forwardRef<
279279
data-sidebar="trigger"
280280
variant="ghost"
281281
size="icon"
282-
className={cn("h-7 w-7", className)}
282+
className={className}
283283
onClick={(event) => {
284284
onClick?.(event);
285285
toggleSidebar();
286286
}}
287287
{...props}
288288
>
289-
<PanelLeft />
289+
<PanelLeft size={20} />
290290
<span className="sr-only">Toggle Sidebar</span>
291291
</Button>
292292
);
@@ -332,7 +332,7 @@ const SidebarInset = React.forwardRef<
332332
className={cn(
333333
"relative flex flex-1 flex-col bg-background md-2 overflow-y-auto",
334334
"scrollbar scrollbar-w-2 scrollbar-track-card scrollbar-thumb-white/20",
335-
"md:peer-data-[variant=inset]:mt-2 md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-tl-xl md:peer-data-[variant=inset]:shadow-sm",
335+
"md:peer-data-[variant=inset]:rounded-tl-xl md:peer-data-[variant=inset]:shadow-sm",
336336
className,
337337
)}
338338
{...props}

0 commit comments

Comments
 (0)