aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-03-16 00:47:25 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-03-16 00:47:25 +0800
commit4c947d466caba98b6fbb453dcb2132c32f4820ea (patch)
treefe89262b1c050de23afad335a9ed61fac09575f6 /ui
parentcd721f52cb29e5c43e69d7c6dfbf200c971973d8 (diff)
parent66193c823cdbb9474cbc3ed9e1c4ab7a28b9b230 (diff)
downloadtangerine-wallet-browser-4c947d466caba98b6fbb453dcb2132c32f4820ea.tar
tangerine-wallet-browser-4c947d466caba98b6fbb453dcb2132c32f4820ea.tar.gz
tangerine-wallet-browser-4c947d466caba98b6fbb453dcb2132c32f4820ea.tar.bz2
tangerine-wallet-browser-4c947d466caba98b6fbb453dcb2132c32f4820ea.tar.lz
tangerine-wallet-browser-4c947d466caba98b6fbb453dcb2132c32f4820ea.tar.xz
tangerine-wallet-browser-4c947d466caba98b6fbb453dcb2132c32f4820ea.tar.zst
tangerine-wallet-browser-4c947d466caba98b6fbb453dcb2132c32f4820ea.zip
Merge branch 'master' into retry-tx-refractor
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/modals/deposit-ether-modal.js10
-rw-r--r--ui/app/css/itcss/components/modal.scss10
2 files changed, 6 insertions, 14 deletions
diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js
index 26ff3ea03..23e8666af 100644
--- a/ui/app/components/modals/deposit-ether-modal.js
+++ b/ui/app/components/modals/deposit-ether-modal.js
@@ -128,13 +128,15 @@ DepositEtherModal.prototype.render = function () {
}),
]),
-
+
h('.page-container__content', {}, [
-
+
h('div.deposit-ether-modal__buy-rows', [
this.renderRow({
- logo: h('img.deposit-ether-modal__buy-row__eth-logo', { src: '../../../images/eth_logo.svg' }),
+ logo: h('img.deposit-ether-modal__logo', {
+ src: '../../../images/deposit-eth.svg',
+ }),
title: DIRECT_DEPOSIT_ROW_TITLE,
text: DIRECT_DEPOSIT_ROW_TEXT,
buttonLabel: t('viewAccount'),
@@ -164,7 +166,7 @@ DepositEtherModal.prototype.render = function () {
onButtonClick: () => toCoinbase(address),
hide: isTestNetwork || buyingWithShapeshift,
}),
-
+
this.renderRow({
logo: h('div.deposit-ether-modal__logo', {
style: {
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss
index 6c4106f8b..a8d5e8dc2 100644
--- a/ui/app/css/itcss/components/modal.scss
+++ b/ui/app/css/itcss/components/modal.scss
@@ -725,16 +725,6 @@
height: 60px;
}
- &__eth-logo {
- border-radius: 50%;
- height: 68px;
- width: 68px;
- border: 3px solid $tundora;
- z-index: 25;
- padding: 4px;
- background-color: #fff;
- }
-
&__right {
display: flex;
}