aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-10-24 15:13:49 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-24 15:13:49 +0800
commit4401800a42eccbd77f11b332e1052431328401bb (patch)
treed5ff4c3e0938f9285ed76ab57e09a6f9fb474392 /ui/app
parenta63373401b9983b991d4b2a0e28eec8d66c18e78 (diff)
downloadtangerine-wallet-browser-4401800a42eccbd77f11b332e1052431328401bb.tar
tangerine-wallet-browser-4401800a42eccbd77f11b332e1052431328401bb.tar.gz
tangerine-wallet-browser-4401800a42eccbd77f11b332e1052431328401bb.tar.bz2
tangerine-wallet-browser-4401800a42eccbd77f11b332e1052431328401bb.tar.lz
tangerine-wallet-browser-4401800a42eccbd77f11b332e1052431328401bb.tar.xz
tangerine-wallet-browser-4401800a42eccbd77f11b332e1052431328401bb.tar.zst
tangerine-wallet-browser-4401800a42eccbd77f11b332e1052431328401bb.zip
Account menu white check mark
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/account-menu/index.js6
-rw-r--r--ui/app/components/tx-view.js7
-rw-r--r--ui/app/css/itcss/components/account-menu.scss11
-rw-r--r--ui/app/css/itcss/components/newui-sections.scss4
4 files changed, 20 insertions, 8 deletions
diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index 45e39e8ba..da2c86233 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -98,14 +98,14 @@ AccountMenu.prototype.renderAccounts = function () {
const {
identities,
accounts,
- selected,
+ selectedAddress,
keyrings,
showAccountDetail,
} = this.props
return Object.keys(identities).map((key, index) => {
const identity = identities[key]
- const isSelected = identity.address === selected
+ const isSelected = identity.address === selectedAddress
const balanceValue = accounts[key] ? accounts[key].balance : ''
const formattedBalance = balanceValue ? formatBalance(balanceValue, 6) : '...'
@@ -121,7 +121,7 @@ AccountMenu.prototype.renderAccounts = function () {
{ onClick: () => showAccountDetail(identity.address) },
[
h('div.account-menu__check-mark', [
- isSelected ? h('i.fa.fa-check') : null,
+ isSelected ? h('div.account-menu__check-mark-icon') : null,
]),
h(
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js
index d903998c0..ebef22680 100644
--- a/ui/app/components/tx-view.js
+++ b/ui/app/components/tx-view.js
@@ -109,14 +109,15 @@ TxView.prototype.render = function () {
margin: '1em 0.9em',
alignItems: 'center',
},
- onClick: () => {
- this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
- },
}, [
h('div.fa.fa-bars', {
style: {
fontSize: '1.3em',
+ cursor: 'pointer',
+ },
+ onClick: () => {
+ this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
},
}, []),
diff --git a/ui/app/css/itcss/components/account-menu.scss b/ui/app/css/itcss/components/account-menu.scss
index 72cb29ce8..91884e658 100644
--- a/ui/app/css/itcss/components/account-menu.scss
+++ b/ui/app/css/itcss/components/account-menu.scss
@@ -90,9 +90,20 @@
&__check-mark {
width: 14px;
+ margin-right: 12px;
flex: 0 0 auto;
}
+ &__check-mark-icon {
+ background-image: url("images/check-white.svg");
+ height: 18px;
+ width: 18px;
+ background-repeat: no-repeat;
+ background-position: center;
+ background-size: contain;
+ margin: 3px 0;
+ }
+
.identicon {
margin: 0 12px 0 0;
flex: 0 0 auto;
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss
index 396dacae6..f86decab3 100644
--- a/ui/app/css/itcss/components/newui-sections.scss
+++ b/ui/app/css/itcss/components/newui-sections.scss
@@ -101,8 +101,8 @@ $wallet-view-bg: $wild-sand;
font-size: 40px;
color: $tundora;
position: absolute;
- top: 15px;
- left: 15px;
+ top: 12px;
+ left: 12px;
cursor: pointer;
}
}