aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2019-04-18 01:42:49 +0800
committerGitHub <noreply@github.com>2019-04-18 01:42:49 +0800
commit83f3e8ab983e420a25c14ae35398f80d740dae54 (patch)
tree3f66c23438b1208fefff4a7ba6332afd55127039
parent0db0a187c8f30dcf332cf4d41a2f957171b25630 (diff)
parent597c490928fc665d4329bf87ef791134df4c67bb (diff)
downloadtangerine-wallet-browser-83f3e8ab983e420a25c14ae35398f80d740dae54.tar
tangerine-wallet-browser-83f3e8ab983e420a25c14ae35398f80d740dae54.tar.gz
tangerine-wallet-browser-83f3e8ab983e420a25c14ae35398f80d740dae54.tar.bz2
tangerine-wallet-browser-83f3e8ab983e420a25c14ae35398f80d740dae54.tar.lz
tangerine-wallet-browser-83f3e8ab983e420a25c14ae35398f80d740dae54.tar.xz
tangerine-wallet-browser-83f3e8ab983e420a25c14ae35398f80d740dae54.tar.zst
tangerine-wallet-browser-83f3e8ab983e420a25c14ae35398f80d740dae54.zip
Merge pull request #6468 from chikeichan/network-indicator-style-fix
Fix switcher height when Custom RPC is selected or loading
-rw-r--r--ui/app/components/app/network.js11
-rw-r--r--ui/app/css/itcss/components/network.scss24
2 files changed, 24 insertions, 11 deletions
diff --git a/ui/app/components/app/network.js b/ui/app/components/app/network.js
index b438287e5..783fb36df 100644
--- a/ui/app/components/app/network.js
+++ b/ui/app/components/app/network.js
@@ -130,25 +130,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 5197f93e1..2c6ca2522 100644
--- a/ui/app/css/itcss/components/network.scss
+++ b/ui/app/css/itcss/components/network.scss
@@ -52,6 +52,11 @@
font-size: 12px;
padding: 0 4px;
}
+
+ .fa-question-circle {
+ margin: 0 4px 0 6px;
+ font-size: 1rem;
+ }
}
.network-name {
@@ -169,5 +174,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;
+ }
}