From 144efd25b8f014c05be9566d1bea0b0b54053bdc Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 28 Mar 2023 16:55:09 +0100
Subject: [PATCH] [v9.4.x] MegaMenu: Fixes mega menu showing scroll indicator
 when it shouldn't (#65465)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MegaMenu: Fixes mega menu showing scroll indicator when it shouldn't (#65452)

* MegaMenu: Fixes mega menu showing scroll indicator when it shouldn't

* fixing css

(cherry picked from commit 273e05a9a26eb0708ba31e06c78ab6966f71b993)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 public/app/core/components/MegaMenu/NavBarMenu.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/app/core/components/MegaMenu/NavBarMenu.tsx b/public/app/core/components/MegaMenu/NavBarMenu.tsx
index 79459828fec..7e34dc45069 100644
--- a/public/app/core/components/MegaMenu/NavBarMenu.tsx
+++ b/public/app/core/components/MegaMenu/NavBarMenu.tsx
@@ -131,6 +131,8 @@ const getStyles = (theme: GrafanaTheme2, searchBarHidden?: boolean) => {
       top: searchBarHidden ? 0 : TOP_BAR_LEVEL_HEIGHT,
       backgroundColor: theme.colors.background.primary,
       boxSizing: 'content-box',
+      flex: '1 1 0',
+
       [theme.breakpoints.up('md')]: {
         borderRight: `1px solid ${theme.colors.border.weak}`,
         right: 'unset',
@@ -140,12 +142,15 @@ const getStyles = (theme: GrafanaTheme2, searchBarHidden?: boolean) => {
     content: css({
       display: 'flex',
       flexDirection: 'column',
-      overflow: 'auto',
+      flexGrow: 1,
+      minHeight: 0,
     }),
     mobileHeader: css({
       display: 'flex',
       justifyContent: 'space-between',
-      padding: theme.spacing(1, 2),
+      padding: theme.spacing(1, 1, 1, 2),
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
+
       [theme.breakpoints.up('md')]: {
         display: 'none',
       },