Merge branch 'master' into remove-legacy-notebook-icon

.storybook/storybook.scss

@@ -4,16 +4,13 @@
     .ant-modal-wrap {
         z-index: 1050 !important;
     }
+
     .ant-select-dropdown,
     .ant-picker-dropdown {
         z-index: 1060 !important;
     }
+
     .ant-tooltip {
         z-index: 1060 !important;
     }
 }
-
-// allow taking screenshots of a scene's main content without overlapping top bar
-.TopBar {
-    position: relative !important;
-}

frontend/src/layout/ErrorBoundary/ErrorBoundary.scss

@@ -6,10 +6,6 @@
     background: var(--danger-highlight);
     border-radius: var(--radius);
 
-    .main-app-content > & {
-        margin: 1.5rem 0;
-    }
-
     h2 {
         margin-bottom: 0.75rem;
         font-weight: 600;

frontend/src/layout/navigation-3000/Navigation.tsx

@@ -3,7 +3,7 @@ import './Navigation.scss'
 import clsx from 'clsx'
 import { useMountedLogic, useValues } from 'kea'
 import { BillingAlertsV2 } from 'lib/components/BillingAlertsV2'
-import { CommandPalette } from 'lib/components/CommandPalette/CommandPalette'
+import { CommandBar } from 'lib/components/CommandBar/CommandBar'
 import { FlaggedFeature } from 'lib/components/FlaggedFeature'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { ReactNode, useEffect } from 'react'
@@ -66,7 +66,7 @@ export function Navigation({
                 </div>
             </main>
             {!mobileLayout && <SidePanel />}
-            <CommandPalette />
+            <CommandBar />
         </div>
     )
 }

frontend/src/layout/navigation-3000/components/TopBar.scss

@@ -1,7 +1,5 @@
 // TODO: Remove legacy scss files
-@import '../../navigation/TopBar/TopBar';
 @import '../../navigation/SideBar/SideBar';
-@import '../../navigation/Breadcrumbs/Breadcrumbs';
 
 .TopBar3000 {
     --breadcrumbs-compaction-rate: 0;

frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx

@@ -1,5 +1,3 @@
-import './Breadcrumbs.scss'
-
 import { actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
 import { subscriptions } from 'kea-subscriptions'
 import { Lettermark } from 'lib/lemon-ui/Lettermark'

frontend/src/layout/navigation/Navigation.tsx

@@ -1,41 +1,9 @@
-import clsx from 'clsx'
-import { BillingAlertsV2 } from 'lib/components/BillingAlertsV2'
-import { ReactNode } from 'react'
-import { SceneConfig } from 'scenes/sceneTypes'
-
-import { Breadcrumbs } from './Breadcrumbs/Breadcrumbs'
-import { ProjectNotice } from './ProjectNotice'
 import { SideBar } from './SideBar/SideBar'
-import { TopBar } from './TopBar/TopBar'
 
-export function Navigation({
-    children,
-    sceneConfig,
-}: {
-    children: ReactNode
-    sceneConfig: SceneConfig | null
-}): JSX.Element {
+export function Navigation(): JSX.Element {
     return (
-        <div className="h-screen flex flex-col">
-            <TopBar />
-            <SideBar>
-                <div
-                    className={clsx(
-                        'main-app-content',
-                        sceneConfig?.layout === 'plain' && 'main-app-content--plain',
-                        sceneConfig?.layout === 'app-container' && 'main-app-content--container'
-                    )}
-                >
-                    {sceneConfig?.layout !== 'plain' && (
-                        <>
-                            <BillingAlertsV2 />
-                            {!sceneConfig?.hideProjectNotice && <ProjectNotice />}
-                            <Breadcrumbs />
-                        </>
-                    )}
-                    {children}
-                </div>
-            </SideBar>
-        </div>
+        <SideBar>
+            <div />
+        </SideBar>
     )
 }