Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/src/less/cryptpad.less

@@ -5,8 +5,8 @@
 @import "../less2/include/colortheme.less";
 @import "../less2/include/modal.less";
 @import "../less2/include/font.less";
+@import "../less2/loading.less";
 @import "./bar.less";
-@import "./loading.less";
 @import "./dropdown.less";
 @import "./topbar.less";
 @import "./footer.less";

customize.dist/src/less/loading.less

@@ -1,60 +0,0 @@
-@import "./variables.less";
-@import (once) "../less2/include/colortheme.less";
-
-#loading {
-    position: fixed;
-    z-index: 10000000; // #loading
-    top: 0px;
-    bottom: 0px;
-    left: 0px;
-    right: 0px;
-    background: @bg-loading;
-    color: @color-loading;
-    text-align: center;
-    font-size: 1.5em;
-    .loadingContainer {
-        margin-top: 50vh;
-        transform: translateY(-50%);
-    }
-    .cryptofist {
-        margin-left: auto;
-        margin-right: auto;
-        height: 300px;
-        margin-bottom: 2em;
-        @media screen and (max-height: @media-short-screen) {
-            display: none;
-        }
-    }
-    .spinnerContainer {
-        position: relative;
-        height: 100px;
-        > div {
-            height: 100px;
-        }
-    }
-}
-#loadingTip {
-    position: fixed;
-    z-index: 100000; // loading tip
-    top: 80%;
-    left: 0;
-    right: 0;
-    text-align: center;
-
-    transition: opacity 750ms;
-    transition-delay: 3000ms;
-    @media screen and (max-height: @media-medium-screen) {
-        display: none;
-    }
-    span {
-        background-color: @bg-loading;
-        color: @color-loading;
-        text-align: center;
-        font-size: 1.5em;
-        opacity: 0.7;
-        font-family: @colortheme_font;
-        padding: 15px;
-        max-width: 60%;
-        display: inline-block;
-    }
-}