diff --git a/packages/web/components/elements/Button.tsx b/packages/web/components/elements/Button.tsx index cb88f527d..7602c5cdb 100644 --- a/packages/web/components/elements/Button.tsx +++ b/packages/web/components/elements/Button.tsx @@ -69,6 +69,37 @@ export const Button = styled('button', { outline: '1px solid $omnivoreCtaYellow', }, }, + landingCta: { + borderRadius: 10, + backgroundColor: '#1A1A1A', + + padding: '12px 100px', + color: '#FFFFFF', + font: '$inter', + fontSize: '20px', + fontWeight: '500', + textDecoration: 'none', + transition: 'background-color ease-out 50ms', + '&:hover': { + backgroundColor: '#3D3D3D', + outline: '0px solid #1A1A1A', + }, + }, + landingSimple: { + borderRadius: 10, + backgroundColor: '#1A1A1A', + padding: '12px 25px', + color: '#FFFFFF', + font: '$inter', + fontSize: '20px', + fontWeight: '500', + textDecoration: 'none', + transition: 'background-color ease-out 50ms', + '&:hover': { + backgroundColor: '#1A1A1A', + outline: '0px solid #1A1A1A', + }, + }, cancelGeneric: { fontSize: '13px', fontWeight: 500, diff --git a/packages/web/components/elements/MobileInstallHelp.tsx b/packages/web/components/elements/MobileInstallHelp.tsx deleted file mode 100644 index 1aa9736ac..000000000 --- a/packages/web/components/elements/MobileInstallHelp.tsx +++ /dev/null @@ -1,280 +0,0 @@ -import React from 'react' -import { - Desktop, - DeviceTabletSpeaker, - DeviceMobileCamera, -} from 'phosphor-react' -import { Box, HStack } from '../elements/LayoutPrimitives' -import { StyledText, StyledAnchor } from '../elements/StyledText' - -const TooltipStyle = { - backgroundColor: '#F9D354', - color: '#0A0806', -} - -type MobileInstallHelpProps = { - onboarding?: boolean -} - -export default function MobileInstallHelp({ - onboarding = false, -}: MobileInstallHelpProps): JSX.Element { - const [selectedTooltip, setSelectedTooltip] = - React.useState('Available for Mac') - const platformSizes = [ - { - label: 'Available for Mac', - icon: , - }, - { - label: 'Available for iPad', - icon: , - }, - { - label: 'Available for iPhone', - icon: , - }, - ] - - const iosContainerStyles = { - marginTop: '12px', - width: '100%', - height: '40px', - display: 'flex', - justifyContent: !onboarding ? 'flex-end' : 'initial', - } - - return ( - - - - - - - - - Install Omnivore for iOS and macOS - - - - With the Omnivore for iOS and macOS app installed you can save any link - using our Share extension. -
- {!onboarding && ( - - Learn more about the iOS and macOS app -> - - )} -
- - - - Download on the App Store - - - - {platformSizes.map((item, idx) => ( - - setSelectedTooltip(item.label)} - css={{ - mx: 'auto', - borderRadius: '50%', - display: 'inline-flex', - alignItems: 'center', - justifyContent: 'center', - height: 35, - width: 35, - cursor: 'pointer', - backgroundColor: '$labelButtonsBg', - ...(selectedTooltip !== item.label && { - filter: 'grayscale(1)', - }), - '&:focus': { - filter: 'grayscale(0)', - }, - '&:active': { - filter: 'grayscale(0)', - }, - '@lg': { - transition: 'filter .3s linear', - '&:hover': { - filter: 'grayscale(0)', - }, - }, - }} - > - {item.icon} - - - ))} - - -
- ) -} diff --git a/packages/web/components/templates/About.tsx b/packages/web/components/templates/About.tsx index 9413b717e..6558138ce 100644 --- a/packages/web/components/templates/About.tsx +++ b/packages/web/components/templates/About.tsx @@ -16,7 +16,7 @@ export function About(props: AboutProps): JSX.Element { {props.children} diff --git a/packages/web/components/templates/SettingsLayout.tsx b/packages/web/components/templates/SettingsLayout.tsx index dd9be633a..71f8f44c6 100644 --- a/packages/web/components/templates/SettingsLayout.tsx +++ b/packages/web/components/templates/SettingsLayout.tsx @@ -1,4 +1,4 @@ -import { Box, HStack, VStack } from '../elements/LayoutPrimitives' +import { Box, HStack, SpanBox, VStack } from '../elements/LayoutPrimitives' import { navigationCommands } from '../../lib/keyboardShortcuts/navigationShortcuts' import { useKeyboardShortcuts } from '../../lib/keyboardShortcuts/useKeyboardShortcuts' import { useRouter } from 'next/router' @@ -12,12 +12,46 @@ import { logout } from '../../lib/logout' import { SettingsMenu } from './navMenu/SettingsMenu' import { SettingsDropdown } from './navMenu/SettingsDropdown' import { useVerifyAuth } from '../../lib/hooks/useVerifyAuth' +import Link from 'next/link' +import { CaretLeft } from 'phosphor-react' type SettingsLayoutProps = { title?: string children: React.ReactNode } +const ReturnButton = (): JSX.Element => { + return ( + + + + + Return to library + + + + ) +} + export function SettingsLayout(props: SettingsLayoutProps): JSX.Element { useVerifyAuth() @@ -57,7 +91,9 @@ export function SettingsLayout(props: SettingsLayoutProps): JSX.Element { }, }} > - - + + + - {props.children} + + + + + {props.children} + diff --git a/packages/web/components/templates/landing/LandingHeader.tsx b/packages/web/components/templates/landing/LandingHeader.tsx index 5f91bf821..1f3f9ddc5 100644 --- a/packages/web/components/templates/landing/LandingHeader.tsx +++ b/packages/web/components/templates/landing/LandingHeader.tsx @@ -8,22 +8,8 @@ const LoginButton = (): JSX.Element => { diff --git a/packages/web/components/templates/landing/LandingSection.tsx b/packages/web/components/templates/landing/LandingSection.tsx index b8595b7f1..dd15fef6b 100644 --- a/packages/web/components/templates/landing/LandingSection.tsx +++ b/packages/web/components/templates/landing/LandingSection.tsx @@ -14,7 +14,8 @@ export function LandingSection(props: LandingSectionProps): JSX.Element { css={{ width: '100%', flexWrap: 'wrap', - flexDirection: (props?.imagePosition ?? 'left') === 'left' ? 'row-reverse' : 'row', + flexDirection: + (props?.imagePosition ?? 'left') === 'left' ? 'row-reverse' : 'row', marginBottom: 20, '@mdDown': { width: '100%', @@ -40,7 +41,7 @@ export function LandingSection(props: LandingSectionProps): JSX.Element { as="h2" css={{ fontWeight: '700', - color: '#3D3D3D', + color: '#FFFFFF', lineHeight: 1.25, '@mdDown': { fontSize: 24, @@ -58,7 +59,7 @@ export function LandingSection(props: LandingSectionProps): JSX.Element { {props.descriptionText} diff --git a/packages/web/components/templates/landing/LandingSectionsContainer.tsx b/packages/web/components/templates/landing/LandingSectionsContainer.tsx index a4ccf9399..db2547bce 100644 --- a/packages/web/components/templates/landing/LandingSectionsContainer.tsx +++ b/packages/web/components/templates/landing/LandingSectionsContainer.tsx @@ -18,18 +18,9 @@ export function GetStartedButton(props: { lang: 'en' | 'zh' }): JSX.Element {