From 98f2dd952e35e41045c7c9f925e229000bbe4797 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 8 May 2022 18:11:23 -0700 Subject: Migrate reports to page layout --- modern/src/common/components/BottomMenu.js | 2 +- modern/src/common/components/PageLayout.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'modern/src/common/components') 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', }, })); -- cgit v1.2.3