aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-07-04 06:06:26 +0800
committerDan Finlay <dan@danfinlay.com>2017-07-04 06:06:26 +0800
commit4e4d6cea403373e7f7d493775981cfa2a97da5f4 (patch)
tree31440e00a9d9e42252c2f6ae149984ab3b0b89bc
parentfa533469cb6ddc5b5142afed2b4950565494d5a0 (diff)
downloadtangerine-wallet-browser-4e4d6cea403373e7f7d493775981cfa2a97da5f4.tar
tangerine-wallet-browser-4e4d6cea403373e7f7d493775981cfa2a97da5f4.tar.gz
tangerine-wallet-browser-4e4d6cea403373e7f7d493775981cfa2a97da5f4.tar.bz2
tangerine-wallet-browser-4e4d6cea403373e7f7d493775981cfa2a97da5f4.tar.lz
tangerine-wallet-browser-4e4d6cea403373e7f7d493775981cfa2a97da5f4.tar.xz
tangerine-wallet-browser-4e4d6cea403373e7f7d493775981cfa2a97da5f4.tar.zst
tangerine-wallet-browser-4e4d6cea403373e7f7d493775981cfa2a97da5f4.zip
Add menu carrat next to network searching indicator
-rw-r--r--ui/app/app.js24
-rw-r--r--ui/app/components/network.js23
2 files changed, 25 insertions, 22 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 8bf69b5ad..ce543a082 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -136,7 +136,7 @@ App.prototype.renderAppBar = function () {
},
}, [
- h('div', {
+ h('div.left-menu-section', {
style: {
display: 'flex',
flexDirection: 'row',
@@ -151,21 +151,15 @@ App.prototype.renderAppBar = function () {
src: '/images/icon-128.png',
}),
- h('#network-spacer.flex-center', {
- style: {
- marginRight: '-72px',
+ h(NetworkIndicator, {
+ network: this.props.network,
+ provider: this.props.provider,
+ onClick: (event) => {
+ event.preventDefault()
+ event.stopPropagation()
+ this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen })
},
- }, [
- h(NetworkIndicator, {
- network: this.props.network,
- provider: this.props.provider,
- onClick: (event) => {
- event.preventDefault()
- event.stopPropagation()
- this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen })
- },
- }),
- ]),
+ }),
]),
// metamask name
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index 31a8fc17c..d5d3e18cd 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -22,15 +22,24 @@ Network.prototype.render = function () {
let iconName, hoverText
if (networkNumber === 'loading') {
- return h('img.network-indicator', {
- title: 'Attempting to connect to blockchain.',
- onClick: (event) => this.props.onClick(event),
+ return h('span', {
style: {
- width: '27px',
- marginRight: '-27px',
+ display: 'flex',
+ alignItems: 'center',
+ flexDirection: 'row',
},
- src: 'images/loading.svg',
- })
+ onClick: (event) => this.props.onClick(event),
+ }, [
+ h('img', {
+ title: 'Attempting to connect to blockchain.',
+ style: {
+ width: '27px',
+ },
+ src: 'images/loading.svg',
+ }),
+ h('i.fa.fa-sort-desc'),
+ ])
+
} else if (providerName === 'mainnet') {
hoverText = 'Main Ethereum Network'
iconName = 'ethereum-network'