simplify loading mask impl

This commit is contained in:
Nolan Lawson 2018-02-14 18:23:11 -08:00
parent 58cfd9db38
commit 6ebb0ef394
2 changed files with 11 additions and 11 deletions

View File

@ -1,9 +1,7 @@
<div class="loading-container"> <div class="loading-container {{shown ? 'loading-container-shown' : ''}}">
{{#if show}} <div class="loading-mask">
<div transition:fade class="loading-mask">
<LoadingSpinner maskStyle="true"/> <LoadingSpinner maskStyle="true"/>
</div> </div>
{{/if}}
</div> </div>
<style> <style>
.loading-container { .loading-container {
@ -12,8 +10,11 @@
top: 0; top: 0;
bottom: 0; bottom: 0;
position: fixed; position: fixed;
pointer-events: none;
z-index: 100; z-index: 100;
pointer-events: none;
}
.loading-container.loading-container-shown {
pointer-events: auto;
} }
.loading-mask { .loading-mask {
width: 100%; width: 100%;
@ -22,18 +23,17 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: var(--mask-bg); background: var(--mask-bg);
opacity: 0;
transition: opacity 333ms linear;
}
.loading-container-shown .loading-mask {
opacity: 0.6; opacity: 0.6;
pointer-events: auto;
} }
</style> </style>
<script> <script>
import { fade } from 'svelte-transitions'
import LoadingSpinner from './LoadingSpinner.html' import LoadingSpinner from './LoadingSpinner.html'
export default { export default {
transitions: {
fade
},
components: { components: {
LoadingSpinner LoadingSpinner
} }

View File

@ -6,7 +6,7 @@
<SettingsLayout page='settings/instances/add' label="Add an Instance"> <SettingsLayout page='settings/instances/add' label="Add an Instance">
<h1 id="add-an-instance-h1">Add an Instance</h1> <h1 id="add-an-instance-h1">Add an Instance</h1>
<LoadingMask show="{{$logInToInstanceLoading}}"/> <LoadingMask shown="{{$logInToInstanceLoading}}"/>
{{#if $isUserLoggedIn}} {{#if $isUserLoggedIn}}
<p>Connect to an instance to log in.</p> <p>Connect to an instance to log in.</p>