diff options
| author | Anton Tananaev <anton@traccar.org> | 2022-05-08 18:11:23 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2022-05-08 18:11:23 -0700 |
| commit | 98f2dd952e35e41045c7c9f925e229000bbe4797 (patch) | |
| tree | 8f05333308f5542991dfb6a019ff3b4a2959899d /modern/src/common | |
| parent | bf95e1bb48379bc1c3482d3f201017250991a832 (diff) | |
| download | trackermap-web-98f2dd952e35e41045c7c9f925e229000bbe4797.tar.gz trackermap-web-98f2dd952e35e41045c7c9f925e229000bbe4797.tar.bz2 trackermap-web-98f2dd952e35e41045c7c9f925e229000bbe4797.zip | |
Migrate reports to page layout
Diffstat (limited to 'modern/src/common')
| -rw-r--r-- | modern/src/common/components/BottomMenu.js | 2 | ||||
| -rw-r--r-- | modern/src/common/components/PageLayout.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modern/src/common/components/BottomMenu.js b/modern/src/common/components/BottomMenu.js index 048cb0d7..30960396 100644 --- a/modern/src/common/components/BottomMenu.js +++ b/modern/src/common/components/BottomMenu.js @@ -27,7 +27,7 @@ const BottomMenu = () => { const [anchorEl, setAnchorEl] = useState(null); const currentSelection = () => { - if (location.pathname.startsWith('/settings/user')) { + if (location.pathname === `/settings/user/${userId}`) { return 3; } if (location.pathname.startsWith('/settings')) { return 2; diff --git a/modern/src/common/components/PageLayout.js b/modern/src/common/components/PageLayout.js index e37ae4dc..a1f117c4 100644 --- a/modern/src/common/components/PageLayout.js +++ b/modern/src/common/components/PageLayout.js @@ -28,6 +28,8 @@ const useStyles = makeStyles((theme) => ({ flexGrow: 1, alignItems: 'stretch', overflow: 'auto', + display: 'flex', + flexDirection: 'column', }, })); |