diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml index 70db671975d6a..845c4a60a4697 100644 --- a/.github/workflows/ci-backend.yml +++ b/.github/workflows/ci-backend.yml @@ -125,7 +125,7 @@ jobs: - name: Check for syntax errors, import sort, and code style violations run: | - ruff check . + ruff check . - name: Check formatting run: | diff --git a/frontend/__snapshots__/filters-taxonomic-filter--actions.png b/frontend/__snapshots__/filters-taxonomic-filter--actions.png index fff1fa4ce40b4..7fcb42b198c79 100644 Binary files a/frontend/__snapshots__/filters-taxonomic-filter--actions.png and b/frontend/__snapshots__/filters-taxonomic-filter--actions.png differ diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png index bb9c7006f9140..40cdc69204a29 100644 Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png differ diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png index 45670d82c4131..6839fe2847565 100644 Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png differ diff --git a/frontend/src/layout/navigation-3000/Navigation.scss b/frontend/src/layout/navigation-3000/Navigation.scss index 68adabc64b7c6..33c6f47b9bc96 100644 --- a/frontend/src/layout/navigation-3000/Navigation.scss +++ b/frontend/src/layout/navigation-3000/Navigation.scss @@ -33,6 +33,7 @@ // Navbar .Navbar3000 { + position: relative; flex: 0 0 3rem; border-right: 1px solid transparent; // This is just for sizing, the visible border is on the content box-sizing: content-box; @@ -63,12 +64,35 @@ left: 0; display: flex; flex-direction: column; - justify-content: space-between; - height: 100vh; - padding: 0 0.375rem; border-right-width: 1px; - background: var(--accent-3000); - overflow-y: auto; + + .Navbar3000__content { + flex: 1; + display: flex; + flex-direction: column; + justify-content: space-between; + padding: 0 0.375rem; + background: var(--accent-3000); + overflow-y: auto; + z-index: var(--z-main-nav); + + .LemonButton { + min-height: 2.25rem !important; // Reduce minimum height + padding: 0.375rem !important; // Use a custom padding for the navbar only + } + + ul { + padding: 0.5rem 0; + } + + ul + ul { + border-top-width: 1px; + } + + li + li { + margin-top: 1px; + } + } } .NavbarButton { @@ -93,20 +117,6 @@ transform: translateY(-0.25rem); } } - &.NavbarButton--popover { - &::before { - content: ''; - position: absolute; - top: 0.1875rem; - right: 0.1875rem; - width: 0; - height: 0; - border-radius: 1px; - border: 0.1875rem solid transparent; - border-top-color: currentColor; - border-right-color: currentColor; - } - } } // Sidebar diff --git a/frontend/src/layout/navigation-3000/components/Navbar.tsx b/frontend/src/layout/navigation-3000/components/Navbar.tsx index f42e2dd660a95..c91b9289ee885 100644 --- a/frontend/src/layout/navigation-3000/components/Navbar.tsx +++ b/frontend/src/layout/navigation-3000/components/Navbar.tsx @@ -12,46 +12,55 @@ import { navigation3000Logic } from '../navigationLogic' import { themeLogic } from '../themeLogic' import { NavbarButton } from './NavbarButton' import { urls } from 'scenes/urls' +import { featureFlagLogic } from 'lib/logic/featureFlagLogic' +import { Resizer } from 'lib/components/Resizer/Resizer' +import { useRef } from 'react' export function Navbar(): JSX.Element { const { user } = useValues(userLogic) const { isSitePopoverOpen } = useValues(navigationLogic) const { closeSitePopover, toggleSitePopover } = useActions(navigationLogic) const { isSidebarShown, activeNavbarItemId, navbarItems } = useValues(navigation3000Logic) - const { showSidebar, hideSidebar } = useActions(navigation3000Logic) + const { showSidebar, hideSidebar, toggleNavCollapsed } = useActions(navigation3000Logic) const { isDarkModeOn, darkModeSavedPreference, darkModeSystemPreference, isThemeSyncedWithSystem } = useValues(themeLogic) const { toggleTheme } = useActions(themeLogic) + const { featureFlags } = useValues(featureFlagLogic) const activeThemeIcon = isDarkModeOn ? : + const containerRef = useRef(null) + return ( -