From 78c2e4a2237fbb37297dba1ac0ebc3d863d5cfcf Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Thu, 28 Sep 2023 13:03:50 +0000
Subject: [PATCH] publish: Merge branch 'fix-loading-bar' into 'dev'
generated from commit 2fe057ba7555d4d7a52512d9027215f6f9220593
---
...ee61b0ff5866b5c4c.js => ecolyo.29645f22dc4f719a893a.js} | 7 ++++---
index.html | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
rename app/{ecolyo.3e8ee61b0ff5866b5c4c.js => ecolyo.29645f22dc4f719a893a.js} (99%)
diff --git a/app/ecolyo.3e8ee61b0ff5866b5c4c.js b/app/ecolyo.29645f22dc4f719a893a.js
similarity index 99%
rename from app/ecolyo.3e8ee61b0ff5866b5c4c.js
rename to app/ecolyo.29645f22dc4f719a893a.js
index a560b7ba4..80ef29270 100644
--- a/app/ecolyo.3e8ee61b0ff5866b5c4c.js
+++ b/app/ecolyo.29645f22dc4f719a893a.js
@@ -12947,7 +12947,8 @@ var SplashScreen = function SplashScreen(_ref) {
var getProgress = function getProgress() {
var total = Object.values(_models.InitSteps).length / 2;
var progress = initStep === 0 ? 10 : Math.round(initStep / total * 100);
- return progress;
+ return progress - 90;
+ /* hack to make the progress bar start way left */
};
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
@@ -12964,7 +12965,7 @@ var SplashScreen = function SplashScreen(_ref) {
}, /*#__PURE__*/_react.default.createElement("div", {
className: "splash-progress-bar-content",
style: {
- width: "".concat(getProgress(), "%")
+ left: "".concat(getProgress(), "%")
}
})))), /*#__PURE__*/_react.default.createElement("div", {
className: "step-label text-18-normal"
@@ -15706,7 +15707,7 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
exports = module.exports = __webpack_require__("JPst")(false);
// Module
-exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.splash-content {\n display: flex;\n flex-direction: column;\n align-items: center;\n height: 100%;\n}\n.splash-content .splash-loader {\n width: 100%;\n margin-top: 20vh;\n display: flex;\n flex-direction: column;\n align-items: center;\n}\n.splash-content .splash-loader .error {\n margin-bottom: 1rem;\n}\n.splash-content .splash-loader span {\n color: #ffffff;\n font-size: 3rem;\n margin: 0;\n letter-spacing: -0.02em;\n font-weight: 400;\n}\n.splash-content .splash-logos-container {\n margin-top: auto;\n margin-bottom: 1rem;\n width: 100%;\n display: flex;\n flex-direction: column;\n justify-content: center;\n align-items: center;\n}\n.splash-content .step-label {\n margin: 1rem 0;\n max-width: 350px;\n color: white;\n text-align: center;\n height: 40px;\n}\n.splash-content .splash-error-text {\n text-align: center;\n color: #d25959;\n margin: 0.5rem;\n}\n\n.splash-footer {\n display: flex;\n flex-direction: column;\n align-items: center;\n justify-content: flex-start;\n height: 10rem;\n}\n.splash-footer button.btn-highlight {\n max-width: 230px;\n width: 100%;\n margin: 0.5rem 0 0;\n height: 40px;\n}\n\n.splash-progress {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n width: 100%;\n margin: 1rem auto;\n padding: 1rem;\n transition: all 300ms ease;\n border-radius: 12px;\n box-sizing: border-box;\n max-width: 350px;\n}\n.splash-progress .splash-progress-bar-container {\n flex: 1;\n height: 12px;\n box-sizing: border-box;\n background-image: linear-gradient(45deg, #e3b82a 11.11%, #1b1c22 11.11%, #1b1c22 50%, #e3b82a 50%, #e3b82a 61.11%, #1b1c22 61.11%, #1b1c22 100%);\n background-size: 9px 9px;\n border: solid 1px #e3b82a;\n border-radius: 12px;\n}\n.splash-progress .splash-progress-bar-container .splash-progress-bar-content {\n height: 12px;\n box-sizing: border-box;\n background-color: #e3b82a;\n border: solid 1px #e3b82a;\n border-radius: 12px 4px 0 12px;\n border-right: none;\n transition: all 300ms ease;\n position: relative;\n overflow: hidden;\n top: -1px;\n left: -1px;\n}\n.splash-progress .splash-progress-bar-container .splash-progress-bar-content:after {\n content: \"\";\n position: absolute;\n display: block;\n transform: rotate(45deg);\n background-color: #1b1c22;\n width: 15px;\n height: 15px;\n right: -9px;\n top: -8px;\n}", ""]);
+exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.splash-content {\n display: flex;\n flex-direction: column;\n align-items: center;\n height: 100%;\n}\n.splash-content .splash-loader {\n width: 100%;\n margin-top: 20vh;\n display: flex;\n flex-direction: column;\n align-items: center;\n}\n.splash-content .splash-loader .error {\n margin-bottom: 1rem;\n}\n.splash-content .splash-loader span {\n color: #ffffff;\n font-size: 3rem;\n margin: 0;\n letter-spacing: -0.02em;\n font-weight: 400;\n}\n.splash-content .splash-logos-container {\n margin-top: auto;\n margin-bottom: 1rem;\n width: 100%;\n display: flex;\n flex-direction: column;\n justify-content: center;\n align-items: center;\n}\n.splash-content .step-label {\n margin: 1rem 0;\n max-width: 350px;\n color: white;\n text-align: center;\n height: 40px;\n}\n.splash-content .splash-error-text {\n text-align: center;\n color: #d25959;\n margin: 0.5rem;\n}\n\n.splash-footer {\n display: flex;\n flex-direction: column;\n align-items: center;\n justify-content: flex-start;\n height: 10rem;\n}\n.splash-footer button.btn-highlight {\n max-width: 230px;\n width: 100%;\n margin: 0.5rem 0 0;\n height: 40px;\n}\n\n.splash-progress {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n width: 100%;\n margin: 1rem auto;\n padding: 1rem;\n transition: all 300ms ease;\n border-radius: 12px;\n box-sizing: border-box;\n max-width: 350px;\n}\n.splash-progress .splash-progress-bar-container {\n flex: 1;\n height: 12px;\n box-sizing: border-box;\n background-image: linear-gradient(45deg, #e3b82a 11.11%, #1b1c22 11.11%, #1b1c22 50%, #e3b82a 50%, #e3b82a 61.11%, #1b1c22 61.11%, #1b1c22 100%);\n background-size: 9px 9px;\n border: solid 1px #e3b82a;\n border-radius: 12px;\n overflow: hidden;\n position: relative;\n}\n.splash-progress .splash-progress-bar-container .splash-progress-bar-content {\n background-color: #e3b82a;\n position: absolute;\n bottom: -150px;\n left: -100%;\n height: 300px;\n width: 100%;\n transform: rotate(45deg);\n}", ""]);
diff --git a/index.html b/index.html
index 47e00c39e..10a12ce81 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.3e8ee61b0ff5866b5c4c.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.29645f22dc4f719a893a.js"></script></div></body></html>
\ No newline at end of file
--
GitLab