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.

Sign up for GitHub

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

Feature/sidebar shadow #29

Merged
merged 9 commits into from
Sep 27, 2023
Merged

Feature/sidebar shadow #29

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ec0ee1c
feat: add sidebar shadow
timothyrusso Sep 23, 2023
e43a778
feat: fix prettier errors
timothyrusso Sep 23, 2023
45c701d
feat: use constants to define the colors
timothyrusso Sep 23, 2023
59be2db
Merge remote-tracking branch 'origin' into feature/sidebar-shadow
timothyrusso Sep 24, 2023
8a41b29
feat: fix shadow
timothyrusso Sep 26, 2023
d37e88a
feat: prettier fix
timothyrusso Sep 26, 2023
b5491a5
Merge branch 'dev' into feature/sidebar-shadow
timothyrusso Sep 27, 2023
267af95
feat: fix opacity of the shadows color
timothyrusso Sep 27, 2023
7d0f4bd
Merge branch 'feature/sidebar-shadow' of https://github.com/chingu-x/…
timothyrusso Sep 27, 2023
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
10 changes: 9 additions & 1 deletion src/app/globals.css
View file
Open in desktop
Dan-Y-Ko marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,12 @@

::-webkit-scrollbar-thumb:hover {
background: #C0C0C0;
}
}

.sidebar-shadow-light {
box-shadow: 8px 0 10px -5px var(--neutral-focus);
}

.sidebar-shadow-dark {
box-shadow: 8px 0 10px -5px var(--neutral-focus);
}
8 changes: 7 additions & 1 deletion src/components/sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
BookmarkSquareIcon,
RocketLaunchIcon,
} from "@heroicons/react/24/solid";
import { useTheme } from "next-themes";
import PageButton from "./PageButton";
import VoyagePageButton from "./VoyagePageButton";
import ExpandButton from "./ExpandButton";
Expand Down Expand Up @@ -101,6 +102,7 @@ const isVoyageStarted: boolean = true;

export default function Sidebar() {
const currentPath = usePathname();
const { theme } = useTheme();

const [isOpenSidebar, setIsOpenSidebar] = useState<boolean>(true);
const [selectedButton, setSelectedButton] = useState<string>(currentPath);
Expand All @@ -118,11 +120,15 @@ export default function Sidebar() {
}
};

const isDark = theme === "dark";

return (
<aside
className={`overflow-y-auto ${
isOpenSidebar ? "w-[18.438rem]" : "w-[5.813rem]"
} text-center bg-base-200 flex flex-col justify-between border-r border-neutral-content`}
} text-center bg-base-200 flex flex-col justify-between border-r border-neutral-content ${
isDark ? "sidebar-shadow-dark" : "sidebar-shadow-light"
}`}
>
<ul
className={`flex flex-col ${
Expand Down
10 changes: 8 additions & 2 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/** @type {import('tailwindcss').Config} */

const NEUTRAL_FOCUS_LIGHT = "#4C515B";
const NEUTRAL_FOCUS_DARK = "#A0A5AE";

module.exports = {
content: [
"./src/components/**/*.{js,ts,jsx,tsx,mdx}",
Expand All @@ -19,7 +23,7 @@ module.exports = {
"accent-focus": "#98DDBD",
"accent-content": "#D7EDE3",
neutral: "#6B7280",
"neutral-focus": "#4C515B",
"neutral-focus": NEUTRAL_FOCUS_LIGHT,
"neutral-content": "#9CA1AA",
info: "#8FC4E5",
"info-content": "#DCEDF7",
Expand All @@ -33,6 +37,7 @@ module.exports = {
"base-200": "#F5F5F5",
"base-300": "#16171A",
"base-content": "#EEEFF0",
"--neutral-focus": NEUTRAL_FOCUS_LIGHT,
},
},
{
Expand All @@ -47,7 +52,7 @@ module.exports = {
"accent-focus": "#6EE7B7",
"accent-content": "#6B9984",
neutral: "#6B7280",
"neutral-focus": "#A0A5AE",
"neutral-focus": NEUTRAL_FOCUS_DARK,
"neutral-content": "#3B3F46",
info: "#84B5D4",
"info-content": "#668BA3",
Expand All @@ -61,6 +66,7 @@ module.exports = {
"base-200": "#16171A",
"base-300": "#F5F5F5",
"base-content": "#2D3036",
"--neutral-focus": NEUTRAL_FOCUS_DARK,
},
},
],
Expand Down
Loading