From 79a5b024e1cf3ab30f7567446e65d07dc9db89a1 Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Tue, 28 Oct 2025 09:34:33 -0400
Subject: [PATCH] MegaMenu: Spacing alignment tweaks (#113055)

---
 .../core/components/AppChrome/MegaMenu/MegaMenuItem.tsx  | 6 +++---
 .../OrganizationSwitcher/OrganizationSwitcher.tsx        | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx
index a3e56e4a3a8..0677a902e1f 100644
--- a/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx
+++ b/public/app/core/components/AppChrome/MegaMenu/MegaMenuItem.tsx
@@ -175,7 +175,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
   menuItem: css({
     display: 'flex',
     alignItems: 'center',
-    gap: theme.spacing(0.5),
+    gap: theme.spacing(1.5),
     height: theme.spacing(4),
     paddingLeft: theme.spacing(0.5),
     position: 'relative',
@@ -215,13 +215,13 @@ const getStyles = (theme: GrafanaTheme2) => ({
   labelWrapper: css({
     display: 'flex',
     alignItems: 'center',
-    gap: theme.spacing(2),
+    gap: theme.spacing(0.75),
     minWidth: 0,
     paddingLeft: theme.spacing(1),
   }),
   labelWrapperWithIcon: css({
     paddingLeft: theme.spacing(0.5),
-    gap: theme.spacing(0.5),
+    gap: theme.spacing(0.75),
   }),
   hasActiveChild: css({
     color: theme.colors.text.primary,
diff --git a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
index 67ad47cded0..960b5f4085f 100644
--- a/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
+++ b/public/app/core/components/AppChrome/OrganizationSwitcher/OrganizationSwitcher.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 
 import { SelectableValue } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
-import { Space, Text } from '@grafana/ui';
+import { Text } from '@grafana/ui';
 import { contextSrv } from 'app/core/services/context_srv';
 import { getUserOrganizations, setUserOrganization } from 'app/features/org/state/actions';
 import { useDispatch, useSelector } from 'app/types/store';
@@ -33,12 +33,7 @@ export function OrganizationSwitcher() {
   }, [dispatch]);
 
   if (orgs?.length <= 1) {
-    return (
-      <>
-        <Space h={1} />
-        <Text truncate>{Branding.AppTitle}</Text>
-      </>
-    );
+    return <Text truncate>{Branding.AppTitle}</Text>;
   }
 
   return <OrganizationSelect orgs={orgs} onSelectChange={onSelectChange} />;