aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-05-02 16:36:53 -0700
committerAnton Tananaev <anton@traccar.org>2022-05-02 16:36:53 -0700
commit3a8a11c5d101c30cabf727f6a27a892e9bc4c99a (patch)
tree07c7fa60ab8602b44ce4a8e977919be05928f4b8
parent0d6acd661502b5f155f2c79f32fee17b59cb6cdd (diff)
downloadtrackermap-web-3a8a11c5d101c30cabf727f6a27a892e9bc4c99a.tar.gz
trackermap-web-3a8a11c5d101c30cabf727f6a27a892e9bc4c99a.tar.bz2
trackermap-web-3a8a11c5d101c30cabf727f6a27a892e9bc4c99a.zip
Fix various issues
-rw-r--r--modern/src/App.js3
-rw-r--r--modern/src/EditCollectionView.js4
-rw-r--r--modern/src/MainPage.js2
3 files changed, 8 insertions, 1 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index 5455058a..7a4af349 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -58,9 +58,10 @@ const useStyles = makeStyles(() => ({
},
page: {
flexGrow: 1,
+ overflow: 'auto',
},
menu: {
- zIndex: 1,
+ zIndex: 4,
},
}));
diff --git a/modern/src/EditCollectionView.js b/modern/src/EditCollectionView.js
index 5d1d4e74..59a91c60 100644
--- a/modern/src/EditCollectionView.js
+++ b/modern/src/EditCollectionView.js
@@ -9,12 +9,16 @@ import { useSelector } from 'react-redux';
import RemoveDialog from './RemoveDialog';
import { useTranslation } from './LocalizationProvider';
+import dimensions from './theme/dimensions';
const useStyles = makeStyles((theme) => ({
fab: {
position: 'fixed',
bottom: theme.spacing(2),
right: theme.spacing(2),
+ [theme.breakpoints.down('md')]: {
+ bottom: dimensions.bottomBarHeight + theme.spacing(2),
+ },
},
}));
diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js
index 75af9666..247001aa 100644
--- a/modern/src/MainPage.js
+++ b/modern/src/MainPage.js
@@ -36,6 +36,7 @@ const useStyles = makeStyles((theme) => ({
position: 'absolute',
left: 0,
top: 0,
+ zIndex: 3,
margin: theme.spacing(1.5),
width: theme.dimensions.drawerWidthDesktop,
bottom: theme.dimensions.bottomBarHeight,
@@ -102,6 +103,7 @@ const useStyles = makeStyles((theme) => ({
position: 'fixed',
left: theme.spacing(1.5),
bottom: theme.spacing(1.5),
+ zIndex: 4,
width: theme.dimensions.drawerWidthDesktop,
},
}));