From 597c490928fc665d4329bf87ef791134df4c67bb Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Tue, 16 Apr 2019 23:47:11 -0700 Subject: Fix switcher height when Custom RPC is selected or when network is loading --- ui/app/components/app/network.js | 11 +---------- ui/app/css/itcss/components/network.scss | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ui/app/components/app/network.js b/ui/app/components/app/network.js index 54065dd73..566f2a38e 100644 --- a/ui/app/components/app/network.js +++ b/ui/app/components/app/network.js @@ -116,25 +116,16 @@ Network.prototype.render = function () { default: return h('.network-indicator', [ networkNumber === 'loading' - ? h('span.pointer.network-indicator', { - style: { - display: 'flex', - alignItems: 'center', - flexDirection: 'row', - }, + ? h('span.pointer.network-loading-spinner', { onClick: (event) => this.props.onClick(event), }, [ h('img', { title: context.t('attemptingConnect'), - style: { - width: '27px', - }, src: 'images/loading.svg', }), ]) : h('i.fa.fa-question-circle.fa-lg', { style: { - margin: '10px', color: 'rgb(125, 128, 130)', }, }), diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss index c828a2b26..7ab6ceca0 100644 --- a/ui/app/css/itcss/components/network.scss +++ b/ui/app/css/itcss/components/network.scss @@ -48,6 +48,11 @@ font-size: 12px; padding: 0 4px; } + + .fa-question-circle { + margin: 0 4px 0 6px; + font-size: 1rem; + } } .network-name { @@ -165,5 +170,22 @@ } .network-caret { - margin: 0 8px 2px; + margin: 0 8px; +} + +.network-loading-spinner { + display: flex; + flex-flow: row nowrap; + align-items: center; + position: relative; + height: 16px; + width: 16px; + margin-left: 5px; + + img { + height: 26px; + position: absolute; + top: -5px; + left: -6px; + } } -- cgit