From 5252504e3f1b8437d6152861f06ee490f723276e Mon Sep 17 00:00:00 2001 From: Frankie Date: Thu, 30 Jun 2016 11:15:32 -0700 Subject: WIP: Working on new layout --- ui/app/components/eth-balance.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'ui/app/components') diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index 710d4fc8b..279feba35 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -24,8 +24,24 @@ EthBalanceComponent.prototype.render = function () { style: { display: 'inline', }, - }, value), + }, this.renderBalance(value)), ]) ) } + +EthBalanceComponent.prototype.renderBalance = function (value) { + + if (value === 'None') return value + + var balance = value[0] + var label = value[1] + + return ( + h('.flex-column',[ + h('div', balance), + h('div', label) + ]) + ) + +} -- cgit v1.2.3 From 42cd0b69e76537022c7766cae430e496371818b6 Mon Sep 17 00:00:00 2001 From: Frankie Date: Thu, 30 Jun 2016 12:43:28 -0700 Subject: Implemt new account layout --- ui/app/components/eth-balance.js | 22 ++++++++++++++++------ ui/app/components/transaction-list.js | 5 +++-- 2 files changed, 19 insertions(+), 8 deletions(-) (limited to 'ui/app/components') diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index 279feba35..c7240ea21 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -29,19 +29,29 @@ EthBalanceComponent.prototype.render = function () { ) } - EthBalanceComponent.prototype.renderBalance = function (value) { if (value === 'None') return value - var balance = value[0] - var label = value[1] + var balance = value.split(' ')[0] + var label = value.split(' ')[1] return ( - h('.flex-column',[ + h('.flex-column', { + style: { + alignItems: 'flex-end', + lineHeight: '13px', + fontFamily: 'Montserrat Thin', + textRendering: 'geometricPrecision', + }, + }, [ h('div', balance), - h('div', label) + h('div', { + style: { + color: ' #AEAEAE', + fontSize: '12px', + }, + }, label), ]) ) - } diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index a1a5db475..886aa7c00 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -35,6 +35,8 @@ TransactionList.prototype.render = function () { style: { background: '#EBEBEB', color: '#AEAEAE', + paddingTop: '4px', + paddingBottom: '4px', }, }, [ 'Transactions', @@ -43,7 +45,7 @@ TransactionList.prototype.render = function () { h('.tx-list', { style: { overflowY: 'auto', - height: '204px', + height: '305px', padding: '0 20px', textAlign: 'center', }, @@ -67,4 +69,3 @@ TransactionList.prototype.render = function () { ]) ) } - -- cgit v1.2.3