From 6b2e1c618759ea3efd38cc6d9072eaad91851792 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Thu, 31 Mar 2022 13:03:23 +0100 Subject: [PATCH] Navigation: lower expandable navbar z-index (#47125) --- public/app/core/components/NavBar/Next/NavBarMenu.tsx | 2 +- public/app/core/components/NavBar/Next/NavBarNext.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/NavBar/Next/NavBarMenu.tsx b/public/app/core/components/NavBar/Next/NavBarMenu.tsx index 821bfcd00b9..e564373139b 100644 --- a/public/app/core/components/NavBar/Next/NavBarMenu.tsx +++ b/public/app/core/components/NavBar/Next/NavBarMenu.tsx @@ -69,7 +69,7 @@ const getStyles = (theme: GrafanaTheme2) => { paddingTop: theme.spacing(1), marginRight: theme.spacing(1.5), right: 0, - zIndex: 9999, + zIndex: theme.zIndex.sidemenu, top: 0, [theme.breakpoints.up('md')]: { borderRight: `1px solid ${theme.colors.border.weak}`, diff --git a/public/app/core/components/NavBar/Next/NavBarNext.tsx b/public/app/core/components/NavBar/Next/NavBarNext.tsx index 504c6b727ab..7a228cfaba9 100644 --- a/public/app/core/components/NavBar/Next/NavBarNext.tsx +++ b/public/app/core/components/NavBar/Next/NavBarNext.tsx @@ -217,14 +217,14 @@ const getStyles = (theme: GrafanaTheme2) => ({ display: 'grid', gridAutoFlow: 'column', height: '100%', - zIndex: 9999, + zIndex: theme.zIndex.sidemenu, }), menuToggle: css({ position: 'absolute', marginRight: 0, top: '43px', right: '0px', - zIndex: 9999, + zIndex: theme.zIndex.sidemenu, transform: `translateX(calc(${theme.spacing(7)} + 50%))`, background: 'gray', borderRadius: '50%',