From ec3f52efd2fccfeec72b12b9c7e142f8a4c8cce0 Mon Sep 17 00:00:00 2001 From: Anastasia Poupeney Date: Wed, 27 Jun 2018 12:36:38 +0200 Subject: [PATCH] live logo with shadow integrated on all onboarding pages --- src/components/Onboarding/helperComponents.js | 14 ++++++++++++++ src/components/Onboarding/steps/Finish.js | 16 ++++++++++++---- src/components/Onboarding/steps/Init.js | 9 +++++---- src/components/Onboarding/steps/NoDevice.js | 11 ++++++----- src/components/Onboarding/steps/Start.js | 9 ++++++--- static/images/ledgerlive-logo.svg | 2 +- 6 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/components/Onboarding/helperComponents.js b/src/components/Onboarding/helperComponents.js index a3191b0f..a45ca150 100644 --- a/src/components/Onboarding/helperComponents.js +++ b/src/components/Onboarding/helperComponents.js @@ -52,6 +52,20 @@ export const OnboardingFooterWrapper = styled(Box).attrs({ border-bottom-left-radius: ${radii[1]}px; border-bottom-right-radius: ${radii[1]}px; ` +// LIVE LOGO +export function LiveLogo({ icon, ...p }: { icon: any }) { + return {icon} +} +export const LiveLogoContainer = styled(Box).attrs({ + borderRadius: '50%', + alignItems: 'center', + justifyContent: 'center', +})` + box-shadow: 0 2px 24px 0 #00000014; + width: ${p => (p.width ? p.width : 80)} + height: ${p => (p.height ? p.height : 80)} + +` // INSTRUCTION LIST type StepType = { diff --git a/src/components/Onboarding/steps/Finish.js b/src/components/Onboarding/steps/Finish.js index e582d708..10d3bb88 100644 --- a/src/components/Onboarding/steps/Finish.js +++ b/src/components/Onboarding/steps/Finish.js @@ -3,18 +3,19 @@ import React from 'react' import { shell } from 'electron' import styled from 'styled-components' +import { i } from 'helpers/staticPath' import Box from 'components/base/Box' import Button from 'components/base/Button' import ConfettiParty from 'components/ConfettiParty' -import IconCheckCircle from 'icons/CheckCircle' +import IconCheckFull from 'icons/CheckFull' import IconSocialTwitter from 'icons/Twitter' import IconSocialReddit from 'icons/Reddit' import IconSocialGithub from 'icons/Github' import type { StepProps } from '..' -import { Title, Description } from '../helperComponents' +import { Title, Description, LiveLogo } from '../helperComponents' const ConfettiLayer = styled.div` position: absolute; @@ -55,9 +56,16 @@ export default (props: StepProps) => { - - + + } + /> + + + + {t('onboarding:finish.title')} {t('onboarding:finish.desc')} diff --git a/src/components/Onboarding/steps/Init.js b/src/components/Onboarding/steps/Init.js index ea503497..73e65199 100644 --- a/src/components/Onboarding/steps/Init.js +++ b/src/components/Onboarding/steps/Init.js @@ -13,7 +13,7 @@ import IconCheck from 'icons/Check' import IconExternalLink from 'icons/ExternalLink' import IconChevronRight from 'icons/ChevronRight' import { i } from 'helpers/staticPath' -import { Title } from '../helperComponents' +import { Title, LiveLogo } from '../helperComponents' import type { StepProps } from '..' @@ -65,9 +65,10 @@ class Init extends PureComponent { return ( - - - + } + /> {t('onboarding:init.title')} diff --git a/src/components/Onboarding/steps/NoDevice.js b/src/components/Onboarding/steps/NoDevice.js index f63ad96f..e4b3b1e5 100644 --- a/src/components/Onboarding/steps/NoDevice.js +++ b/src/components/Onboarding/steps/NoDevice.js @@ -2,14 +2,14 @@ import React, { PureComponent } from 'react' import { shell } from 'electron' +import { i } from 'helpers/staticPath' import Box from 'components/base/Box' -import IconUser from 'icons/User' import IconCart from 'icons/Cart' import IconTruck from 'icons/Truck' import IconInfoCircle from 'icons/InfoCircle' import Button from '../../base/Button/index' -import { Title, OnboardingFooterWrapper } from '../helperComponents' +import { Title, OnboardingFooterWrapper, LiveLogo } from '../helperComponents' import { OptionFlowCard } from './Init' import type { StepProps } from '..' @@ -48,9 +48,10 @@ class NoDevice extends PureComponent { return ( - - - + } + /> {t('onboarding:noDevice.title')} diff --git a/src/components/Onboarding/steps/Start.js b/src/components/Onboarding/steps/Start.js index c419be90..a072d50b 100644 --- a/src/components/Onboarding/steps/Start.js +++ b/src/components/Onboarding/steps/Start.js @@ -7,15 +7,18 @@ import Box from 'components/base/Box' import Button from 'components/base/Button' import type { StepProps } from '..' -import { Title } from '../helperComponents' +import { Title, LiveLogo } from '../helperComponents' export default (props: StepProps) => { const { jumpStep, t } = props return ( - - + } + /> + {t('onboarding:start.title')}