1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Flex account-data-subsection

This commit is contained in:
Dan 2017-12-08 14:49:59 -03:30 committed by Chi Kei Chan
parent 71d6403304
commit 70557e0448
3 changed files with 20 additions and 19 deletions

View File

@ -78,10 +78,9 @@ AccountDetailScreen.prototype.render = function () {
address: selected, address: selected,
}), }),
]), ]),
h('flex-column', { h('div.flex-column', {
style: { style: {
lineHeight: '10px', lineHeight: '10px',
marginLeft: '15px',
width: '100%', width: '100%',
}, },
}, [ }, [
@ -90,6 +89,9 @@ AccountDetailScreen.prototype.render = function () {
state: { state: {
isEditingLabel: false, isEditingLabel: false,
}, },
nameLabelStyle: {
marginLeft: '15px',
},
saveText: (text) => { saveText: (text) => {
props.dispatch(actions.saveAccountLabel(selected, text)) props.dispatch(actions.saveAccountLabel(selected, text))
}, },
@ -102,7 +104,7 @@ AccountDetailScreen.prototype.render = function () {
{ {
style: { style: {
display: 'flex', display: 'flex',
justifyContent: 'flex-start', justifyContent: 'space-between',
alignItems: 'center', alignItems: 'center',
}, },
}, },
@ -132,8 +134,6 @@ AccountDetailScreen.prototype.render = function () {
AccountDropdowns, AccountDropdowns,
{ {
style: { style: {
marginRight: '8px',
marginLeft: 'auto',
cursor: 'pointer', cursor: 'pointer',
}, },
selected, selected,
@ -147,7 +147,6 @@ AccountDetailScreen.prototype.render = function () {
]), ]),
h('.flex-row', { h('.flex-row', {
style: { style: {
width: '15em',
justifyContent: 'space-between', justifyContent: 'space-between',
alignItems: 'baseline', alignItems: 'baseline',
}, },
@ -164,6 +163,7 @@ AccountDetailScreen.prototype.render = function () {
fontSize: '13px', fontSize: '13px',
fontFamily: 'Montserrat Light', fontFamily: 'Montserrat Light',
textRendering: 'geometricPrecision', textRendering: 'geometricPrecision',
marginTop: '15px',
marginBottom: '15px', marginBottom: '15px',
color: '#AEAEAE', color: '#AEAEAE',
}, },
@ -191,7 +191,7 @@ AccountDetailScreen.prototype.render = function () {
}, },
}), }),
h('.flex-grow'), h('div', {}, [
h('button', { h('button', {
onClick: () => props.dispatch(actions.buyEthView(selected)), onClick: () => props.dispatch(actions.buyEthView(selected)),
@ -202,11 +202,12 @@ AccountDetailScreen.prototype.render = function () {
onClick: () => props.dispatch(actions.showSendPage()), onClick: () => props.dispatch(actions.showSendPage()),
style: { style: {
marginBottom: '20px', marginBottom: '20px',
marginRight: '8px',
}, },
}, 'SEND'), }, 'SEND'),
]), ]),
]),
]), ]),
// subview (tx history, pk export confirm, buy eth warning) // subview (tx history, pk export confirm, buy eth warning)

View File

@ -268,7 +268,6 @@ class AccountDropdowns extends Component {
'i.fa.fa-ellipsis-h', 'i.fa.fa-ellipsis-h',
{ {
style: { style: {
marginRight: '0.5em',
fontSize: '1.8em', fontSize: '1.8em',
}, },
onClick: (event) => { onClick: (event) => {

View File

@ -29,6 +29,7 @@ EditableLabel.prototype.render = function () {
]) ])
} else { } else {
return h('div.name-label', { return h('div.name-label', {
style: props.nameLabelStyle,
onClick: (event) => { onClick: (event) => {
const nameAttribute = event.target.getAttribute('name') const nameAttribute = event.target.getAttribute('name')
// checks for class to handle smaller CTA above the account name // checks for class to handle smaller CTA above the account name