Position account icon, name, and caret

feature/default_network_editable
sdtsui 7 years ago
parent 29662ff7b4
commit ba50411bb2
  1. 19
      ui/app/components/account-dropdowns.js
  2. 52
      ui/app/components/wallet-view.js
  3. 21
      ui/app/css/itcss/components/newui-sections.scss

@ -218,16 +218,16 @@ class AccountDropdowns extends Component {
}, },
[ [
enableAccountsSelector && h( enableAccountsSelector && h(
// 'i.fa.fa-angle-down', 'i.fa.fa-angle-down',
'div.cursor-pointer.color-orange.accounts-selector', // 'div.cursor-pointer.color-orange.accounts-selector',
{ {
style: { style: {
// fontSize: '1.8em', // fontSize: '135%',
background: 'url(images/switch_acc.svg) white center center no-repeat', // background: 'url(images/switch_acc.svg) white center center no-repeat',
height: '25px', // height: '25px',
width: '25px', // width: '25px',
transform: 'scale(0.75)', // transform: 'scale(0.75)',
marginRight: '3px', // marginRight: '3px',
}, },
onClick: (event) => { onClick: (event) => {
event.stopPropagation() event.stopPropagation()
@ -243,8 +243,7 @@ class AccountDropdowns extends Component {
'i.fa.fa-ellipsis-h', 'i.fa.fa-ellipsis-h',
{ {
style: { style: {
marginRight: '0.5em', fontSize: '135%',
fontSize: '1.8em',
}, },
onClick: (event) => { onClick: (event) => {
event.stopPropagation() event.stopPropagation()

@ -13,6 +13,7 @@ function mapStateToProps (state) {
return { return {
network: state.metamask.network, network: state.metamask.network,
sidebarOpen: state.appState.sidebarOpen, sidebarOpen: state.appState.sidebarOpen,
identities: state.metamask.identities,
} }
} }
@ -32,7 +33,7 @@ const noop = () => {}
WalletView.prototype.render = function () { WalletView.prototype.render = function () {
const selected = '0x82df11beb942BEeeD58d466fCb0F0791365C7684' // TODO: remove fake address const selected = '0x82df11beb942BEeeD58d466fCb0F0791365C7684' // TODO: remove fake address
const { network, responsiveDisplayClassname, style } = this.props const { network, responsiveDisplayClassname, style, identities } = this.props
return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), { return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), {
style: {}, style: {},
@ -43,9 +44,29 @@ WalletView.prototype.render = function () {
style: {} style: {}
}, [ }, [
h('.identicon-wrapper.select-none', [ h('div.flex-row.account-options-menu', {
}, [
h(AccountDropdowns, {
// selected,
// network,
// identities: props.identities,
enableAccountOptions: true,
}, []),
]),
h('div.flex-column.flex-center', {
}, [
h('.identicon-wrapper.select-none', {
style: {
marginBottom: '1%',
},
}, [
h(Identicon, { h(Identicon, {
diameter: 24, diameter: 54,
address: selected, address: selected,
}), }),
]), ]),
@ -56,6 +77,31 @@ WalletView.prototype.render = function () {
'Account 1' 'Account 1'
]), ]),
// h(AccountDropdowns, {
// style: {
// // position: 'absolute',
// // left: '58.5%',
// // top: '10.25%',
// },
// selected,
// network,
// identities,
// enableAccountsSelector: true,
// }, []),
h('div.flex-column.flex-center,', {
style: {
position: 'absolute',
marginLeft: '42px',
marginTop: '-10px',
},
}, h('i.fa.fa-angle-down', {}, [])),
]),
// position: absolute;
// left: 58.5%;
// top: 10.25%;
h( h(
AccountDropdowns, AccountDropdowns,
{ {

@ -15,17 +15,27 @@
// tx view // tx view
.tx-view { .tx-view {
flex: 63.5 0 66.5%; flex: 63.5 0 66.5%;
background: '#FFFFFF'; // TODO: add to resuable colors background: #FFFFFF; // TODO: add to resuable colors
} }
// wallet view
.wallet-view { .wallet-view {
flex: 33.5 0 33.5%; flex: 33.5 0 33.5%;
background: #FAFAFA, // TODO: add to reusable colors background: #FAFAFA, // TODO: add to reusable colors
} }
// wallet view .account-options-menu {
align-items: center;
justify-content: flex-start;
margin: 5% 7%;
}
.wallet-view.sidebar { .wallet-view.sidebar {
flex: 1 0 230px; flex: 1 0 230px;
@ -118,6 +128,13 @@
// wallet view // wallet view
.account-name { .account-name {
@media screen and (max-width: 575px) {
font-size: 102%; font-size: 102%;
margin-left: 3%; margin-left: 3%;
}
@media screen and (max-width: 575px) {
text-align: center;
}
} }

Loading…
Cancel
Save