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

customize.dist/src/less2/include/colortheme.less

@@ -21,6 +21,9 @@
 @colortheme_modal-link-visited: lighten(@colortheme_modal-link, 10%);
 @colortheme_modal-dim: rgba(0, 0, 0, 0.4);
 
+@colortheme_loading-bg: #222;
+@colortheme_loading-color: @colortheme_old-fore;
+
 @colortheme_modal-input: #111;
 
 @colortheme_alertify-red: #E55236;

customize.dist/src/less2/loading.less

@@ -0,0 +1,61 @@
+@import (once) "./include/colortheme.less";
+@import (once) "./include/browser.less";
+
+#cp-loading {
+    position: fixed;
+    z-index: 10000000; // #loading
+    top: 0px;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+    background: @colortheme_loading-bg;
+    color: @colortheme_loading-color;
+    text-align: center;
+    font-size: 1.5em;
+    .cp-loading-container {
+        margin-top: 50vh;
+        transform: translateY(-50%);
+    }
+    .cp-loading-cryptofist {
+        margin-left: auto;
+        margin-right: auto;
+        height: 300px;
+        margin-bottom: 2em;
+        @media screen and (max-height: @browser_media-short-screen) {
+            display: none;
+        }
+    }
+    .cp-loading-spinner-container {
+        position: relative;
+        height: 100px;
+        > div {
+            height: 100px;
+        }
+    }
+}
+#cp-loading-tip {
+    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: @browser_media-medium-screen) {
+        display: none;
+    }
+    span {
+        background: @colortheme_loading-bg;
+        color: @colortheme_loading-color;
+        text-align: center;
+        font-size: 1.5em;
+        opacity: 0.7;
+        font-family: @colortheme_font;
+        padding: 15px;
+        max-width: 60%;
+        display: inline-block;
+    }
+}
+

customize.dist/src/less2/pages/page-login.less

@@ -1,6 +1,7 @@
 @import (once) "../include/infopages.less";
 @import (once) "../include/colortheme.less";
 @import (once) "../include/alertify.less";
+@import (once) "../loading.less";
 
 .infopages_main();
 .infopages_topbar();
@@ -75,4 +76,4 @@
 .cp-container {
 	padding-top: 3em;
 	min-height: 66vh;
-}
+}

customize.dist/src/less2/pages/page-register.less

@@ -1,6 +1,7 @@
 @import (once) "../include/infopages.less";
 @import (once) "../include/colortheme.less";
 @import (once) "../include/alertify.less";
+@import (once) "../loading.less";
 
 .infopages_main();
 .infopages_topbar();