Merge pull request #32 from PortalNetwork/develop

v0.1.3
PortalNetwork · Oct 21, 2018 · c56681f · c56681f
2 parents b6d034b + e5ab23c
commit c56681f
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 38 deletions.
diff --git a/css/Connect.css b/css/Connect.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/App.js b/src/components/App.js
@@ -65,6 +65,10 @@ class App extends Component {
     this.fetchAccount(web3);
   }
 
+  async initError (error) {
+    console.log(error);
+  }
+
   footerOutFn = (isOut) =>{
     this.setState({isFooterOut: isOut})
   }

diff --git a/src/components/Clients/index.js b/src/components/Clients/index.js
@@ -10,7 +10,7 @@ const ClientsDiv = styled.div`
     height: auto;
     min-height: 600px;
     margin: 0px auto;
-    padding: 48px 20px 60px 20px;
+    padding: 20px 20px 20px 20px;
     background-color: #1f398f;
     box-sizing: border-box;
     @media screen and (max-width: 720px) {
@@ -23,9 +23,9 @@ class Clients extends Component {
             <ClientsDiv>
                 <Introduction/>
                 <div className="wallet">
-                    <a href="javascript:;" className="wallet_list"><img src={metamask} alt=""/><p>Metamask</p></a>
-                    <a href="javascript:;" className="wallet_list"><img src={status} alt=""/><p>Status</p></a>
-                    <a href="javascript:;" className="wallet_list"><img src={toshi} alt=""/><p>TOSHI</p></a>
+                    <a href="https://metamask.io/" target="_blank" className="wallet_list"><img src={metamask} alt=""/><p>Metamask</p></a>
+                    <a href="https://status.im/" target="_blank" className="wallet_list"><img src={status} alt=""/><p>Status</p></a>
+                    <a href="https://wallet.coinbase.com/" target="_blank" className="wallet_list"><img src={toshi} alt=""/><p>Coinbase Wallet</p></a>
                 </div>
             </ClientsDiv>
         )

diff --git a/src/components/Connect/Connect.css b/src/components/Connect/Connect.css
@@ -4,17 +4,17 @@
   height: auto;
   min-height: 600px;
   margin: 0px auto;
-  padding: 48px 20px 60px 20px;
+  padding: 10px 20px 10px 20px;
   background-color: #1f398f;
   box-sizing: border-box; }
   @media screen and (max-width: 720px) {
     .main {
       min-height: 500px; } }
 
 .introduction {
-  margin-bottom: 25px; }
+  margin-bottom: 10px; }
   .introduction .figure {
-    padding: 0px 0px 33px 0px; }
+    padding: 0px 0px 10px 0px; }
     .introduction .figure img {
       width: 100%; }
   .introduction h3 {

diff --git a/src/components/Connect/Connect.scss b/src/components/Connect/Connect.scss
@@ -4,18 +4,18 @@
 	height: auto;
 	min-height: 600px;
 	margin: 0px auto;
-	padding: 48px 20px 60px 20px;
+	padding: 10px 20px 10px 20px;
 	background-color: #1f398f;
 	box-sizing: border-box;
 	@media screen and (max-width: 720px) {
 	  min-height: 500px;
 	}
 }
 .introduction {
-	margin-bottom: 25px;
+	margin-bottom: 10px;
 
 	.figure {
-		padding: 0px 0px 33px 0px;
+		padding: 0px 0px 10px 0px;
 
 		img {
 			width: 100%;

diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
@@ -7,7 +7,7 @@ const Footer = styled.div`
     bottom: ${props => (props.isFooterOut ? '-250px' : '0px')};;
     left: 0;
     width: 100%;
-    height: 161px;
+    height: 100px;
     padding: 20px;
     box-sizing: border-box;
     background-color: #19307d;
@@ -20,7 +20,6 @@ const Content = styled.div`
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding-bottom: 25px;
 `;
 
 const Footertext = styled.p`

diff --git a/src/components/Introduction/index.js b/src/components/Introduction/index.js
@@ -2,13 +2,13 @@ import React, { Component } from 'react'
 import styled from 'styled-components';
 import landing from '../../images/landing.png';
 const Introduction = styled.div`
-	margin-bottom: 25px;
-    height: ${props => (props.isSeach ? '0px' : '198px')};
+	margin-bottom: 10px;
+    height: ${props => (props.isSeach ? '0px' : '180px')};
     transition: height .4s;
     overflow: hidden;
     img {
         width: 100%;
-        margin-bottom: 33px;
+        margin-bottom: 15px;
     }
     h3 {
         font-size: 16px;

diff --git a/src/components/SearchBar/SearchBar.js b/src/components/SearchBar/SearchBar.js
@@ -28,7 +28,7 @@ const Main = styled.div`
     height: auto;
     min-height: 600px;
     margin: 0px auto;
-    padding: 48px 20px 161px 20px;
+    padding: 10px 20px 161px 20px;
     background-color: #1f398f;
     box-sizing: border-box;
     @media screen and (max-width: 720px) {