diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx index 7e5cfd0d365..e41bc143940 100644 --- a/public/app/core/components/AppChrome/AppChrome.tsx +++ b/public/app/core/components/AppChrome/AppChrome.tsx @@ -36,7 +36,6 @@ export function AppChrome({ children }: Props) { const scopesDashboardsState = useScopesDashboardsState(); const isScopesDashboardsOpen = Boolean(scopesDashboardsState?.isEnabled && scopesDashboardsState?.isPanelOpened); const isSingleTopNav = config.featureToggles.singleTopNav; - useMediaQueryChange({ breakpoint: dockedMenuBreakpoint, onChange: (e) => { @@ -93,7 +92,7 @@ export function AppChrome({ children }: Props) { Skip to main content -
+
{isSingleTopNav ? ( { }, { position: 'fixed', - height: `calc(100% - ${searchBarHidden || isSingleTopNav ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2}px)`, + height: `calc(100% - ${searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2}px)`, zIndex: 2, + }, + isSingleTopNav && { + height: '100%', + top: 0, } ), scopesDashboardsContainer: css({ @@ -202,6 +205,9 @@ const getStyles = (theme: GrafanaTheme2, searchBarHidden: boolean) => { background: theme.colors.background.primary, flexDirection: 'column', }), + topNavMenuDocked: css({ + left: MENU_WIDTH, + }), panes: css({ display: 'flex', flexDirection: 'column', diff --git a/public/app/core/components/AppChrome/AppChromeMenu.tsx b/public/app/core/components/AppChrome/AppChromeMenu.tsx index bf5022ec01c..7926e41aae9 100644 --- a/public/app/core/components/AppChrome/AppChromeMenu.tsx +++ b/public/app/core/components/AppChrome/AppChromeMenu.tsx @@ -77,8 +77,11 @@ export function AppChromeMenu({}: Props) { } const getStyles = (theme: GrafanaTheme2, searchBarHidden?: boolean) => { - const topPosition = - searchBarHidden || config.featureToggles.singleTopNav ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2; + let topPosition = searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2; + + if (config.featureToggles.singleTopNav) { + topPosition = 0; + } return { backdrop: css({