diff --git a/packages/web/components/elements/Button.tsx b/packages/web/components/elements/Button.tsx index 7602c5cdb..c287f82d8 100644 --- a/packages/web/components/elements/Button.tsx +++ b/packages/web/components/elements/Button.tsx @@ -25,12 +25,12 @@ export const Button = styled('button', { fontSize: '14px', fontWeight: '500', cursor: 'pointer', - border: '1px solid $yellow3', + border: '0px solid $yellow3', bg: '$ctaBlue', color: 'white', '&:hover': { - opacity: '0.6', - border: '0px solid $ctaBlue', + border: '0px solid #0056D2', + background: `#0056D2`, }, }, tldr: { @@ -72,7 +72,6 @@ export const Button = styled('button', { landingCta: { borderRadius: 10, backgroundColor: '#1A1A1A', - padding: '12px 100px', color: '#FFFFFF', font: '$inter', @@ -80,6 +79,7 @@ export const Button = styled('button', { fontWeight: '500', textDecoration: 'none', transition: 'background-color ease-out 50ms', + boxShadow: `0px 4px 4px 0px rgba(0, 0, 0, 0.15)`, '&:hover': { backgroundColor: '#3D3D3D', outline: '0px solid #1A1A1A', @@ -88,7 +88,7 @@ export const Button = styled('button', { landingSimple: { borderRadius: 10, backgroundColor: '#1A1A1A', - padding: '12px 25px', + padding: '10px 20px', color: '#FFFFFF', font: '$inter', fontSize: '20px', @@ -98,6 +98,7 @@ export const Button = styled('button', { '&:hover': { backgroundColor: '#1A1A1A', outline: '0px solid #1A1A1A', + boxShadow: `0px 4px 4px 0px rgba(0, 0, 0, 0.15)`, }, }, cancelGeneric: { @@ -115,6 +116,21 @@ export const Button = styled('button', { outline: '1px solid $omnivoreCtaYellow', }, }, + cancelAuth: { + fontSize: '13px', + fontWeight: 500, + fontFamily: 'Inter', + cursor: 'pointer', + color: '#6A6968', + borderRadius: '5px', + border: '1px solid transparent', + p: '10px 15px', + bg: 'transparent', + '&:hover': { + backgroundColor: '#2A2A2A', + outline: '0px solid #2A2A2A', + }, + }, ctaOutlineYellow: { boxSizing: 'border-box', borderColor: 'unset', diff --git a/packages/web/components/elements/Recaptcha.tsx b/packages/web/components/elements/Recaptcha.tsx index 193ada581..1f071410d 100644 --- a/packages/web/components/elements/Recaptcha.tsx +++ b/packages/web/components/elements/Recaptcha.tsx @@ -9,6 +9,7 @@ export const Recaptcha = (props: RecaptchaProps): JSX.Element => { <> { console.log('recaptcha: ', token) props.setRecaptchaToken(token) diff --git a/packages/web/components/templates/AuthLayout.tsx b/packages/web/components/templates/AuthLayout.tsx index a8f9c971b..bc9388894 100644 --- a/packages/web/components/templates/AuthLayout.tsx +++ b/packages/web/components/templates/AuthLayout.tsx @@ -15,9 +15,9 @@ export function AuthLayout(props: ProfileLayoutProps): JSX.Element { alignment="center" distribution="center" css={{ - // bg: '$omnivoreYellow', height: '100vh', - bg: '#898989', + color: '#898989', + background: '#2A2A2A', }} > {props.children} @@ -46,7 +46,7 @@ export function AuthLayout(props: ProfileLayoutProps): JSX.Element { }} > diff --git a/packages/web/components/templates/LoginForm.tsx b/packages/web/components/templates/LoginForm.tsx index ed475a012..3ddc23f1b 100644 --- a/packages/web/components/templates/LoginForm.tsx +++ b/packages/web/components/templates/LoginForm.tsx @@ -8,6 +8,7 @@ import { appleAuthRedirectURI, } from '../../lib/appConfig' import { AppleIdButton } from './auth/AppleIdButton' +import { useEffect, useRef } from 'react' export type LoginFormProps = { errorMessage?: string @@ -19,7 +20,7 @@ export function LoginForm(props: LoginFormProps): JSX.Element { fontWeight: '700', fontSize: '45px', lineHeight: '53px', - color: '$omnivoreGray', + color: '#FFFFFF', m: '0px', }) @@ -45,13 +46,12 @@ export function LoginForm(props: LoginFormProps): JSX.Element { fontSize: '18px', lineHeight: '120%', m: '0px', - color: '$omnivoreGray', + color: '#898989', }} > Save articles and read them later in our distraction-free reader. - Learn More -> - @@ -106,7 +105,7 @@ export function LoginForm(props: LoginFormProps): JSX.Element { Continue with Email @@ -114,10 +113,24 @@ export function LoginForm(props: LoginFormProps): JSX.Element { - ); + ) } function GoogleAuthButton() { + useEffect(() => { + const script = document.createElement('script') + + script.src = 'https://accounts.google.com/gsi/client' + script.async = true + script.defer = true + + document.body.appendChild(script) + + return () => { + document.body.removeChild(script) + } + }, []) + return (
By signing up, you agree to Omnivore’s{' '} - + Terms of Service {' '} and{' '} - + Privacy Policy - ); + ) } diff --git a/packages/web/components/templates/ProfileLayout.tsx b/packages/web/components/templates/ProfileLayout.tsx index 228f67c06..8dffb49eb 100644 --- a/packages/web/components/templates/ProfileLayout.tsx +++ b/packages/web/components/templates/ProfileLayout.tsx @@ -45,7 +45,7 @@ export function ProfileLayout(props: ProfileLayoutProps): JSX.Element { }} > diff --git a/packages/web/components/templates/auth/EmailLogin.tsx b/packages/web/components/templates/auth/EmailLogin.tsx index d7d676638..f77da16c2 100644 --- a/packages/web/components/templates/auth/EmailLogin.tsx +++ b/packages/web/components/templates/auth/EmailLogin.tsx @@ -18,7 +18,7 @@ const LoginForm = (): JSX.Element => { return ( - Email + Email { name="email" value={email} placeholder="Email" - css={{ backgroundColor: 'white', color: 'black' }} + css={{ backgroundColor: '#2A2A2A', color: 'white', border: 'unset' }} onChange={(e) => { e.preventDefault() setEmail(e.target.value) @@ -35,14 +35,14 @@ const LoginForm = (): JSX.Element => { - Password + Password setPassword(e.target.value)} /> @@ -72,16 +72,16 @@ export function EmailLogin(): JSX.Element { alignment="center" css={{ padding: '16px', - background: 'white', minWidth: '340px', width: '70vw', maxWidth: '576px', borderRadius: '8px', - border: '1px solid #3D3D3D', - boxShadow: '#B1B1B1 9px 9px 9px -9px', + background: '#343434', + border: '1px solid #6A6968', + boxShadow: '0px 4px 4px 0px rgba(0, 0, 0, 0.15)', }} > - + Login @@ -118,8 +118,8 @@ export function EmailLogin(): JSX.Element { }} > - @@ -151,7 +157,7 @@ export function EmailLogin(): JSX.Element { > Don't have an account?{' '} - + Sign up @@ -169,7 +175,10 @@ export function EmailLogin(): JSX.Element { > Forgot your password?{' '} - + Click here diff --git a/packages/web/components/templates/landing/LandingHeader.tsx b/packages/web/components/templates/landing/LandingHeader.tsx index 1f3f9ddc5..019186847 100644 --- a/packages/web/components/templates/landing/LandingHeader.tsx +++ b/packages/web/components/templates/landing/LandingHeader.tsx @@ -34,7 +34,7 @@ export function LandingHeader(): JSX.Element { width: '100%', }} > - + ) diff --git a/packages/web/components/templates/landing/LandingSectionsContainer.tsx b/packages/web/components/templates/landing/LandingSectionsContainer.tsx index db2547bce..5c46b4c7f 100644 --- a/packages/web/components/templates/landing/LandingSectionsContainer.tsx +++ b/packages/web/components/templates/landing/LandingSectionsContainer.tsx @@ -15,14 +15,7 @@ import Link from 'next/link' export function GetStartedButton(props: { lang: 'en' | 'zh' }): JSX.Element { return ( - ) diff --git a/packages/web/public/static/images/login/login-feature-image-full.png b/packages/web/public/static/images/login/login-feature-image-full.png index 2e4ea1962..a1ed14865 100644 Binary files a/packages/web/public/static/images/login/login-feature-image-full.png and b/packages/web/public/static/images/login/login-feature-image-full.png differ diff --git a/packages/web/public/static/images/login/login-feature-image-half.png b/packages/web/public/static/images/login/login-feature-image-half.png deleted file mode 100644 index b2d80c78a..000000000 Binary files a/packages/web/public/static/images/login/login-feature-image-half.png and /dev/null differ