From 083605c17f47d6eea81990981e28192faa8feb1c Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 15 Jan 2024 10:12:41 +0000
Subject: [PATCH] DockedMenu: only set the menu state to be `docked` if the
 window size is big enough (#80379)

* only set the menu docked in state if the window size is big enough

* adjust sizes

* remove top border on dockedMegaMenu

* another css tweak

* use xxl consistently

* CONSISTENTLY

* ok maybe not
---
 public/app/core/components/AppChrome/AppChrome.tsx        | 1 -
 public/app/core/components/AppChrome/AppChromeMenu.tsx    | 2 +-
 public/app/core/components/AppChrome/AppChromeService.tsx | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index 978d1db1678..b231e7d7191 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -131,7 +131,6 @@ const getStyles = (theme: GrafanaTheme2) => {
     dockedMegaMenu: css({
       background: theme.colors.background.primary,
       borderRight: `1px solid ${theme.colors.border.weak}`,
-      borderTop: `1px solid ${theme.colors.border.weak}`,
       display: 'none',
       zIndex: theme.zIndex.navbarFixed,
 
diff --git a/public/app/core/components/AppChrome/AppChromeMenu.tsx b/public/app/core/components/AppChrome/AppChromeMenu.tsx
index 96ee20c3aca..5efec4390df 100644
--- a/public/app/core/components/AppChrome/AppChromeMenu.tsx
+++ b/public/app/core/components/AppChrome/AppChromeMenu.tsx
@@ -76,7 +76,7 @@ export function AppChromeMenu({}: Props) {
 }
 
 const getStyles = (theme: GrafanaTheme2, searchBarHidden?: boolean) => {
-  const topPosition = (searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2) + 1;
+  const topPosition = searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2;
 
   return {
     backdrop: css({
diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
index d8d57782084..3cf837cc893 100644
--- a/public/app/core/components/AppChrome/AppChromeService.tsx
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -33,6 +33,7 @@ export class AppChromeService {
 
   private megaMenuDocked = Boolean(
     config.featureToggles.dockedMegaMenu &&
+      window.innerWidth >= config.theme2.breakpoints.values.xl &&
       store.getBool(
         DOCKED_LOCAL_STORAGE_KEY,
         Boolean(config.featureToggles.dockedMegaMenu && window.innerWidth >= config.theme2.breakpoints.values.xxl)