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

Browse Source 
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.
This commit is contained in:
Whymarrh Whitby 2018-09-19 15:52:39 -02:30
parent 4c37669557
commit fbf14cd130
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/app/app.js
View File

@ -152,12 +152,14 @@ class App extends Component {
h(AccountMenu), h(AccountMenu),
(isLoading || isLoadingNetwork) && h(Loading, { h('div.main-container', [
loadingMessage: loadMessage, (isLoading || isLoadingNetwork) && h(Loading, {
}), loadingMessage: loadMessage,
}),
// content // content
this.renderRoutes(), this.renderRoutes(),
]),
]) ])
) )
} }

2
ui/app/components/page-container/index.scss
View File

@ -182,5 +182,7 @@
max-height: 82vh; max-height: 82vh;
min-height: 570px; min-height: 570px;
flex: 0 0 auto; flex: 0 0 auto;
margin-right: auto;
margin-left: auto;
} }
} }

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

@ -1,6 +1,6 @@
.loading-overlay { .loading-overlay {
left: 0; left: 0;
z-index: 50; z-index: 256;
position: absolute; position: absolute;
flex-direction: column; flex-direction: column;
display: flex; display: flex;