Make sure the header bar has a background in settings screens

This commit is contained in:
Jackson Harper 2022-05-13 10:57:39 -07:00
parent 7811e9e428
commit bf8a41af29
4 changed files with 11 additions and 36 deletions

View file

@ -100,22 +100,6 @@ export default function MobileInstallHelp({
},
}}
>
<Link passHref href="/help/saving-links">
<StyledAnchor
css={{
fontWeight: '600',
fontSize: '12px',
lineHeight: '18px',
textAlign: 'right',
color: !onboarding ? '$grayTextContrast' : 'rgba(10, 8, 6, 0.8)',
'@lg': {
display: 'none',
},
}}
>
Learn more
</StyledAnchor>
</Link>
<StyledText
as={'h3'}
css={{
@ -131,7 +115,7 @@ export default function MobileInstallHelp({
},
}}
>
Install Omnivore for iOS
Install Omnivore iOS
</StyledText>
</Box>
<StyledText
@ -166,14 +150,10 @@ export default function MobileInstallHelp({
color: '$grayTextContrast',
fontSize: '14px',
fontWeight: 600,
display: 'none',
'@lg': {
display: 'initial',
textDecoration: 'underline',
},
textDecoration: 'underline',
}}
>
Learn more about the share extension here.
Learn more about the iOS app -&gt;
</StyledAnchor>
</Link>
)}
@ -186,7 +166,7 @@ export default function MobileInstallHelp({
alignItems: 'center',
gridColumn: '1 / span 2',
justifyContent: !onboarding ? 'space-between' : 'center',
mt: !onboarding ? 'inherit' : 10,
mt: '10px',
'@lg': {
flexDirection: !onboarding ? 'row-reverse' : 'column-reverse',
alignItems: !onboarding ? 'center' : 'flex-end',

View file

@ -14,15 +14,13 @@ import { useKeyboardShortcuts } from '../../lib/keyboardShortcuts/useKeyboardSho
import { primaryCommands } from '../../lib/keyboardShortcuts/navigationShortcuts'
import { UserBasicData } from '../../lib/networking/queries/useGetViewerQuery'
import { setupAnalytics } from '../../lib/analytics'
import { Button } from '../elements/Button'
import Link from 'next/link'
type HeaderProps = {
user?: UserBasicData
userInitials: string
hideHeader?: boolean
profileImageURL?: string
isFixedPosition: boolean
isTransparent: boolean
scrollElementRef?: React.RefObject<HTMLDivElement>
toolbarControl?: JSX.Element
alwaysDisplayToolbar?: boolean
@ -125,11 +123,10 @@ export function PrimaryHeader(props: HeaderProps): JSX.Element {
<>
<NavHeader
{...props}
isVisible={true}
username={props.user?.profile.username}
actionHandler={headerDropdownActionHandler}
isDisplayingShadow={isScrolled}
isVisible={true}
isFixedPosition={true}
toolbarControl={props.toolbarControl}
alwaysDisplayToolbar={props.alwaysDisplayToolbar}
/>
@ -145,7 +142,7 @@ type NavHeaderProps = {
profileImageURL?: string
isDisplayingShadow?: boolean
isVisible?: boolean
isFixedPosition: boolean
isTransparent: boolean
toolbarControl?: JSX.Element
alwaysDisplayToolbar?: boolean
}
@ -166,7 +163,7 @@ function NavHeader(props: NavHeaderProps): JSX.Element {
p: '0px $3 0px $3',
height: '48px',
position: 'fixed',
bg: 'transparent',
bg: props.isTransparent ? 'transparent' : '$grayBase',
'@smDown': {
p: '0px 18px 0px 16px',
},

View file

@ -75,7 +75,7 @@ export function PrimaryLayout(props: PrimaryLayoutProps): JSX.Element {
hideHeader={props.hideHeader}
userInitials={viewerData?.me?.name.charAt(0) ?? ''}
profileImageURL={viewerData?.me?.profile.pictureUrl}
isFixedPosition={true}
isTransparent={true}
scrollElementRef={props.scrollElementRef}
toolbarControl={props.headerToolbarControl}
alwaysDisplayToolbar={props.alwaysDisplayToolbar}

View file

@ -1,6 +1,4 @@
import Link from 'next/link'
import { HStack, VStack, Box } from '../elements/LayoutPrimitives'
import { StyledText } from '../elements/StyledText'
import { Box } from '../elements/LayoutPrimitives'
import { useGetViewerQuery } from '../../lib/networking/queries/useGetViewerQuery'
import { PrimaryHeader } from '../patterns/PrimaryHeader'
import { navigationCommands } from '../../lib/keyboardShortcuts/navigationShortcuts'
@ -46,7 +44,7 @@ export function SettingsLayout(props: SettingsLayoutProps): JSX.Element {
<PageMetaData path='settings' title='Settings' />
<PrimaryHeader
user={viewerData?.me}
isFixedPosition={false}
isTransparent={false}
userInitials={viewerData?.me?.name.charAt(0) ?? ''}
profileImageURL={viewerData?.me?.profile.pictureUrl}
setShowLogoutConfirmation={setShowLogoutConfirmation}