wait #6283 @1.25

diff --git a/public/packages/fluidbook/toolbox/css/loader.css b/public/packages/fluidbook/toolbox/css/loader.css
index aea120a9ee4018eb7399882cf2495c6cf35a0c3c..0b45933514952e33560cb27cb6627b30c243704d 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/loader.css
+++ b/public/packages/fluidbook/toolbox/css/loader.css
@@ -35,24 +35,33 @@
 #loader progress::-webkit-progress-value {
   border-radius: 2px;
 }
-#loader progress[data-step="0"] {
+#loader progress[data-step="0"],
+#loader progress[data-step="0"]::-webkit-progress-bar {
   background-color: #fff;
 }
-#loader progress[data-step="0"]::-moz-progress-bar,
+#loader progress[data-step="0"]::-moz-progress-bar {
+  background-color: #3d86ee;
+}
 #loader progress[data-step="0"]::-webkit-progress-value {
   background-color: #3d86ee;
 }
-#loader progress[data-step="1"] {
+#loader progress[data-step="1"],
+#loader progress[data-step="1"]::-webkit-progress-bar {
   background-color: #3d86ee;
 }
-#loader progress[data-step="1"]::-moz-progress-bar,
+#loader progress[data-step="1"]::-moz-progress-bar {
+  background-color: #3471c8;
+}
 #loader progress[data-step="1"]::-webkit-progress-value {
   background-color: #3471c8;
 }
-#loader progress[data-step="2"] {
+#loader progress[data-step="2"],
+#loader progress[data-step="2"]::-webkit-progress-bar {
   background-color: #3471c8;
 }
-#loader progress[data-step="2"]::-moz-progress-bar,
+#loader progress[data-step="2"]::-moz-progress-bar {
+  background-color: #20457b;
+}
 #loader progress[data-step="2"]::-webkit-progress-value {
   background-color: #20457b;
 }

diff --git a/public/packages/fluidbook/toolbox/css/loader.css.map b/public/packages/fluidbook/toolbox/css/loader.css.map
index 890641b7f4507b22dd89d01b354105afc8d71197..3471808692a7ac615f61d0c1a638a388d23155a3 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/loader.css.map
+++ b/public/packages/fluidbook/toolbox/css/loader.css.map
@@ -1 +1 @@
-{"version":3,"sources":["loader.less"],"names":[],"mappings":"AAAA;EACI,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,qCAAA;EACA,YAAA;;AAPJ,OASI;EACI,kBAAA;EACA,KAAK,gBAAL;EACA,MAAM,iBAAN;EACA,YAAA;EACA,aAAA;EACA,aAAA;EACA,sBAAA;EACA,kBAAA;EACA,oBAAA;;AAlBR,OAqBI;EACI,cAAA;EACA,kBAAA;EACA,eAAA;;AAxBR,OA4BI;EACI,WAAA;EACA,iBAAA;EACA,YAAA;EACA,gBAAA;EACA,kBAAA;EACA,wCAAA;;AAlCR,OAqCI,SAAQ;AArCZ,OAqCiC,SAAQ;EACjC,kBAAA;;AAtCR,OAyCI,SAAQ;EACJ,sBAAA;;AA1CR,OA6CI,SAAQ,eAAe;AA7C3B,OA6CgD,SAAQ,eAAe;EAC/D,yBAAA;;AA9CR,OAiDI,SAAQ;EACJ,yBAAA;;AAlDR,OAqDI,SAAQ,eAAe;AArD3B,OAqDgD,SAAQ,eAAe;EAC/D,yBAAA;;AAtDR,OAyDI,SAAQ;EACJ,yBAAA;;AA1DR,OA6DI,SAAQ,eAAe;AA7D3B,OA6DgD,SAAQ,eAAe;EAC/D,yBAAA","file":"loader.css"}
\ No newline at end of file
+{"version":3,"sources":["loader.less"],"names":[],"mappings":"AAAA;EACI,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,qCAAA;EACA,YAAA;;AAPJ,OASI;EACI,kBAAA;EACA,KAAK,gBAAL;EACA,MAAM,iBAAN;EACA,YAAA;EACA,aAAA;EACA,aAAA;EACA,sBAAA;EACA,kBAAA;EACA,oBAAA;;AAlBR,OAqBI;EACI,cAAA;EACA,kBAAA;EACA,eAAA;;AAxBR,OA4BI;EACI,WAAA;EACA,iBAAA;EACA,YAAA;EACA,gBAAA;EACA,kBAAA;EACA,wCAAA;;AAlCR,OAqCI,SAAQ;AArCZ,OAqCiC,SAAQ;EACjC,kBAAA;;AAtCR,OAyCI,SAAQ;AAzCZ,OAyC6B,SAAQ,eAAe;EAC5C,sBAAA;;AA1CR,OA6CI,SAAQ,eAAe;EACnB,yBAAA;;AA9CR,OAiDI,SAAQ,eAAe;EACnB,yBAAA;;AAlDR,OAqDI,SAAQ;AArDZ,OAqD6B,SAAQ,eAAe;EAC5C,yBAAA;;AAtDR,OAyDI,SAAQ,eAAe;EACnB,yBAAA;;AA1DR,OA6DI,SAAQ,eAAe;EACnB,yBAAA;;AA9DR,OAiEI,SAAQ;AAjEZ,OAiE6B,SAAQ,eAAe;EAC5C,yBAAA;;AAlER,OAqEI,SAAQ,eAAe;EACnB,yBAAA;;AAtER,OAyEI,SAAQ,eAAe;EACnB,yBAAA","file":"loader.css"}
\ No newline at end of file

diff --git a/public/packages/fluidbook/toolbox/css/loader.less b/public/packages/fluidbook/toolbox/css/loader.less
index b2711ae70e0978830255c625784ea933fbf012dd..d205a90d3a8a50a4eb73aabcf7facd141dd670cc 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/loader.less
+++ b/public/packages/fluidbook/toolbox/css/loader.less
@@ -39,29 +39,40 @@
         border-radius: 2px;
     }
 
-    progress[data-step="0"] {
+    progress[data-step="0"], progress[data-step="0"]::-webkit-progress-bar {
         background-color: #fff;
     }
 
-    progress[data-step="0"]::-moz-progress-bar, progress[data-step="0"]::-webkit-progress-value {
+    progress[data-step="0"]::-moz-progress-bar {
         background-color: #3d86ee;
     }
 
-    progress[data-step="1"] {
+    progress[data-step="0"]::-webkit-progress-value {
         background-color: #3d86ee;
     }
 
-    progress[data-step="1"]::-moz-progress-bar, progress[data-step="1"]::-webkit-progress-value {
+    progress[data-step="1"], progress[data-step="1"]::-webkit-progress-bar {
+        background-color: #3d86ee;
+    }
+
+    progress[data-step="1"]::-moz-progress-bar {
+        background-color: #3471c8;
+    }
+
+    progress[data-step="1"]::-webkit-progress-value {
         background-color: #3471c8;
     }
 
-    progress[data-step="2"] {
+    progress[data-step="2"], progress[data-step="2"]::-webkit-progress-bar {
         background-color: #3471c8;
     }
 
-    progress[data-step="2"]::-moz-progress-bar, progress[data-step="2"]::-webkit-progress-value {
+    progress[data-step="2"]::-moz-progress-bar {
         background-color: #20457b;
     }
 
+    progress[data-step="2"]::-webkit-progress-value {
+        background-color: #20457b;
+    }
 }
 

diff --git a/public/packages/fluidbook/toolbox/js/bundle.js b/public/packages/fluidbook/toolbox/js/bundle.js
index ef7c3733e03ba853120f97d23edc5396bd2773ba..f073fd19e4c442f0ee754df796d618e9e9946b65 100644 (file)
--- a/public/packages/fluidbook/toolbox/js/bundle.js
+++ b/public/packages/fluidbook/toolbox/js/bundle.js
@@ -43,7 +43,7 @@ $(function () {
             icon: "warning",
             showCancelButton: true,
             confirmButtonText: $(this).data('confirm-confirm'),
-            cancelButtonText:$(this).data('confirm-cancel'),
+            cancelButtonText: $(this).data('confirm-cancel'),
             reverseButtons: true,
             dangerMode: true,
         }).then((result) => {
@@ -84,5 +84,5 @@ function showLoader(message, progress) {
 }
 
 function hideLoader() {
-    $("#loader").remove();
+    //$("#loader").remove();
 }