From 9bf48ed5953bfa25d44f88472bbf56baf3fd634b Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Thu, 23 Feb 2023 09:38:02 -0600 Subject: Change web shell to use permanent header --- src/view/shell/web/index.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/view/shell/web/index.tsx') diff --git a/src/view/shell/web/index.tsx b/src/view/shell/web/index.tsx index 7d76c01d8..44f958be8 100644 --- a/src/view/shell/web/index.tsx +++ b/src/view/shell/web/index.tsx @@ -5,6 +5,7 @@ import {IconProp} from '@fortawesome/fontawesome-svg-core' import {useStores} from 'state/index' import {NavigationModel} from 'state/models/navigation' import {match, MatchResult} from '../../routes' +import {DesktopHeader} from './DesktopHeader' import {DesktopLeftColumn} from './DesktopLeftColumn' import {DesktopRightColumn} from './DesktopRightColumn' import {Onboard} from '../../screens/Onboard' @@ -14,10 +15,11 @@ import {Lightbox} from '../../com/lightbox/Lightbox' import {Modal} from '../../com/modals/Modal' import {Composer} from './Composer' import {usePalette} from 'lib/hooks/usePalette' -import {s} from 'lib/styles' +import {useColorSchemeStyle} from 'lib/hooks/useColorSchemeStyle' +import {s, colors} from 'lib/styles' export const WebShell: React.FC = observer(() => { - const pal = usePalette('default') + const pageBg = useColorSchemeStyle(styles.bgLight, styles.bgDark) const store = useStores() const screenRenderDesc = constructScreenRenderDesc(store.nav) @@ -40,7 +42,8 @@ export const WebShell: React.FC = observer(() => { } return ( - + + {screenRenderDesc.screens.map(({Com, navIdx, params, key, current}) => (