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

Prevent loading screen from overlaying the app bar (#4417)

Browse Source
This commit is contained in:
Alexander Tseung 2018-05-30 10:38:53 -07:00 committed by GitHub
parent b5c91d240b
commit 389346913b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/app/app.js
View File

@ -137,7 +137,6 @@ class App extends Component {
(isLoading || isLoadingNetwork) && h(Loading, { (isLoading || isLoadingNetwork) && h(Loading, {
loadingMessage: loadMessage, loadingMessage: loadMessage,
fullScreen: true,
}), }),
// content // content

6
ui/app/components/loading-screen/loading-screen.component.js
View File

@ -1,7 +1,6 @@
const { Component } = require('react') const { Component } = require('react')
const h = require('react-hyperscript') const h = require('react-hyperscript')
const PropTypes = require('prop-types') const PropTypes = require('prop-types')
const classnames = require('classnames')
const Spinner = require('../spinner') const Spinner = require('../spinner')
class LoadingScreen extends Component { class LoadingScreen extends Component {
@ -12,9 +11,7 @@ class LoadingScreen extends Component {
render () { render () {
return ( return (
h('.loading-overlay', { h('.loading-overlay', [
className: classnames({ 'loading-overlay--full-screen': this.props.fullScreen }),
}, [
h('.loading-overlay__container', [ h('.loading-overlay__container', [
h(Spinner, { h(Spinner, {
color: '#F7C06C', color: '#F7C06C',
@ -29,7 +26,6 @@ class LoadingScreen extends Component {
LoadingScreen.propTypes = { LoadingScreen.propTypes = {
loadingMessage: PropTypes.string, loadingMessage: PropTypes.string,
fullScreen: PropTypes.bool,
} }
module.exports = LoadingScreen module.exports = LoadingScreen

5
ui/app/components/pending-tx/index.js
View File

@ -130,7 +130,6 @@ PendingTx.prototype.render = function () {
if (isFetching) { if (isFetching) {
return h(Loading, { return h(Loading, {
fullScreen: true,
loadingMessage: this.context.t('generatingTransaction'), loadingMessage: this.context.t('generatingTransaction'),
}) })
} }
@ -157,9 +156,7 @@ PendingTx.prototype.render = function () {
sendTransaction, sendTransaction,
}) })
default: default:
return h(Loading, { return h(Loading)
fullScreen: true,
})
} }
} }

4
ui/app/css/itcss/components/loading-overlay.scss
View File

@ -11,8 +11,8 @@
background: rgba(255, 255, 255, .8); background: rgba(255, 255, 255, .8);
@media screen and (max-width: 575px) { @media screen and (max-width: 575px) {
margin-top: 56px; margin-top: 66px;
height: calc(100% - 56px); height: calc(100% - 66px);
} }
@media screen and (min-width: 576px) { @media screen and (min-width: 576px) {