merge with master, removed icon

pull/305/head
Vladimir Volek 5 years ago
commit 0c441ff0d5

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

@ -3,8 +3,8 @@ import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import colors from 'config/colors'; import colors from 'config/colors';
import { FONT_SIZE } from 'config/variables'; import { H1 } from 'components/Heading';
import { H2 } from 'components/Heading'; import Paragraph from 'components/Paragraph';
import Button from 'components/Button'; import Button from 'components/Button';
import Link from 'components/Link'; import Link from 'components/Link';
import CoinLogo from 'components/images/CoinLogo'; import CoinLogo from 'components/images/CoinLogo';
@ -39,21 +39,17 @@ const StyledCoinLogo = styled(CoinLogo)`
width: 32px; width: 32px;
`; `;
const StyledLink = styled(Link)`
padding-top: 24px;
`;
const Row = styled.div` const Row = styled.div`
flex: 1;
display: flex; display: flex;
padding: 50px 0;
flex-direction: column; flex-direction: column;
justify-content: center;
align-items: center; align-items: center;
text-align: center;
`; `;
const Message = styled.div` const Message = styled(Paragraph)`
font-size: ${FONT_SIZE.SMALL}; padding: 0 0 15px 0;
color: ${colors.TEXT_SECONDARY};
text-align: center; text-align: center;
`; `;
@ -61,11 +57,11 @@ const FirmwareUnsupported = (props: Props) => (
<Wrapper> <Wrapper>
<Row> <Row>
{props.networkShortcut && <CoinLogoWrapper><StyledCoinLogo standalone network={props.networkShortcut} /></CoinLogoWrapper>} {props.networkShortcut && <CoinLogoWrapper><StyledCoinLogo standalone network={props.networkShortcut} /></CoinLogoWrapper>}
<H2>{props.title}</H2> <H1>{props.title}</H1>
<Message>{props.message}</Message> <Message>{props.message}</Message>
<StyledLink href={getInfoUrl(props.networkShortcut)}> <Link href={getInfoUrl(props.networkShortcut)}>
<Button>Find out more info</Button> <Button>Find out more info</Button>
</StyledLink> </Link>
</Row> </Row>
</Wrapper> </Wrapper>
); );

@ -1,30 +1,32 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { H2 } from 'components/Heading'; import { H1 } from 'components/Heading';
import P from 'components/Paragraph';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
const Wrapper = styled.div` const Wrapper = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 40px 35px 40px 35px;
`; `;
const Row = styled.div` const Row = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 100px 48px; padding: 50px 0;
`; `;
const P = styled.p` const StyledP = styled(P)`
padding: 10px 0px; padding: 0 0 15px 0;
text-align: center; text-align: center;
`; `;
const Bootloader = () => ( const Bootloader = () => (
<Wrapper> <Wrapper>
<Row> <Row>
<H2>Your device is in firmware update mode</H2> <H1>Your device is in firmware update mode</H1>
<P>Please re-connect it</P> <StyledP>Please re-connect it</StyledP>
</Row> </Row>
</Wrapper> </Wrapper>
); );

@ -6,7 +6,8 @@ import Content from 'views/Wallet/components/Content';
import EthIcon from 'images/coins/eth.png'; import EthIcon from 'images/coins/eth.png';
import RippleIcon from 'images/coins/xrp.png'; import RippleIcon from 'images/coins/xrp.png';
import { H2 } from 'components/Heading'; import { H1 } from 'components/Heading';
import Paragraph from 'components/Paragraph';
const Wrapper = styled.div` const Wrapper = styled.div`
display: flex; display: flex;
@ -16,14 +17,14 @@ const Wrapper = styled.div`
const Row = styled.div` const Row = styled.div`
flex: 1; flex: 1;
display: flex; display: flex;
padding: 100px 48px; padding: 50px 0;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
`; `;
const P = styled.p` const StyledP = styled(Paragraph)`
padding: 24px 0px; padding: 0 0 15px 0;
text-align: center; text-align: center;
`; `;
@ -46,10 +47,9 @@ const EthImage = styled(Image)`
const Dashboard = () => ( const Dashboard = () => (
<Content> <Content>
<Wrapper> <Wrapper>
<H2>Dashboard</H2>
<Row> <Row>
<H2>Please select your coin</H2> <H1>Please select your coin</H1>
<P>You will gain access to receiving &amp; sending selected coin</P> <StyledP>You will gain access to receiving &amp; sending selected coin</StyledP>
<Overlay> <Overlay>
<EthImage src={EthIcon} width={20} /> <EthImage src={EthIcon} width={20} />
<Image src={RippleIcon} width={25} /> <Image src={RippleIcon} width={25} />

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { H2 } from 'components/Heading'; import { H1 } from 'components/Heading';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import colors from 'config/colors'; import colors from 'config/colors';
import Button from 'components/Button'; import Button from 'components/Button';
@ -20,11 +20,11 @@ const Row = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 100px 48px; padding: 50px 0;
`; `;
const StyledP = styled(P)` const StyledP = styled(P)`
padding: 10px 0 15px 0; padding: 0 0 15px 0;
text-align: center; text-align: center;
`; `;
@ -37,8 +37,8 @@ const DeviceSettings = () => (
color={colors.WARNING_PRIMARY} color={colors.WARNING_PRIMARY}
icon={ICONS.WARNING} icon={ICONS.WARNING}
/> />
<H2>Device settings is under construction</H2> <H1>Device settings is under construction</H1>
<StyledP isSmaller>Please use Bitcoin wallet interface to change your device settings</StyledP> <StyledP>Please use Bitcoin wallet interface to change your device settings</StyledP>
<Link href="https://beta-wallet.trezor.io/"> <Link href="https://beta-wallet.trezor.io/">
<Button>Take me to the Bitcoin wallet</Button> <Button>Take me to the Bitcoin wallet</Button>
</Link> </Link>

@ -31,7 +31,7 @@ const Wrapper = styled.section`
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 100px 48px; padding: 90px 35px 40px 35px;
`; `;
const StyledNavLink = styled(Link)` const StyledNavLink = styled(Link)`
@ -46,6 +46,7 @@ const Image = styled.div`
const StyledP = styled(P)` const StyledP = styled(P)`
padding: 0 0 15px 0; padding: 0 0 15px 0;
text-align: center;
`; `;
const FirmwareUpdate = (props: Props) => ( const FirmwareUpdate = (props: Props) => (

@ -1,5 +1,5 @@
import styled from 'styled-components'; import styled from 'styled-components';
import { H2 } from 'components/Heading'; import { H1 } from 'components/Heading';
import Button from 'components/Button'; import Button from 'components/Button';
import Paragraph from 'components/Paragraph'; import Paragraph from 'components/Paragraph';
import React from 'react'; import React from 'react';
@ -8,27 +8,27 @@ import { connect } from 'react-redux';
const Wrapper = styled.div` const Wrapper = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 40px 35px 40px 35px;
`; `;
const Row = styled.div` const Row = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 100px 48px; padding: 50px 0;
`; `;
const A = styled.a``; const A = styled.a``;
const StyledParagraph = styled(Paragraph)` const StyledParagraph = styled(Paragraph)`
margin: 10px 50px; padding: 0 0 15px 0;
display: block;
text-align: center; text-align: center;
`; `;
const Initialize = () => ( const Initialize = () => (
<Wrapper> <Wrapper>
<Row> <Row>
<H2>Your device is in not initialized</H2> <H1>Your device is not initialized</H1>
<StyledParagraph>Please use Bitcoin wallet interface to start initialization process</StyledParagraph> <StyledParagraph>Please use Bitcoin wallet interface to start initialization process</StyledParagraph>
<A href="https://beta-wallet.trezor.io/"> <A href="https://beta-wallet.trezor.io/">
<Button>Take me to the Bitcoin wallet</Button> <Button>Take me to the Bitcoin wallet</Button>

@ -1,31 +1,32 @@
import styled from 'styled-components'; import styled from 'styled-components';
import { H2 } from 'components/Heading'; import { H1 } from 'components/Heading';
import Paragraph from 'components/Paragraph'; import Paragraph from 'components/Paragraph';
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
const Wrapper = styled.div` const Wrapper = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 40px 35px 40px 35px;
`; `;
const Row = styled.div` const Row = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 100px 48px; padding: 50px 0;
`; `;
const StyledParagraph = styled(Paragraph)` const StyledParagraph = styled(Paragraph)`
margin: 10px 50px; padding: 0 0 15px 0;
display: block;
text-align: center; text-align: center;
`; `;
const Seedless = () => ( const Seedless = () => (
<Wrapper> <Wrapper>
<Row> <Row>
<H2>Device is in seedless mode</H2> <H1>Device is in seedless mode</H1>
<StyledParagraph>It&apos;s not suitable to use this service.</StyledParagraph> <StyledParagraph>It&apos;s not suitable to use this service.</StyledParagraph>
</Row> </Row>
</Wrapper> </Wrapper>

@ -6,7 +6,7 @@ import colors from 'config/colors';
import icons from 'config/icons'; import icons from 'config/icons';
import Content from 'views/Wallet/components/Content'; import Content from 'views/Wallet/components/Content';
import { H2 } from 'components/Heading'; import { H1 } from 'components/Heading';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import Link from 'components/Link'; import Link from 'components/Link';
import Button from 'components/Button'; import Button from 'components/Button';
@ -20,7 +20,7 @@ const Row = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding: 100px 48px; padding: 50px 0;
`; `;
const WalletSettings = () => ( const WalletSettings = () => (
@ -32,7 +32,7 @@ const WalletSettings = () => (
color={colors.WARNING_PRIMARY} color={colors.WARNING_PRIMARY}
icon={icons.WARNING} icon={icons.WARNING}
/> />
<H2>Wallet settings is under construction</H2> <H1>Wallet settings is under construction</H1>
<Link to="/"> <Link to="/">
<Button>Take me back</Button> <Button>Take me back</Button>
</Link> </Link>

Loading…
Cancel
Save