Merge branch 'dev'

This commit is contained in:
Mo Tarbin
2025-07-12 02:43:16 -04:00

View File

@@ -106,12 +106,13 @@ const NavBar = () => {
return ( return (
<nav <nav
className='flex gap-2 p-2' className='mt-2 flex gap-2 p-3'
style={{ style={{
paddingTop: `calc( env(safe-area-inset-top, 0px))`, paddingTop: `calc( env(safe-area-inset-top, 0px))`,
position: 'sticky', position: 'sticky',
zIndex: 10000, zIndex: 10000,
top: 0, top: 0,
minHeight: '45px',
backgroundColor: 'var(--joy-palette-background-surface)', backgroundColor: 'var(--joy-palette-background-surface)',
}} }}
> >
@@ -158,10 +159,10 @@ const NavBar = () => {
sx={{ sx={{
'& .MuiDrawer-content': { '& .MuiDrawer-content': {
position: 'fixed', position: 'fixed',
// top: 'calc(env(safe-area-inset-top, 0px))', top: 'calc(env(safe-area-inset-top, 0px) + 35px)',
left: 0, left: 0,
// height: height:
// 'calc(100vh - env(safe-area-inset-top, 0px) - env(safe-area-inset-bottom, 0px))', 'calc(100vh - env(safe-area-inset-top, 0px) - env(safe-area-inset-bottom, 0px))',
overflow: 'auto', overflow: 'auto',
zIndex: 999, zIndex: 999,
}, },