Merge pull request #304 from trezor/fix/unify-paddings

Fix/unify wallet views paddings

src/views/Wallet/components/Content/components/FirmwareUnsupported/index.js

@@ -3,8 +3,8 @@ import React from 'react';
 import styled from 'styled-components';
 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 Link from 'components/Link';
 import CoinLogo from 'components/images/CoinLogo';
@@ -39,21 +39,17 @@ const StyledCoinLogo = styled(CoinLogo)`
     width: 32px;
 `;
 
-const StyledLink = styled(Link)`
-    padding-top: 24px;
-`;
-
 const Row = styled.div`
-    flex: 1;
     display: flex;
+    padding: 50px 0;
+    
     flex-direction: column;
-    justify-content: 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;
 `;
 
@@ -61,11 +57,11 @@ const FirmwareUnsupported = (props: Props) => (
     <Wrapper>
         <Row>
             {props.networkShortcut && <CoinLogoWrapper><StyledCoinLogo standalone network={props.networkShortcut} /></CoinLogoWrapper>}
-            <H2>{props.title}</H2>
+            <H1>{props.title}</H1>
             <Message>{props.message}</Message>
-            <StyledLink href={getInfoUrl(props.networkShortcut)}>
+            <Link href={getInfoUrl(props.networkShortcut)}>
                 <Button>Find out more info</Button>
-            </StyledLink>
+            </Link>
         </Row>
     </Wrapper>
 );

src/views/Wallet/views/Bootloader/index.js

@@ -1,30 +1,32 @@
 import React from 'react';
 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';
 
 const Wrapper = styled.div`
     display: flex;
     flex-direction: column;
+    padding: 40px 35px 40px 35px;
 `;
 
 const Row = styled.div`
     display: flex;
     flex-direction: column;
     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;
 `;
 
 const Bootloader = () => (
     <Wrapper>
         <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>
     </Wrapper>
 );

src/views/Wallet/views/Dashboard/index.js

@@ -3,7 +3,8 @@ import styled from 'styled-components';
 import { connect } from 'react-redux';
 import Content from 'views/Wallet/components/Content';
 
-import { H2 } from 'components/Heading';
+import { H1 } from 'components/Heading';
+import Paragraph from 'components/Paragraph';
 import DashboardImg from 'images/dashboard.png';
 
 const Wrapper = styled.div`
@@ -14,24 +15,23 @@ const Wrapper = styled.div`
 const Row = styled.div`
     flex: 1;
     display: flex;
-    padding: 100px 48px;
+    padding: 50px 0;
     
     flex-direction: column;
     align-items: center;
 `;
 
-const P = styled.p`
+const StyledP = styled(Paragraph)`
-    padding: 24px 0px;
+    padding: 0 0 15px 0;
     text-align: center;
 `;
 
 const Dashboard = () => (
     <Content>
         <Wrapper>
-            <H2>Dashboard</H2>
             <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>
                 <img src={DashboardImg} height="34" width="auto" alt="Dashboard" />
             </Row>
         </Wrapper>

src/views/Wallet/views/DeviceSettings/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
-import { H2 } from 'components/Heading';
+import { H1 } from 'components/Heading';
 import Icon from 'components/Icon';
 import colors from 'config/colors';
 import Button from 'components/Button';
@@ -20,11 +20,11 @@ const Row = styled.div`
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 100px 48px;
+    padding: 50px 0;
 `;
 
 const StyledP = styled(P)`
-    padding: 10px 0 15px 0;
+    padding: 0 0 15px 0;
     text-align: center;
 `;
 
@@ -37,8 +37,8 @@ const DeviceSettings = () => (
                     color={colors.WARNING_PRIMARY}
                     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/">
                     <Button>Take me to the Bitcoin wallet</Button>
                 </Link>

src/views/Wallet/views/FirmwareUpdate/index.js

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

src/views/Wallet/views/Initialize/index.js

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

src/views/Wallet/views/Seedless/index.js

@@ -1,31 +1,32 @@
 import styled from 'styled-components';
-import { H2 } from 'components/Heading';
+import { H1 } from 'components/Heading';
 import Paragraph from 'components/Paragraph';
 import React from 'react';
 import { connect } from 'react-redux';
 
+
 const Wrapper = styled.div`
     display: flex;
     flex-direction: column;
+    padding: 40px 35px 40px 35px;
 `;
 
 const Row = styled.div`
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 100px 48px;
+    padding: 50px 0;
 `;
 
 const StyledParagraph = styled(Paragraph)`
-    margin: 10px 50px;
+    padding: 0 0 15px 0;
-    display: block;
     text-align: center;
 `;
 
 const Seedless = () => (
     <Wrapper>
         <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>
         </Row>
     </Wrapper>

src/views/Wallet/views/WalletSettings/index.js

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