From 5da7f3fa1aee8657fcf69b51e08e182a8e6f2e86 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 7 Jan 2019 14:37:09 +0100 Subject: [PATCH 1/2] Moved icons to shared folder, added correct icons to dashboard --- src/components/images/CoinLogo/index.js | 2 +- .../CoinLogo/images => images/coins}/ada.png | Bin .../CoinLogo/images => images/coins}/bch.png | Bin .../CoinLogo/images => images/coins}/btc.png | Bin .../CoinLogo/images => images/coins}/btg.png | Bin .../CoinLogo/images => images/coins}/dash.png | Bin .../CoinLogo/images => images/coins}/dgb.png | Bin .../CoinLogo/images => images/coins}/doge.png | Bin .../CoinLogo/images => images/coins}/etc.png | Bin .../CoinLogo/images => images/coins}/eth.png | Bin .../CoinLogo/images => images/coins}/ltc.png | Bin .../CoinLogo/images => images/coins}/nem.png | Bin .../CoinLogo/images => images/coins}/nmc.png | Bin .../images => images/coins}/rinkeby.png | Bin .../CoinLogo/images => images/coins}/trop.png | Bin .../CoinLogo/images => images/coins}/txrp.png | Bin .../CoinLogo/images => images/coins}/vtc.png | Bin .../CoinLogo/images => images/coins}/xem.png | Bin .../CoinLogo/images => images/coins}/xlm.png | Bin .../CoinLogo/images => images/coins}/xrp.png | Bin .../CoinLogo/images => images/coins}/zec.png | Bin src/views/Wallet/views/Dashboard/index.js | 25 ++++++++++++++++-- 22 files changed, 24 insertions(+), 3 deletions(-) rename src/{components/images/CoinLogo/images => images/coins}/ada.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/bch.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/btc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/btg.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/dash.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/dgb.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/doge.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/etc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/eth.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/ltc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/nem.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/nmc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/rinkeby.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/trop.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/txrp.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/vtc.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/xem.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/xlm.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/xrp.png (100%) rename src/{components/images/CoinLogo/images => images/coins}/zec.png (100%) diff --git a/src/components/images/CoinLogo/index.js b/src/components/images/CoinLogo/index.js index ae03c897..0cca9ba0 100644 --- a/src/components/images/CoinLogo/index.js +++ b/src/components/images/CoinLogo/index.js @@ -34,7 +34,7 @@ class CoinLogo extends PureComponent { ); diff --git a/src/components/images/CoinLogo/images/ada.png b/src/images/coins/ada.png similarity index 100% rename from src/components/images/CoinLogo/images/ada.png rename to src/images/coins/ada.png diff --git a/src/components/images/CoinLogo/images/bch.png b/src/images/coins/bch.png similarity index 100% rename from src/components/images/CoinLogo/images/bch.png rename to src/images/coins/bch.png diff --git a/src/components/images/CoinLogo/images/btc.png b/src/images/coins/btc.png similarity index 100% rename from src/components/images/CoinLogo/images/btc.png rename to src/images/coins/btc.png diff --git a/src/components/images/CoinLogo/images/btg.png b/src/images/coins/btg.png similarity index 100% rename from src/components/images/CoinLogo/images/btg.png rename to src/images/coins/btg.png diff --git a/src/components/images/CoinLogo/images/dash.png b/src/images/coins/dash.png similarity index 100% rename from src/components/images/CoinLogo/images/dash.png rename to src/images/coins/dash.png diff --git a/src/components/images/CoinLogo/images/dgb.png b/src/images/coins/dgb.png similarity index 100% rename from src/components/images/CoinLogo/images/dgb.png rename to src/images/coins/dgb.png diff --git a/src/components/images/CoinLogo/images/doge.png b/src/images/coins/doge.png similarity index 100% rename from src/components/images/CoinLogo/images/doge.png rename to src/images/coins/doge.png diff --git a/src/components/images/CoinLogo/images/etc.png b/src/images/coins/etc.png similarity index 100% rename from src/components/images/CoinLogo/images/etc.png rename to src/images/coins/etc.png diff --git a/src/components/images/CoinLogo/images/eth.png b/src/images/coins/eth.png similarity index 100% rename from src/components/images/CoinLogo/images/eth.png rename to src/images/coins/eth.png diff --git a/src/components/images/CoinLogo/images/ltc.png b/src/images/coins/ltc.png similarity index 100% rename from src/components/images/CoinLogo/images/ltc.png rename to src/images/coins/ltc.png diff --git a/src/components/images/CoinLogo/images/nem.png b/src/images/coins/nem.png similarity index 100% rename from src/components/images/CoinLogo/images/nem.png rename to src/images/coins/nem.png diff --git a/src/components/images/CoinLogo/images/nmc.png b/src/images/coins/nmc.png similarity index 100% rename from src/components/images/CoinLogo/images/nmc.png rename to src/images/coins/nmc.png diff --git a/src/components/images/CoinLogo/images/rinkeby.png b/src/images/coins/rinkeby.png similarity index 100% rename from src/components/images/CoinLogo/images/rinkeby.png rename to src/images/coins/rinkeby.png diff --git a/src/components/images/CoinLogo/images/trop.png b/src/images/coins/trop.png similarity index 100% rename from src/components/images/CoinLogo/images/trop.png rename to src/images/coins/trop.png diff --git a/src/components/images/CoinLogo/images/txrp.png b/src/images/coins/txrp.png similarity index 100% rename from src/components/images/CoinLogo/images/txrp.png rename to src/images/coins/txrp.png diff --git a/src/components/images/CoinLogo/images/vtc.png b/src/images/coins/vtc.png similarity index 100% rename from src/components/images/CoinLogo/images/vtc.png rename to src/images/coins/vtc.png diff --git a/src/components/images/CoinLogo/images/xem.png b/src/images/coins/xem.png similarity index 100% rename from src/components/images/CoinLogo/images/xem.png rename to src/images/coins/xem.png diff --git a/src/components/images/CoinLogo/images/xlm.png b/src/images/coins/xlm.png similarity index 100% rename from src/components/images/CoinLogo/images/xlm.png rename to src/images/coins/xlm.png diff --git a/src/components/images/CoinLogo/images/xrp.png b/src/images/coins/xrp.png similarity index 100% rename from src/components/images/CoinLogo/images/xrp.png rename to src/images/coins/xrp.png diff --git a/src/components/images/CoinLogo/images/zec.png b/src/images/coins/zec.png similarity index 100% rename from src/components/images/CoinLogo/images/zec.png rename to src/images/coins/zec.png diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index ea4dfc35..a3ea3bbb 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -3,8 +3,10 @@ import styled from 'styled-components'; import { connect } from 'react-redux'; import Content from 'views/Wallet/components/Content'; +import EthIcon from 'images/coins/eth.png'; +import RippleIcon from 'images/coins/xrp.png'; + import { H2 } from 'components/Heading'; -import DashboardImg from 'images/dashboard.png'; const Wrapper = styled.div` display: flex; @@ -25,6 +27,22 @@ const P = styled.p` text-align: center; `; +const Overlay = styled.div` + display: flex; + width: 100%; + height: 40px; + justify-content: center; + align-items: center; + opacity: 0.2; + background: white; +`; + +const Image = styled.img``; + +const EthImage = styled(Image)` + margin-right: 10px; +`; + const Dashboard = () => ( @@ -32,7 +50,10 @@ const Dashboard = () => (

Please select your coin

You will gain access to receiving & sending selected coin

- Dashboard + + + +
From e78e276d1e78f089f40bb4e84a55386e5af10a3f Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 7 Jan 2019 15:56:11 +0100 Subject: [PATCH 2/2] Better margin --- src/views/Wallet/views/Dashboard/index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index 77f61ecd..42c75d13 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -38,10 +38,12 @@ const Overlay = styled.div` background: white; `; -const Image = styled.img``; - -const EthImage = styled(Image)` +const Image = styled.img` margin-right: 10px; + + &:last-child { + margin-right: 0px; + } `; const Dashboard = () => ( @@ -51,7 +53,7 @@ const Dashboard = () => (

Please select your coin

You will gain access to receiving & sending selected coin - +