aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorWhymarrh Whitby <whymarrh.whitby@gmail.com>2018-09-20 02:22:39 +0800
committerWhymarrh Whitby <whymarrh.whitby@gmail.com>2018-09-20 02:33:16 +0800
commitfbf14cd130c6f7f73697fad28730da485cb7c946 (patch)
treee276cc370096a45a289b71968853ceb582072ede /ui/app/app.js
parent4c376695573ea2372e25b1a14ed31edb5f613d2d (diff)
downloadtangerine-wallet-browser-fbf14cd130c6f7f73697fad28730da485cb7c946.tar
tangerine-wallet-browser-fbf14cd130c6f7f73697fad28730da485cb7c946.tar.gz
tangerine-wallet-browser-fbf14cd130c6f7f73697fad28730da485cb7c946.tar.bz2
tangerine-wallet-browser-fbf14cd130c6f7f73697fad28730da485cb7c946.tar.lz
tangerine-wallet-browser-fbf14cd130c6f7f73697fad28730da485cb7c946.tar.xz
tangerine-wallet-browser-fbf14cd130c6f7f73697fad28730da485cb7c946.tar.zst
tangerine-wallet-browser-fbf14cd130c6f7f73697fad28730da485cb7c946.zip
Prevent loading screen from overlaying the app bar
Refs #4417 This change is functional copy of 3893469 that solves the problem in a way that doesn't depend on the height of the app bar since the app bar isn't a fixed height in the smaller views.
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index c93f93e75..7c92bcf74 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -152,12 +152,14 @@ class App extends Component {
h(AccountMenu),
- (isLoading || isLoadingNetwork) && h(Loading, {
- loadingMessage: loadMessage,
- }),
-
- // content
- this.renderRoutes(),
+ h('div.main-container', [
+ (isLoading || isLoadingNetwork) && h(Loading, {
+ loadingMessage: loadMessage,
+ }),
+
+ // content
+ this.renderRoutes(),
+ ]),
])
)
}