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

customize.dist/pages.js

@@ -438,12 +438,12 @@ define([
     };
 
     var loadingScreen = Pages.loadingScreen = function () {
-        return h('div#loading', 
-            h('div.loadingContainer', [
-                h('img.cryptofist', {
+        return h('div#cp-loading', 
+            h('div.cp-loading-container', [
+                h('img.cp-loading-cryptofist', {
                     src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs
                 }),
-                h('div.spinnerContainer',
+                h('div.cp-loading-spinner-container',
                     h('span.fa.fa-circle-o-notch.fa-spin.fa-4x.fa-fw')),
                 h('p'),
             ])

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/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

@@ -1,31 +1,31 @@
-@import "./variables.less";
-@import (once) "../less2/include/colortheme.less";
+@import (once) "./include/colortheme.less";
+@import (once) "./include/browser.less";
 
-#loading {
+#cp-loading {
     position: fixed;
     z-index: 10000000; // #loading
     top: 0px;
     bottom: 0px;
     left: 0px;
     right: 0px;
-    background: @bg-loading;
-    color: @color-loading;
+    background: @colortheme_loading-bg;
+    color: @colortheme_loading-color;
     text-align: center;
     font-size: 1.5em;
-    .loadingContainer {
+    .cp-loading-container {
         margin-top: 50vh;
         transform: translateY(-50%);
     }
-    .cryptofist {
+    .cp-loading-cryptofist {
         margin-left: auto;
         margin-right: auto;
         height: 300px;
         margin-bottom: 2em;
-        @media screen and (max-height: @media-short-screen) {
+        @media screen and (max-height: @browser_media-short-screen) {
             display: none;
         }
     }
-    .spinnerContainer {
+    .cp-loading-spinner-container {
         position: relative;
         height: 100px;
         > div {
@@ -33,7 +33,7 @@
         }
     }
 }
-#loadingTip {
+#cp-loading-tip {
     position: fixed;
     z-index: 100000; // loading tip
     top: 80%;
@@ -43,12 +43,12 @@
 
     transition: opacity 750ms;
     transition-delay: 3000ms;
-    @media screen and (max-height: @media-medium-screen) {
+    @media screen and (max-height: @browser_media-medium-screen) {
         display: none;
     }
     span {
-        background-color: @bg-loading;
-        color: @color-loading;
+        background: @colortheme_loading-bg;
+        color: @colortheme_loading-color;
         text-align: center;
         font-size: 1.5em;
         opacity: 0.7;
@@ -58,3 +58,4 @@
         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();

customize.dist/template.js

@@ -38,7 +38,7 @@ $(function () {
             };
 
             require([
-                'less!/customize/src/less/loading.less'
+                'less!/customize/src/less2/loading.less'
             ], function () {
                 if (/whiteboard/.test(pathname)) {
                     $('body').html(h('body', Pages[pathname]()).innerHTML);