diff --git a/packages/web/components/elements/MobileInstallHelp.tsx b/packages/web/components/elements/MobileInstallHelp.tsx index eedde7b87..a9e03ae16 100644 --- a/packages/web/components/elements/MobileInstallHelp.tsx +++ b/packages/web/components/elements/MobileInstallHelp.tsx @@ -100,22 +100,6 @@ export default function MobileInstallHelp({ }, }} > - - - Learn more - - - Install Omnivore for iOS + Install Omnivore iOS - Learn more about the share extension here. + Learn more about the iOS app -> )} @@ -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', diff --git a/packages/web/components/patterns/PrimaryHeader.tsx b/packages/web/components/patterns/PrimaryHeader.tsx index 55a535034..084b8512e 100644 --- a/packages/web/components/patterns/PrimaryHeader.tsx +++ b/packages/web/components/patterns/PrimaryHeader.tsx @@ -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 toolbarControl?: JSX.Element alwaysDisplayToolbar?: boolean @@ -125,11 +123,10 @@ export function PrimaryHeader(props: HeaderProps): JSX.Element { <> @@ -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', }, diff --git a/packages/web/components/templates/LoginForm.tsx b/packages/web/components/templates/LoginForm.tsx index 504ac6089..48996afcb 100644 --- a/packages/web/components/templates/LoginForm.tsx +++ b/packages/web/components/templates/LoginForm.tsx @@ -8,7 +8,6 @@ import { appleAuthRedirectURI, } from '../../lib/appConfig' import AppleLogin from 'react-apple-login' -import { formatMessage } from '../../locales/en/messages' export type LoginFormProps = { errorMessage?: string diff --git a/packages/web/components/templates/LoginLayout.tsx b/packages/web/components/templates/LoginLayout.tsx index e655d49ca..5caac8b52 100644 --- a/packages/web/components/templates/LoginLayout.tsx +++ b/packages/web/components/templates/LoginLayout.tsx @@ -1,14 +1,8 @@ import { Box, HStack, MediumBreakpointBox, SpanBox, VStack } from '../elements/LayoutPrimitives' import { LoginForm } from './LoginForm' import type { LoginFormProps } from './LoginForm' -import Image from 'next/image' import { OmnivoreNameLogo } from '../elements/images/OmnivoreNameLogo' import { theme } from '../tokens/stitches.config' -import Link from 'next/link' -import { Star } from 'phosphor-react' -import { Button } from '../elements/Button' -import { googleID } from '../../lib/appConfig' -import { useEffect, useState } from 'react' export function LoginLayout(props: LoginFormProps): JSX.Element { return ( @@ -64,8 +58,9 @@ function MediumLoginLayout(props: LoginFormProps) { alignment="center" distribution="start" css={{ - height: '100vh', width: '100vw', + height: '100%', + minHeight: '100vh', bg: '$omnivoreYellow', overflowY: 'clip' }} diff --git a/packages/web/components/templates/PrimaryLayout.tsx b/packages/web/components/templates/PrimaryLayout.tsx index e077a3dbf..973529cf3 100644 --- a/packages/web/components/templates/PrimaryLayout.tsx +++ b/packages/web/components/templates/PrimaryLayout.tsx @@ -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} diff --git a/packages/web/components/templates/SettingsLayout.tsx b/packages/web/components/templates/SettingsLayout.tsx index c2df14f0d..15d381bf3 100644 --- a/packages/web/components/templates/SettingsLayout.tsx +++ b/packages/web/components/templates/SettingsLayout.tsx @@ -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 {