Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added link to root in navigation logo #1567

Merged
merged 1 commit into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ exports[`(1) Default render 1`] = `
</div>
<div
className="editor-tool"
id="editor-tool-emoji-picker-d3fa3a58-8b68-4bfd-81d6-b1c3aa17c356"
id="editor-tool-emoji-picker-2137a8b2-7697-4ab4-91d9-4a5203dcb738"
role="none"
title="Emoji"
>
Expand Down Expand Up @@ -584,7 +584,7 @@ exports[`(2) Cancellable, in progress 1`] = `
</div>
<div
className="editor-tool"
id="editor-tool-emoji-picker-2aa45d8a-ec80-4700-ab24-c5f7d52d3e65"
id="editor-tool-emoji-picker-d85947f8-110b-4884-987c-562e744cdc28"
role="none"
title="Emoji"
>
Expand Down
128 changes: 80 additions & 48 deletions src/common/components/navbar/__snapshots__/index.spec.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ exports[`(1) Default render 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -25,11 +25,15 @@ exports[`(1) Default render 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="text-menu hidden sm:flex items-center justify-center h-full md:mr-2 ml-3"
Expand Down Expand Up @@ -105,10 +109,10 @@ exports[`(1) Default render 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -120,11 +124,15 @@ exports[`(1) Default render 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="flex-1"
Expand Down Expand Up @@ -341,10 +349,10 @@ exports[`(2) Night Theme 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -356,11 +364,15 @@ exports[`(2) Night Theme 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="text-menu hidden sm:flex items-center justify-center h-full md:mr-2 ml-3"
Expand Down Expand Up @@ -436,10 +448,10 @@ exports[`(2) Night Theme 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -451,11 +463,15 @@ exports[`(2) Night Theme 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="flex-1"
Expand Down Expand Up @@ -672,10 +688,10 @@ exports[`(3) With active user 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -687,11 +703,15 @@ exports[`(3) With active user 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="text-menu hidden sm:flex items-center justify-center h-full md:mr-2 ml-3"
Expand Down Expand Up @@ -767,10 +787,10 @@ exports[`(3) With active user 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -782,11 +802,15 @@ exports[`(3) With active user 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="flex-1"
Expand Down Expand Up @@ -1003,10 +1027,10 @@ exports[`(4) With active user && usePrivate = false 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -1018,11 +1042,15 @@ exports[`(4) With active user && usePrivate = false 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="text-menu hidden sm:flex items-center justify-center h-full md:mr-2 ml-3"
Expand Down Expand Up @@ -1098,10 +1126,10 @@ exports[`(4) With active user && usePrivate = false 1`] = `
>
<div
className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative"
onClick={[Function]}
>
<div
className="absolute flex gap-1 flex-col top-3.5 left-0"
onClick={[Function]}
>
<span
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
Expand All @@ -1113,11 +1141,15 @@ exports[`(4) With active user && usePrivate = false 1`] = `
className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700"
/>
</div>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
<a
href="/"
>
<img
alt="Logo"
className="logo relative min-w-[40px] max-w-[40px]"
src="logo-circle.svg"
/>
</a>
</div>
<div
className="flex-1"
Expand Down
16 changes: 9 additions & 7 deletions src/common/components/navbar/navbar-main-sidebar-toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ interface Props {

export function NavbarMainSidebarToggle({ onClick }: Props) {
return (
<div className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative" onClick={onClick}>
<div className="absolute flex gap-1 flex-col top-3.5 left-0">
<div className="h-[40px] min-w-[60px] pl-[30px] cursor-pointer relative">
<div className="absolute flex gap-1 flex-col top-3.5 left-0" onClick={onClick}>
<span className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700" />
<span className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700" />
<span className="w-[20px] h-[2px] bg-gray-400 dark:bg-gray-700" />
</div>
<img
src={require("../../img/logo-circle.svg")}
className="logo relative min-w-[40px] max-w-[40px]"
alt="Logo"
/>
<a href="/">
<img
src={require("../../img/logo-circle.svg")}
className="logo relative min-w-[40px] max-w-[40px]"
alt="Logo"
/>
</a>
</div>
);
}