From 83a3070f7942626eb7e4219360a10e8b8656840c Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Fri, 20 Oct 2023 12:12:26 +0000
Subject: [PATCH] publish: Merge remote-tracking branch 'origin/dev' into dev
generated from commit 8880318e5d08d32013a505d6c521fdb4cd0662d7
---
...28fcbb87803e4915f5.js => ecolyo.9376e18b72a7a8ccfe8c.js} | 6 +++---
...39fadfce0c3616338c.js => ecolyo.ba12aad74d8c630da349.js} | 2 +-
index.html | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
rename 7/{ecolyo.9c28fcbb87803e4915f5.js => ecolyo.9376e18b72a7a8ccfe8c.js} (92%)
rename app/{ecolyo.2c39fadfce0c3616338c.js => ecolyo.ba12aad74d8c630da349.js} (99%)
diff --git a/7/ecolyo.9c28fcbb87803e4915f5.js b/7/ecolyo.9376e18b72a7a8ccfe8c.js
similarity index 92%
rename from 7/ecolyo.9c28fcbb87803e4915f5.js
rename to 7/ecolyo.9376e18b72a7a8ccfe8c.js
index d75d587cb..12061f89e 100644
--- a/7/ecolyo.9c28fcbb87803e4915f5.js
+++ b/7/ecolyo.9376e18b72a7a8ccfe8c.js
@@ -124,7 +124,7 @@ if(false) {}
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.single-ecogesture {\n color: #e0e0e0;\n display: flex;\n flex-direction: column;\n align-items: center;\n justify-content: center;\n padding: 1rem 1.2rem;\n}\n.single-ecogesture .icon-container {\n margin: auto;\n max-width: 180px;\n width: 100%;\n display: flex;\n}\n.single-ecogesture .icon-container .icon-big {\n margin: auto;\n}\n.single-ecogesture .details {\n flex-direction: column;\n display: flex;\n}\n.single-ecogesture .details .title {\n color: #a0a0a0;\n font-weight: 700;\n}\n.single-ecogesture .details .efficiency {\n display: flex;\n text-align: center;\n margin: 0.7rem auto 0;\n}\n.single-ecogesture .details .efficiency .text {\n margin-right: 0.7rem;\n}\n.single-ecogesture .styled-container {\n line-height: 150%;\n padding: 1rem;\n margin: 1.5rem 0 1rem;\n max-width: 500px;\n display: flex;\n flex-direction: column;\n}\n.single-ecogesture .styled-container .long-name {\n text-align: center;\n color: white;\n}\n.single-ecogesture .styled-container .showMore {\n margin: auto;\n text-align: center;\n text-decoration: underline;\n margin-top: 1.5rem;\n}\n.single-ecogesture .styled-container .showMore span {\n text-transform: none;\n}\n.single-ecogesture .styled-container .longDescription {\n margin: 1em 0.5rem;\n text-align: left;\n}\n.single-ecogesture .buttons-selection {\n width: 100%;\n display: flex;\n gap: 0.5rem;\n justify-content: center;\n}\n.single-ecogesture .buttons-selection button.btnSecondary {\n height: 45px;\n max-width: 160px;\n width: 100%;\n border-radius: 4px;\n}\n.single-ecogesture .buttons-selection .objective-btn span {\n color: #e0e0e0;\n}\n.single-ecogesture .buttons-selection .objective-btn.active {\n background: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(12, 44, 91, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #4470b3;\n border-color: transparent;\n}\n.single-ecogesture .buttons-selection .objective-btn.active span {\n color: white;\n}\n.single-ecogesture .buttons-selection .doing-btn span {\n color: #e0e0e0;\n}\n.single-ecogesture .buttons-selection .doing-btn.active {\n background: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(41, 87, 33, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #21a90b;\n border-color: transparent;\n}\n.single-ecogesture .buttons-selection .doing-btn.active span {\n color: white;\n}\n.single-ecogesture .buttons-selection .MuiIconButton-label {\n justify-content: flex-start;\n color: white;\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.single-ecogesture {\n color: #e0e0e0;\n display: flex;\n flex-direction: column;\n align-items: center;\n justify-content: center;\n padding: 1rem 1.2rem;\n}\n.single-ecogesture .icon-container {\n margin: auto;\n max-width: 180px;\n width: 100%;\n display: flex;\n}\n.single-ecogesture .icon-container .icon-big {\n margin: auto;\n}\n.single-ecogesture .details {\n flex-direction: column;\n display: flex;\n align-items: center;\n gap: 0.5rem;\n}\n.single-ecogesture .details .title {\n color: #a0a0a0;\n}\n.single-ecogesture .details .efficiency {\n display: flex;\n gap: 0.5rem;\n}\n.single-ecogesture .styled-container {\n line-height: 150%;\n padding: 1rem;\n margin: 1.5rem 0 1rem;\n max-width: 500px;\n display: flex;\n flex-direction: column;\n}\n.single-ecogesture .styled-container .long-name {\n text-align: center;\n color: white;\n}\n.single-ecogesture .styled-container .showMore {\n margin: auto;\n text-align: center;\n text-decoration: underline;\n margin-top: 1.5rem;\n}\n.single-ecogesture .styled-container .showMore span {\n text-transform: none;\n}\n.single-ecogesture .styled-container .longDescription {\n margin: 1em 0.5rem;\n text-align: left;\n}\n.single-ecogesture .buttons-selection {\n width: 100%;\n display: flex;\n gap: 0.5rem;\n justify-content: center;\n}\n.single-ecogesture .buttons-selection button.btnSecondary {\n height: 45px;\n max-width: 160px;\n width: 100%;\n border-radius: 4px;\n}\n.single-ecogesture .buttons-selection .objective-btn span {\n color: #e0e0e0;\n}\n.single-ecogesture .buttons-selection .objective-btn.active {\n background: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(12, 44, 91, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #4470b3;\n border-color: transparent;\n}\n.single-ecogesture .buttons-selection .objective-btn.active span {\n color: white;\n}\n.single-ecogesture .buttons-selection .doing-btn span {\n color: #e0e0e0;\n}\n.single-ecogesture .buttons-selection .doing-btn.active {\n background: radial-gradient(105.25% 64.58% at 49.68% 70.83%, rgba(41, 87, 33, 0.5) 0%, rgba(255, 255, 255, 0) 100%), #21a90b;\n border-color: transparent;\n}\n.single-ecogesture .buttons-selection .doing-btn.active span {\n color: white;\n}\n.single-ecogesture .buttons-selection .MuiIconButton-label {\n justify-content: flex-start;\n color: white;\n}", ""]);
@@ -461,11 +461,11 @@ var SingleEcogestureView = function SingleEcogestureView() {
})), /*#__PURE__*/_react2.default.createElement("div", {
className: "details"
}, /*#__PURE__*/_react2.default.createElement("div", {
- className: "text-22 title"
+ className: "text-22-bold title"
}, ecogesture.shortName), /*#__PURE__*/_react2.default.createElement("div", {
className: "efficiency"
}, /*#__PURE__*/_react2.default.createElement("span", {
- className: "text text-14-normal"
+ className: "text-14-normal"
}, t('ecogesture_modal.efficiency')), /*#__PURE__*/_react2.default.createElement(_EfficiencyRating.default, {
result: Math.round(ecogesture.efficiency)
}))), /*#__PURE__*/_react2.default.createElement("div", {
diff --git a/app/ecolyo.2c39fadfce0c3616338c.js b/app/ecolyo.ba12aad74d8c630da349.js
similarity index 99%
rename from app/ecolyo.2c39fadfce0c3616338c.js
rename to app/ecolyo.ba12aad74d8c630da349.js
index e7b19fdce..658774332 100644
--- a/app/ecolyo.2c39fadfce0c3616338c.js
+++ b/app/ecolyo.ba12aad74d8c630da349.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"b2c357869bd91528093e","2":"62e5292a592368584bc8","4":"e44f681829f74b9ff80d","5":"e91ba98547f78b53dac8","6":"3ac0fa971654da221f7f","7":"9c28fcbb87803e4915f5","8":"083c460749da3b2bb728","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"b2c357869bd91528093e","2":"62e5292a592368584bc8","4":"e44f681829f74b9ff80d","5":"e91ba98547f78b53dac8","6":"3ac0fa971654da221f7f","7":"9376e18b72a7a8ccfe8c","8":"083c460749da3b2bb728","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 44994485a..951a2c622 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.2c39fadfce0c3616338c.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.ba12aad74d8c630da349.js"></script></div></body></html>
\ No newline at end of file
--
GitLab