aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsdtsui <szehungdanieltsui@gmail.com>2017-08-07 13:30:27 +0800
committersdtsui <szehungdanieltsui@gmail.com>2017-08-07 13:30:27 +0800
commit0f140c5db59e72836ec437063314b39f33bae100 (patch)
tree6a4f0072401662778e9b0278892eb3af27ab658a
parentba50411bb2247d783667142cc5e7efff1bf839de (diff)
downloadtangerine-wallet-browser-0f140c5db59e72836ec437063314b39f33bae100.tar
tangerine-wallet-browser-0f140c5db59e72836ec437063314b39f33bae100.tar.gz
tangerine-wallet-browser-0f140c5db59e72836ec437063314b39f33bae100.tar.bz2
tangerine-wallet-browser-0f140c5db59e72836ec437063314b39f33bae100.tar.lz
tangerine-wallet-browser-0f140c5db59e72836ec437063314b39f33bae100.tar.xz
tangerine-wallet-browser-0f140c5db59e72836ec437063314b39f33bae100.tar.zst
tangerine-wallet-browser-0f140c5db59e72836ec437063314b39f33bae100.zip
Improve positioning of caret and add reusable color for wallet view
-rw-r--r--ui/app/components/wallet-view.js33
-rw-r--r--ui/app/css/itcss/components/newui-sections.scss4
-rw-r--r--ui/app/css/itcss/settings/variables.scss3
3 files changed, 16 insertions, 24 deletions
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index c96819ab9..ad84ee6a8 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -57,7 +57,10 @@ WalletView.prototype.render = function () {
]),
h('div.flex-column.flex-center', {
-
+ style: {
+ // constrains size of absolutely positioned wrappers
+ position: 'relative',
+ },
}, [
h('.identicon-wrapper.select-none', {
@@ -77,31 +80,19 @@ WalletView.prototype.render = function () {
'Account 1'
]),
- // h(AccountDropdowns, {
- // style: {
- // // position: 'absolute',
- // // left: '58.5%',
- // // top: '10.25%',
- // },
- // selected,
- // network,
- // identities,
- // enableAccountsSelector: true,
- // }, []),
- h('div.flex-column.flex-center,', {
+ h(AccountDropdowns, {
style: {
position: 'absolute',
- marginLeft: '42px',
- marginTop: '-10px',
+ left: '66.5%',
+ top: '19.5%',
},
- }, h('i.fa.fa-angle-down', {}, [])),
-
+ selected,
+ network,
+ identities,
+ enableAccountsSelector: true,
+ }, []),
]),
- // position: absolute;
- // left: 58.5%;
- // top: 10.25%;
-
h(
AccountDropdowns,
{
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss
index 684e998d5..d5ea8be1b 100644
--- a/ui/app/css/itcss/components/newui-sections.scss
+++ b/ui/app/css/itcss/components/newui-sections.scss
@@ -18,7 +18,7 @@
.tx-view {
flex: 63.5 0 66.5%;
- background: #FFFFFF; // TODO: add to resuable colors
+ background: $white; // TODO: add to resuable colors
}
@@ -26,7 +26,7 @@
.wallet-view {
flex: 33.5 0 33.5%;
- background: #FAFAFA, // TODO: add to reusable colors
+ background: $wild-sand,
}
.account-options-menu {
diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss
index 6d105f2e3..de363d99a 100644
--- a/ui/app/css/itcss/settings/variables.scss
+++ b/ui/app/css/itcss/settings/variables.scss
@@ -10,4 +10,5 @@ $tundora: #4A4A4A; // formerly 'borders/font/any gray'
$gallery: #EFEFEF;
$alabaster: #F7F7F7;
$shark: #22232C;
-$wild-sand: #F6F6F6; \ No newline at end of file
+$wild-sand: #F6F6F6;
+$white: #FFFFFF; \ No newline at end of file