Merge branch 'develop' into workspaces

# Conflicts:
#	src/layouts/Navigation/NavItem.tsx
This commit is contained in:
Sidney Alcantara
2022-07-20 14:53:15 +10:00

View File

@@ -11,6 +11,8 @@ export default function NavItem(
return (
<MenuItem
role="none"
tabIndex={0}
component={"to" in props ? Link : "href" in props ? "a" : "button"}
selected={"to" in props ? pathname === props.to : false}
{...props}
@@ -21,7 +23,10 @@ export default function NavItem(
textAlign: "left",
color: "text.secondary",
"& .MuiListItemText-primary": { typography: "button" },
"& .MuiListItemText-primary": {
typography: "button",
overflow: "hidden",
},
"& .MuiSvgIcon-root": {
color: "inherit",
opacity: 0.87,