Fix UI issues in the loading screen with the loading bar

customize.dist/loading.js

@@ -69,8 +69,9 @@ define([], function () {
   height: auto;
   margin-bottom: 2em;
 }
-@media screen and (max-height: 450px) {
-  #cp-loading .cp-loading-cryptofist {
+@media screen and (max-height: 500px) {
+  #cp-loading .cp-loading-logo {
+      display: none;
   }
 }
 #cp-loading-message {
@@ -162,12 +163,12 @@ define([], function () {
     text-overflow: ellipsis;
 }
 .cp-loading-progress-bar {
-    height: 5px;
+    height: 24px;
     background: white;
 }
 .cp-loading-progress-bar-value {
     height: 100%;
-    background: #00ff37;
+    background: #5cb85c;
 }
 */}).toString().slice(14, -3);
     var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });

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

@@ -25,6 +25,7 @@
         @warn-color: @warn-color,
         @color: @color
     );
+    font: @colortheme_app-font;
 }
 
 .framework_min_main(
@@ -42,6 +43,7 @@
     .tippy_main();
     .checkmark_main(20px);
     .password_main();
+    font: @colortheme_app-font;
 }
 
 

customize.dist/translations/messages.fr.js

@@ -1123,9 +1123,9 @@ define(function () {
     // Loading info
     out.loading_pad_1 = "Initialisation du pad";
     out.loading_pad_2 = "Chargement du contenu du pad";
-    out.loading_drive_1 = "Préparation des données de l'utilisateur";
-    out.loading_drive_2 = "Mise à jour des données de l'utilisateur";
-    out.loading_drive_3 = "Vérification des données de l'utilisateur";
+    out.loading_drive_1 = "Chargement des données";
+    out.loading_drive_2 = "Mise à jour du format des données";
+    out.loading_drive_3 = "Vérification de l'intégrité des données";
 
     return out;
 });

customize.dist/translations/messages.js

@@ -1169,9 +1169,9 @@ define(function () {
     // Loading info
     out.loading_pad_1 = "Initializing pad";
     out.loading_pad_2 = "Loading pad content";
-    out.loading_drive_1 = "Preparing user data";
-    out.loading_drive_2 = "Upgrading user data to the latest version";
-    out.loading_drive_3 = "Checking user data integrity";
+    out.loading_drive_1 = "Loading data";
+    out.loading_drive_2 = "Updating data format";
+    out.loading_drive_3 = "Verifying data integrity";
 
     return out;
 });

www/common/common-interface.js

@@ -603,13 +603,13 @@ define([
             $loading.css('display', '');
             $loading.removeClass('cp-loading-hidden');
             $('.cp-loading-spinner-container').show();
-            if (config.progress && !$loading.find('.cp-loading-progress').length) {
+            if (!config.noProgress && !$loading.find('.cp-loading-progress').length) {
                 var progress = h('div.cp-loading-progress', [
                     h('p.cp-loading-progress-drive'),
                     h('p.cp-loading-progress-pad')
                 ]);
                 $loading.find('.cp-loading-container').append(progress);
-            } else if (!config.progress) {
+            } else if (config.noProgress) {
                 $loading.find('.cp-loading-progress').remove();
             }
             if (loadingText) {

www/common/sframe-app-framework.js

@@ -279,7 +279,7 @@ define([
             var newContentStr = cpNfInner.chainpad.getUserDoc();
             if (state === STATE.DELETED) { return; }
 
-            UI.updateLoadingProgress({ state: -1 }, false);
+            //UI.updateLoadingProgress({ state: -1 }, false);
 
             var newPad = false;
             if (newContentStr === '') { newPad = true; }
@@ -431,11 +431,11 @@ define([
         };
 
         nThen(function (waitFor) {
-            UI.addLoadingScreen({progress: true});
+            UI.addLoadingScreen();
             SFCommon.create(waitFor(function (c) { common = c; }));
-            UI.updateLoadingProgress({
+            /*UI.updateLoadingProgress({
                 state: 1
-            }, false);
+            }, false);*/
         }).nThen(function (waitFor) {
             common.getSframeChannel().onReady(waitFor());
         }).nThen(function (waitFor) {
@@ -462,9 +462,9 @@ define([
                 onRemote: onRemote,
                 onLocal: onLocal,
                 onInit: function () {
-                    UI.updateLoadingProgress({
+                    /*UI.updateLoadingProgress({
                         state: 2
-                    }, false);
+                    }, false);*/
                     stateChange(STATE.INITIALIZING);
                 },
                 onReady: function () { evStart.reg(onReady); },