Merge pull request #310 from InseeFr/v2-develop

V2 develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stromae",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "Web application for the management of questionnaires powered by Lunatic",
   "repository": {
     "type": "git",
@@ -10,7 +10,7 @@
   "license": "MIT",
   "dependencies": {
     "@craco/craco": "^6.4.0",
-    "@inseefr/lunatic": "2.4.5",
+    "@inseefr/lunatic": "2.4.7",
     "@material-ui/core": "^4.11.2",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.57",

src/App.css

@@ -59,6 +59,14 @@ body {
   > svg {
   fill: #154783;
 }
+.lunatic-component.outerContainer-Sequence .label-description p {
+  color: #0f417a !important;
+  margin: 20px !important;
+  font-style: normal;
+  font-family: 'Roboto', 'Helvetica', 'Arial', 'sans-serif';
+  font-size: 12px;
+  line-height: 10.7px;
+}
 
 #main
   .radio-modality.radio-modality-block.content-checked
@@ -274,7 +282,6 @@ input.checkbox-lunatic {
 
 #main .lunatic-component .declarations-lunatic .declaration-lunatic {
   color: black;
-  padding: 10px;
 }
 
 #main
@@ -285,10 +292,6 @@ input.checkbox-lunatic {
   color: #0f417a;
 }
 
-#main .field {
-  margin-bottom: 5px;
-}
-
 /* Question responses */
 #main .field > textarea,
 .field > input,
@@ -319,9 +322,12 @@ input.checkbox-lunatic {
   margin-left: 8px !important;
 }
 
-#main div.field-container,
+/* #main div.field-container,
 #main div.declarations-lunatic {
-  margin-top: 5px;
+} */
+.field-container .field .lunatic-textarea .label-description.INSTRUCTION p,
+.field-container .field .lunatic-textarea .label-description.HELP p {
+  color: black !important;
 }
 
 /* Sequences / Subsequences */
@@ -330,9 +336,8 @@ input.checkbox-lunatic {
   text-transform: uppercase;
   font-weight: bold;
   background-color: #0d3970;
-  padding: 0.5em;
+  padding: 0.2em;
   font-size: 19px;
-  line-height: 36px;
   height: unset;
 }
 
@@ -342,11 +347,10 @@ input.checkbox-lunatic {
   font-style: normal;
   font-size: 10pt;
   height: unset;
-  line-height: 20px;
   color: white;
   padding-left: 25px;
   background-color: #3467ae;
-  padding: 0.5em;
+  padding: 0.2em;
 }
 #main .outerContainer-Subsequence {
   border: 1px solid #3467ae;
@@ -373,7 +377,7 @@ input.checkbox-lunatic {
   > .declarations-lunatic
   > .declaration-lunatic,
 #main .outerContainer-Sequence > .declarations-lunatic > .declaration-lunatic {
-  margin: 8px !important;
+  margin: 20px !important;
   color: #0f417a;
 }
 

yarn.lock

@@ -1446,12 +1446,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-
-"@inseefr/[email protected]":
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/@inseefr/lunatic/-/lunatic-2.4.5.tgz#a58b36cf13827e9eb08145a1e1a77f49d08621fa"
-  integrity sha512-KSC8D5VBkwUIXR6JgcHTEV+sYt7UF+cs/dlV/O/fhT7Si1VNvvFSY++gDj3kGybLvuPxYHYicOU7UKy30KGk7w==
-
+"@inseefr/[email protected]":
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/@inseefr/lunatic/-/lunatic-2.4.7.tgz#bb66548ebd071883ee23a3c80944925b29ffc8f7"
+  integrity sha512-z5cD/dDGoG94WRAD6i7zRQgnMNIIT6KMDBkt96aeLrldj4YkofO4Jvevy5NLzlx8bC6JfH5CFJhWZwuqH0F8HA==
   dependencies:
     "@inseefr/trevas" "^0.1.17"
     "@inseefr/vtl-2.0-antlr-tools" "^0.1.0-bundle"