diff --git a/desktop/flipper-plugin/src/ui/Sidebar.tsx b/desktop/flipper-plugin/src/ui/Sidebar.tsx index 4e5878645..c13806354 100644 --- a/desktop/flipper-plugin/src/ui/Sidebar.tsx +++ b/desktop/flipper-plugin/src/ui/Sidebar.tsx @@ -20,6 +20,7 @@ import {Layout} from './Layout'; const SidebarInteractiveContainer = styled(Interactive)({ display: 'flex', flex: '0 1 1', + background: theme.backgroundDefault, }); SidebarInteractiveContainer.displayName = 'Sidebar:SidebarInteractiveContainer'; diff --git a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx index 062347bc6..65e3d835b 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx @@ -163,7 +163,12 @@ export const LeftRail = withTrackingScope(function LeftRail({ setToplevelSelection, }: ToplevelProps) { return ( - + + + + + + + + + + + + + + + + ); +} diff --git a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx index bd10da789..971138c39 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx @@ -20,6 +20,7 @@ import {Link, styled} from '../ui'; import {theme} from 'flipper-plugin'; import {Logger} from 'flipper-common'; +import {Navbar} from './Navbar'; import {LeftRail} from './LeftRail'; import {useStore, useDispatch} from '../utils/useStore'; import {FlipperDevTools} from '../chrome/FlipperDevTools'; @@ -167,45 +168,48 @@ export function SandyApp() { return ( - - - - <_Sidebar width={250} minWidth={220} maxWidth={800} gutter> - {leftMenuContent && ( - - {leftMenuContent} - - )} - - - - {staticView ? ( - - {staticView === WelcomeScreenStaticView ? ( - React.createElement(staticView) /* avoid shadow */ - ) : ( - - {React.createElement(staticView, { - logger: logger, - })} - + + + + + + <_Sidebar width={250} minWidth={220} maxWidth={800} gutter> + {leftMenuContent && ( + + {leftMenuContent} + )} - - ) : ( - - )} - {outOfContentsContainer} - - + + + + {staticView ? ( + + {staticView === WelcomeScreenStaticView ? ( + React.createElement(staticView) /* avoid shadow */ + ) : ( + + {React.createElement(staticView, { + logger: logger, + })} + + )} + + ) : ( + + )} + {outOfContentsContainer} + + + <_PortalsManager /> @@ -236,13 +240,14 @@ const outOfContentsContainer = ( const MainContainer = styled(Layout.Container)({ background: theme.backgroundWash, - padding: `${theme.space.large}px ${theme.space.large}px ${theme.space.large}px 0`, + padding: `0 ${theme.space.large}px ${theme.space.large}px 0`, overflow: 'hidden', }); const RootElement = styled.div({ display: 'flex', height: '100%', + background: theme.backgroundWash, }); RootElement.displayName = 'SandyAppRootElement';