From 966e4cfd1189f7c115cfc552796c1353060d2125 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Tue, 24 Oct 2017 00:54:49 -0700 Subject: Change clickable area for account detail; change network dot size --- ui/app/components/wallet-view.js | 6 ++++-- ui/app/css/itcss/components/network.scss | 6 +++--- ui/app/css/itcss/components/newui-sections.scss | 8 +++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index 580ac54aa..215103396 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -112,8 +112,9 @@ WalletView.prototype.render = function () { h('div.wallet-view__keyring-label', isLoose ? 'IMPORTED' : ''), - h('div.flex-column.flex-center', { + h('div.flex-column.flex-center.wallet-view__name-container', { style: { margin: '0 auto' }, + onClick: showAccountDetailModal, }, [ h(Identicon, { diameter: 54, @@ -125,10 +126,11 @@ WalletView.prototype.render = function () { }, [ selectedIdentity.name, ]), + + h('button.wallet-view__details-button', 'DETAILS'), ]), ]), - h('button.wallet-view__details-button', { onClick: showAccountDetailModal }, 'DETAILS'), h('div.wallet-view__address', { onClick: () => copyToClipboard(selectedAddress) }, [ `${selectedAddress.slice(0, 4)}...${selectedAddress.slice(-4)}`, diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss index bb8c4eea8..77a6a393d 100644 --- a/ui/app/css/itcss/components/network.scss +++ b/ui/app/css/itcss/components/network.scss @@ -40,7 +40,7 @@ .dropdown-menu-item { .menu-icon-circle, .menu-icon-circle--active { - margin: 0 16px; + margin: 0 14px; } } @@ -116,8 +116,8 @@ .menu-icon-circle div, .menu-icon-circle--active div { - height: 17px; - width: 17px; + height: 12px; + width: 12px; border-radius: 17px; } diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index a78279084..c65ceb2db 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -54,7 +54,12 @@ $wallet-view-bg: $wild-sand; } .wallet-view-account-details { - flex: 0 0 150px; + flex: 0 0 auto; + } + + &__name-container { + flex: 0 0 auto; + cursor: pointer; } &__keyring-label { @@ -244,6 +249,7 @@ $wallet-view-bg: $wild-sand; line-height: 20px; color: $scorpion; margin-top: 8px; + margin-bottom: 24px; } // account options dropdown -- cgit