diff --git a/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png b/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png index e3ca98ef9cd45..427bcb65ce1a7 100644 Binary files a/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png and b/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png differ diff --git a/frontend/__snapshots__/posthog-3000-navigation--light-mode.png b/frontend/__snapshots__/posthog-3000-navigation--light-mode.png index 6c32dda4622f8..c353d85de898f 100644 Binary files a/frontend/__snapshots__/posthog-3000-navigation--light-mode.png and b/frontend/__snapshots__/posthog-3000-navigation--light-mode.png differ diff --git a/frontend/public/icons/android-chrome-192x192.png b/frontend/public/icons/android-chrome-192x192.png index e27d8dbaabb06..9f05e4c652842 100644 Binary files a/frontend/public/icons/android-chrome-192x192.png and b/frontend/public/icons/android-chrome-192x192.png differ diff --git a/frontend/public/icons/android-chrome-512x512.png b/frontend/public/icons/android-chrome-512x512.png index 7d5a25496f787..d38bdf6e3d4b9 100644 Binary files a/frontend/public/icons/android-chrome-512x512.png and b/frontend/public/icons/android-chrome-512x512.png differ diff --git a/frontend/public/icons/apple-touch-icon.png b/frontend/public/icons/apple-touch-icon.png index d90bf6f3cbcc5..ec1d7f3a5a49c 100644 Binary files a/frontend/public/icons/apple-touch-icon.png and b/frontend/public/icons/apple-touch-icon.png differ diff --git a/frontend/public/icons/favicon-16x16.png b/frontend/public/icons/favicon-16x16.png index 0ec1482d77231..68c0f5b7ba759 100644 Binary files a/frontend/public/icons/favicon-16x16.png and b/frontend/public/icons/favicon-16x16.png differ diff --git a/frontend/public/icons/favicon-32x32.png b/frontend/public/icons/favicon-32x32.png index d109bc19a59b6..3c7581a461087 100644 Binary files a/frontend/public/icons/favicon-32x32.png and b/frontend/public/icons/favicon-32x32.png differ diff --git a/frontend/src/layout/navigation-3000/Navigation.scss b/frontend/src/layout/navigation-3000/Navigation.scss index baf6c6bd6bb28..5d59aba88bf10 100644 --- a/frontend/src/layout/navigation-3000/Navigation.scss +++ b/frontend/src/layout/navigation-3000/Navigation.scss @@ -17,10 +17,16 @@ } .Navigation3000__scene { - margin: var(--scene-padding-y) var(--scene-padding-x); - // The below is for positioning of the scene-level spinner + // `relative` is for positioning of the scene-level spinner position: relative; + margin: var(--scene-padding-y) var(--scene-padding-x); min-height: calc(100vh - var(--breadcrumbs-height) - var(--scene-padding-y) * 2); + overflow-x: hidden; + &.Navigation3000__scene--raw { + --scene-padding-y: 0px; + --scene-padding-x: 0px; + display: flex; + } } // Navbar @@ -299,7 +305,7 @@ border-bottom-width: 1px; list-style: none; - &:hover, + &:hover:not([aria-disabled='true']), &[aria-current='page'] { opacity: 1; --sidebar-list-item-background: var(--border-3000); @@ -404,6 +410,9 @@ row-gap: 1px; padding: 0 var(--sidebar-horizontal-padding) 0 var(--sidebar-list-item-inset); color: inherit !important; // Disable link color + .SidebarListItem[aria-disabled='true'] & { + cursor: default; + } } .SidebarListItem__rename { diff --git a/frontend/src/layout/navigation-3000/Navigation.tsx b/frontend/src/layout/navigation-3000/Navigation.tsx index 7f94bdd4971cf..8a975cd20481a 100644 --- a/frontend/src/layout/navigation-3000/Navigation.tsx +++ b/frontend/src/layout/navigation-3000/Navigation.tsx @@ -8,9 +8,12 @@ import { Sidebar } from './components/Sidebar' import './Navigation.scss' import { themeLogic } from './themeLogic' import { navigation3000Logic } from './navigationLogic' +import clsx from 'clsx' +import { sceneLogic } from 'scenes/sceneLogic' export function Navigation({ children }: { children: ReactNode }): JSX.Element { useMountedLogic(themeLogic) + const { sceneConfig } = useValues(sceneLogic) const { activeNavbarItem } = useValues(navigation3000Logic) useEffect(() => { @@ -18,6 +21,10 @@ export function Navigation({ children }: { children: ReactNode }): JSX.Element { document.getElementById('bottom-notice')?.remove() }, []) + if (sceneConfig?.layout === 'plain') { + throw new Error('Navigation should never be rendered for a plain scene') + } + return (