Skip to content

Commit

Permalink
Merge pull request #189 from AOSSIE-Org/revert-181-sidebarUpdate
Browse files Browse the repository at this point in the history
Revert "Sidebar UI Update"
  • Loading branch information
Pranav0-0Aggarwal authored Jan 1, 2025
2 parents 502fd2a + 8725ca6 commit 163ef79
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions frontend/src/components/Navigation/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,22 @@ function Sidebar() {
const baseClasses =
'group flex flex-col items-center gap-2 p-3 rounded-xl transition-all duration-200';

const activeClasses = `bg-white/95 dark:bg-white/10
const activeClasses = `
bg-white/95 dark:bg-white/10
text-gray-900 dark:text-gray-100
shadow-md dark:shadow-gray-900/30
backdrop-blur-md backdrop-saturate-150
border border-gray-200 dark:border-gray-700`;
border border-gray-200 dark:border-gray-700
`;

const inactiveClasses = `bg-transparent hover:bg-gray-50 dark:hover:bg-white/10
const inactiveClasses = `
bg-transparent hover:bg-gray-50 dark:hover:bg-white/10
text-gray-700 dark:text-gray-400
hover:text-gray-900 dark:hover:text-gray-100
border border-transparent
hover:border-gray-200 dark:hover:border-gray-700
hover:shadow-sm dark:hover:shadow-gray-900/20`;
hover:shadow-sm dark:hover:shadow-gray-900/20
`;

return `${baseClasses} ${isActive(path) ? activeClasses : inactiveClasses}`;
};
Expand All @@ -30,7 +34,7 @@ function Sidebar() {
'h-5 w-5 transition-transform duration-200 ease-out group-hover:scale-110';

return (
<div className="sidebar h-[90vh] sm:h-[90%] text-theme-dark dark:text-theme-light bg-theme-light m-2 sm:m-4 flex flex-col justify-between rounded-lg sm:rounded-2xl border border-gray-300 p-2 sm:p-4 backdrop-blur-md backdrop-saturate-150 dark:border-white/10 dark:bg-white/5 w-full sm:w-36 overflow-y-auto scrollbar-hide">
<div className="sidebar text-theme-dark dark:text-theme-light bg-theme-light m-2 sm:m-4 flex flex-col justify-between rounded-lg sm:rounded-2xl border border-gray-300 p-2 sm:p-4 backdrop-blur-md backdrop-saturate-150 dark:border-white/10 dark:bg-white/5 w-full sm:w-36">
<div className="mt-2 flex flex-col gap-4">
<Link to="/home" className={linkClasses('/home')}>
<Home
Expand Down Expand Up @@ -76,4 +80,4 @@ function Sidebar() {
);
}

export default Sidebar;
export default Sidebar;

0 comments on commit 163ef79

Please sign in to comment.