m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #6468 from chikeichan/network-indicator-style-fix

Browse Source 
Fix switcher height when Custom RPC is selected or loading
This commit is contained in:
Thomas Huang 2019-04-17 12:42:49 -05:00 committed by GitHub
commit 83f3e8ab98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/app/components/app/network.js
View File

@ -130,25 +130,16 @@ Network.prototype.render = function () {
default: default:
return h('.network-indicator', [ return h('.network-indicator', [
networkNumber === 'loading' networkNumber === 'loading'
? h('span.pointer.network-indicator', { ? h('span.pointer.network-loading-spinner', {
style: {
display: 'flex',
alignItems: 'center',
flexDirection: 'row',
},
onClick: (event) => this.props.onClick(event), onClick: (event) => this.props.onClick(event),
}, [ }, [
h('img', { h('img', {
title: context.t('attemptingConnect'), title: context.t('attemptingConnect'),
style: {
width: '27px',
},
src: 'images/loading.svg', src: 'images/loading.svg',
}), }),
]) ])
: h('i.fa.fa-question-circle.fa-lg', { : h('i.fa.fa-question-circle.fa-lg', {
style: { style: {
margin: '10px',
color: 'rgb(125, 128, 130)', color: 'rgb(125, 128, 130)',
}, },
}), }),

24
ui/app/css/itcss/components/network.scss
View File

@ -52,6 +52,11 @@
font-size: 12px; font-size: 12px;
padding: 0 4px; padding: 0 4px;
} }
.fa-question-circle {
margin: 0 4px 0 6px;
font-size: 1rem;
}
} }
.network-name { .network-name {
@ -169,5 +174,22 @@
} }
.network-caret { .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;
}
} }