Merge branch 'staging_environment' into field_dashboard
This commit is contained in:
commit
7a8a010a39
28 changed files with 212 additions and 128 deletions
|
|
@ -70,19 +70,26 @@ const useStyles = makeStyles((theme: Theme) => ({
|
|||
})
|
||||
},
|
||||
sideMenuOnClosed: {
|
||||
transition: theme.transitions.create(["width", "z-index", "opacity"], {
|
||||
transition: theme.transitions.create(["width"], {
|
||||
easing: theme.transitions.easing.sharp,
|
||||
duration: theme.transitions.duration.leavingScreen
|
||||
}),
|
||||
overflowX: "hidden",
|
||||
width: theme.spacing(7),
|
||||
zIndex: theme.zIndex.drawer,
|
||||
opacity: 0,
|
||||
// overflowX: "hidden",
|
||||
width: theme.spacing(0),
|
||||
// zIndex: theme.zIndex.drawer,
|
||||
// opacity: 0,
|
||||
[theme.breakpoints.up("md")]: {
|
||||
width: theme.spacing(9),
|
||||
width: theme.spacing(9.25),
|
||||
opacity: 1
|
||||
}
|
||||
},
|
||||
sideMenuOnClosedMobile: {
|
||||
transition: theme.transitions.create(["width"], {
|
||||
easing: theme.transitions.easing.sharp,
|
||||
duration: theme.transitions.duration.leavingScreen
|
||||
}),
|
||||
width: theme.spacing(0),
|
||||
},
|
||||
list: {
|
||||
paddingTop: 0
|
||||
},
|
||||
|
|
@ -480,7 +487,7 @@ export default function SideNavigator(props: Props) {
|
|||
</Tooltip>
|
||||
}
|
||||
{user.hasFeature("libra-cart") &&
|
||||
<Tooltip title="LibraCart" placement="right">
|
||||
<Tooltip title="Libra Cart" placement="right">
|
||||
<ListItemButton
|
||||
id="tour-libraCart"
|
||||
onClick={() => goTo("/libracart")}
|
||||
|
|
@ -489,7 +496,7 @@ export default function SideNavigator(props: Props) {
|
|||
<ListItemIcon>
|
||||
<LibraCartIcon />
|
||||
</ListItemIcon>
|
||||
{open && <ListItemText primary="LibraCart" />}
|
||||
{open && <ListItemText primary="Libra Cart" />}
|
||||
</ListItemButton>
|
||||
</Tooltip>
|
||||
}
|
||||
|
|
@ -504,7 +511,7 @@ export default function SideNavigator(props: Props) {
|
|||
classes={{
|
||||
paper: classNames(
|
||||
classes.sideMenu,
|
||||
open ? classes.sideMenuOpened : classes.sideMenuOnClosed
|
||||
open ? classes.sideMenuOpened : (isMobile ? classes.sideMenuOnClosedMobile : classes.sideMenuOnClosed)
|
||||
)
|
||||
}}
|
||||
anchor="left"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue