Fix colors in the navbar
This commit is contained in:
parent
e2d4f3b56b
commit
babf1c49af
1 changed files with 8 additions and 4 deletions
|
|
@ -215,8 +215,9 @@ export function UserMenuPopover({ isCollapsed }: { isCollapsed: boolean }) {
|
|||
}
|
||||
|
||||
export const SideNavigation = ({ isMobileMenuOpen }: { isMobileMenuOpen: boolean }) => {
|
||||
const [isCollapsed, setIsCollapsed] = useState(false);
|
||||
const isCollapsable = !isMobileMenuOpen;
|
||||
const [isCollapsed, setIsCollapsed] = useState(!isCollapsable);
|
||||
|
||||
return (
|
||||
<nav
|
||||
aria-label="Main navigation"
|
||||
|
|
@ -362,10 +363,11 @@ export function MainNavigation({ isCollapsed }: { isCollapsed: boolean }) {
|
|||
}
|
||||
|
||||
const { path, label, icon, isDisabled } = item;
|
||||
const isActive = location.pathname === path;
|
||||
|
||||
return !isDisabled ? (
|
||||
<li key={label}>
|
||||
<NavLink isActive={location.pathname === path}>
|
||||
<NavLink isActive={isActive}>
|
||||
<RouterLink
|
||||
to={path}
|
||||
className="w-full"
|
||||
|
|
@ -375,7 +377,8 @@ export function MainNavigation({ isCollapsed }: { isCollapsed: boolean }) {
|
|||
{icon}
|
||||
<TypographyLarge
|
||||
className={twMerge(
|
||||
"text-sm transition-all duration-300 font-normal text-gray-300/90",
|
||||
"text-sm transition-all duration-300 font-normal",
|
||||
isActive ? "text-white" : "text-gray-300/90",
|
||||
isCollapsed ? "opacity-0 w-0 hidden" : "opacity-100"
|
||||
)}
|
||||
>
|
||||
|
|
@ -423,7 +426,8 @@ export function MainNavigation({ isCollapsed }: { isCollapsed: boolean }) {
|
|||
<SendIcon className="w-5 h-5" aria-hidden="true" />
|
||||
<TypographyLarge
|
||||
className={twMerge(
|
||||
"text-sm transition-all duration-300 font-normal text-gray-300/90",
|
||||
"text-sm transition-all duration-300 font-normal",
|
||||
location.pathname === "/feedback" ? "text-white" : "text-gray-300/90",
|
||||
isCollapsed ? "opacity-0 w-0 hidden" : "opacity-100"
|
||||
)}
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in a new issue