From 8bbddd2f6d217ab3ecb3cad7b2fafea7222168d0 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Thu, 27 Apr 2023 08:53:20 +0000
Subject: [PATCH] publish: Merge branch
'17-diffuser-une-enquete-dans-la-custom-popup' into 'dev'
generated from commit 8024cccf3fd72d6c5ebb8863f57d4de038fe767d
---
...f16c737.js => ecolyo.2927a4297f8c5dfce3e0.js} | 16 ++++++++--------
...737eb3a.js => ecolyo.212030b1e23ec80acc05.js} | 2 +-
index.html | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
rename 5/{ecolyo.efebafebc9b96f16c737.js => ecolyo.2927a4297f8c5dfce3e0.js} (99%)
rename app/{ecolyo.60c330f5a428c737eb3a.js => ecolyo.212030b1e23ec80acc05.js} (99%)
diff --git a/5/ecolyo.efebafebc9b96f16c737.js b/5/ecolyo.2927a4297f8c5dfce3e0.js
similarity index 99%
rename from 5/ecolyo.efebafebc9b96f16c737.js
rename to 5/ecolyo.2927a4297f8c5dfce3e0.js
index 79abd4e40..f5913bed5 100644
--- a/5/ecolyo.efebafebc9b96f16c737.js
+++ b/5/ecolyo.2927a4297f8c5dfce3e0.js
@@ -3711,7 +3711,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.customPopupRoot {\n border: 1px solid #f1c017;\n}\n\n.customPopupModal {\n padding: 1rem;\n max-width: 20rem;\n}\n.customPopupModal .warn-icon {\n margin: 1rem auto;\n display: block;\n}\n.customPopupModal .customPopup-title {\n text-align: center;\n color: #e3b82a;\n margin: 1rem auto;\n}\n.customPopupModal .customPopup-content {\n text-align: center;\n color: #e0e0e0;\n}\n.customPopupModal button.btn-highlight {\n padding: 0.65rem;\n}\n\n#accessibility-title,\n#accessibility-content {\n display: none;\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.customPopupRoot {\n border: 1px solid #f1c017;\n}\n\n.customPopupModal {\n display: flex;\n flex-direction: column;\n align-items: center;\n padding: 1rem;\n max-width: 20rem;\n}\n.customPopupModal .customPopup-title {\n color: #e3b82a;\n margin: 1rem auto;\n}\n.customPopupModal .customPopup-content {\n text-align: center;\n font-weight: 700;\n}\n.customPopupModal .customPopup-content p {\n color: #e0e0e0;\n}\n.customPopupModal .customPopup-content a {\n color: #e3b82a;\n}\n.customPopupModal button.btn-highlight {\n padding: 0.65rem 2.5rem;\n margin-top: 1rem;\n width: unset;\n}\n\n#accessibility-title {\n display: none;\n}", ""]);
@@ -4780,9 +4780,7 @@ var CustomPopupModal = function CustomPopupModal(_ref) {
}
}, /*#__PURE__*/_react.default.createElement("div", {
id: "accessibility-title"
- }, customPopup.title), /*#__PURE__*/_react.default.createElement("div", {
- id: "accessibility-content"
- }, customPopup.description), /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+ }, customPopup.title), /*#__PURE__*/_react.default.createElement(_IconButton.default, {
"aria-label": t('feedback.accessibility.button_close'),
className: "modal-paper-close-button",
onClick: handleCloseClick
@@ -4793,13 +4791,15 @@ var CustomPopupModal = function CustomPopupModal(_ref) {
className: "customPopupModal"
}, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
icon: _speaker.default,
- size: 100,
- className: 'warn-icon'
+ size: 100
}), /*#__PURE__*/_react.default.createElement("div", {
className: "customPopup-title text-20-bold"
}, customPopup.title), /*#__PURE__*/_react.default.createElement("div", {
- className: "customPopup-content text-16-normal"
- }, customPopup.description), /*#__PURE__*/_react.default.createElement(_Button.default, {
+ className: "customPopup-content text-16-normal",
+ dangerouslySetInnerHTML: {
+ __html: customPopup.description
+ }
+ }), /*#__PURE__*/_react.default.createElement(_Button.default, {
onClick: handleCloseClick,
classes: {
root: 'btn-highlight ',
diff --git a/app/ecolyo.60c330f5a428c737eb3a.js b/app/ecolyo.212030b1e23ec80acc05.js
similarity index 99%
rename from app/ecolyo.60c330f5a428c737eb3a.js
rename to app/ecolyo.212030b1e23ec80acc05.js
index 26a97e1d4..0394d0ba9 100644
--- a/app/ecolyo.60c330f5a428c737eb3a.js
+++ b/app/ecolyo.212030b1e23ec80acc05.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"740f12bc0ccead1472ad","4":"5decb02eaa948f6ed4a7","5":"efebafebc9b96f16c737","6":"dd703094e8c00e5f18d6","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"740f12bc0ccead1472ad","4":"5decb02eaa948f6ed4a7","5":"2927a4297f8c5dfce3e0","6":"dd703094e8c00e5f18d6","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 309ec51c2..a6dd38d7d 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.18c101a0fa585f93c419.js"></script><script src="app/ecolyo.60c330f5a428c737eb3a.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.18c101a0fa585f93c419.js"></script><script src="app/ecolyo.212030b1e23ec80acc05.js"></script></div></body></html>
\ No newline at end of file
--
GitLab