aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@users.noreply.github.com>2018-05-31 01:38:53 +0800
committerGitHub <noreply@github.com>2018-05-31 01:38:53 +0800
commit389346913bf076fde6190a61afc4e3e4cd210afc (patch)
tree48340bd579c409ce0313696bbcc9c055dbb9cb3d
parentb5c91d240bd111cec07bc40dd26cfb1741e88d62 (diff)
downloadtangerine-wallet-browser-389346913bf076fde6190a61afc4e3e4cd210afc.tar
tangerine-wallet-browser-389346913bf076fde6190a61afc4e3e4cd210afc.tar.gz
tangerine-wallet-browser-389346913bf076fde6190a61afc4e3e4cd210afc.tar.bz2
tangerine-wallet-browser-389346913bf076fde6190a61afc4e3e4cd210afc.tar.lz
tangerine-wallet-browser-389346913bf076fde6190a61afc4e3e4cd210afc.tar.xz
tangerine-wallet-browser-389346913bf076fde6190a61afc4e3e4cd210afc.tar.zst
tangerine-wallet-browser-389346913bf076fde6190a61afc4e3e4cd210afc.zip
Prevent loading screen from overlaying the app bar (#4417)
-rw-r--r--ui/app/app.js1
-rw-r--r--ui/app/components/loading-screen/loading-screen.component.js6
-rw-r--r--ui/app/components/pending-tx/index.js5
-rw-r--r--ui/app/css/itcss/components/loading-overlay.scss4
4 files changed, 4 insertions, 12 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index aa2b24422..0e8b907df 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -137,7 +137,6 @@ class App extends Component {
(isLoading || isLoadingNetwork) && h(Loading, {
loadingMessage: loadMessage,
- fullScreen: true,
}),
// content
diff --git a/ui/app/components/loading-screen/loading-screen.component.js b/ui/app/components/loading-screen/loading-screen.component.js
index bce2a4aac..6b843cfee 100644
--- a/ui/app/components/loading-screen/loading-screen.component.js
+++ b/ui/app/components/loading-screen/loading-screen.component.js
@@ -1,7 +1,6 @@
const { Component } = require('react')
const h = require('react-hyperscript')
const PropTypes = require('prop-types')
-const classnames = require('classnames')
const Spinner = require('../spinner')
class LoadingScreen extends Component {
@@ -12,9 +11,7 @@ class LoadingScreen extends Component {
render () {
return (
- h('.loading-overlay', {
- className: classnames({ 'loading-overlay--full-screen': this.props.fullScreen }),
- }, [
+ h('.loading-overlay', [
h('.loading-overlay__container', [
h(Spinner, {
color: '#F7C06C',
@@ -29,7 +26,6 @@ class LoadingScreen extends Component {
LoadingScreen.propTypes = {
loadingMessage: PropTypes.string,
- fullScreen: PropTypes.bool,
}
module.exports = LoadingScreen
diff --git a/ui/app/components/pending-tx/index.js b/ui/app/components/pending-tx/index.js
index 893538bcf..3f8cd8823 100644
--- a/ui/app/components/pending-tx/index.js
+++ b/ui/app/components/pending-tx/index.js
@@ -130,7 +130,6 @@ PendingTx.prototype.render = function () {
if (isFetching) {
return h(Loading, {
- fullScreen: true,
loadingMessage: this.context.t('generatingTransaction'),
})
}
@@ -157,9 +156,7 @@ PendingTx.prototype.render = function () {
sendTransaction,
})
default:
- return h(Loading, {
- fullScreen: true,
- })
+ return h(Loading)
}
}
diff --git a/ui/app/css/itcss/components/loading-overlay.scss b/ui/app/css/itcss/components/loading-overlay.scss
index c18b7fa59..b07d6af17 100644
--- a/ui/app/css/itcss/components/loading-overlay.scss
+++ b/ui/app/css/itcss/components/loading-overlay.scss
@@ -11,8 +11,8 @@
background: rgba(255, 255, 255, .8);
@media screen and (max-width: 575px) {
- margin-top: 56px;
- height: calc(100% - 56px);
+ margin-top: 66px;
+ height: calc(100% - 66px);
}
@media screen and (min-width: 576px) {