ode-csslib 4.0.13-develop-b2school.202306281712 → 4.1.1-dev.202308281558

package/dist/version.txt

@@ -1 +1 @@
-entcore-css-lib=4.0-dev-SNAPSHOT 28/06/2023 17:13:18
+entcore-css-lib=4.1-dev-SNAPSHOT 28/08/2023 15:58:28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ode-csslib",
-  "version": "4.0.13-develop-b2school.202306281712",
+  "version": "4.1.1-dev.202308281558",
   "description": "Open Digital Education Legacy CSS framework",
   "scripts": {
     "copy-fonts": "cpr node_modules/entcore-generic-icons/fonts/ assets/fonts/generic-icons/ -o",

package/scss/_crisscross-mobile.scss

@@ -156,9 +156,9 @@
       @include grid-cell-left(12);
     }
 
-    /* .zero-mobile {
+    .zero-mobile {
       display: none !important;
-    } */
+    }
 
     .one-mobile {
       @include grid-cell-width(1);

package/scss/specifics/calendar/_calendar.scss

@@ -47,7 +47,7 @@ calendar .week-switcher .date-picker-icon {
   margin-left: 0 !important;
 }
 
-.calendar {
+.cdt {
   .week-switcher {
     .date-picker-icon {
       left:42px;

package/scss/specifics/crre/fragments/_status-circle.scss

@@ -58,7 +58,7 @@
       fill: white;
     }
   }
-  &.REJECTED, &.CANCELED {
+  &.REJECTED, &.CANCELED, &.ARCHIVED {
     background: $red;
     >i:after{
       content: '\e866';

package/scss/specifics/formulaire/components/_edit-form.scss

@@ -13,7 +13,7 @@
     position: sticky;
     background: linear-gradient(to bottom right, $formulaire-grey-lighter, $formulaire-grey-very-light) fixed;
     z-index: 3;
-    top: 64px;
+    top: 0;
 
     @media screen and (max-width: $formulaire-screen-tablet) {
       top: 49px;
@@ -30,6 +30,7 @@
   flex-direction: column;
   align-content: space-between;
 
+
   .question-item .domino:not(.disabled) > .grab,
   .section-top:not(.disabled) > .grab {
     cursor: grab;
@@ -117,6 +118,22 @@
               display: flex;
               align-items: center;
 
+              .form-image {
+                position: relative;
+                margin: 15px 10px 15px 10px;
+                i.i-close {
+                  position: absolute;
+                  top: -20px;
+                  left: -20px;
+                  margin: auto 1%;
+                }
+                &-upload {
+                  display: flex;
+                  width: 25%;
+                  margin: 10px;
+                }
+              }
+
               select {
                 margin-left: 6%;
               }
@@ -131,9 +148,6 @@
                 }
               }
 
-              i.i-cancel {
-                margin: auto 1%;
-              }
             }
 
             textarea {
@@ -148,6 +162,39 @@
               flex-direction: column;
               align-items: center;
             }
+
+            question-type-singleanswer, question-type-multipleanswer {
+
+              /* Ajuster la taille de <image-select> */
+              .image-select {
+                width: 100px;
+                height: 100px;
+              }
+
+              /* Ajuster la taille de l'image dans la directive <image-select> */
+              .image-select .initialFloat.cell img {
+                width: 100px;
+                height: 100px;
+              }
+
+              /* Ajuster la taille de l'image affichée dans la balise <img> */
+              img {
+                width: 100px;
+                height: 100px;
+                object-fit: cover;
+              }
+
+              .image-container {
+                position: relative;
+                width: 125px;
+              }
+
+              .image-container .i-close {
+                position: absolute;
+                top: 0;
+                right: 0;
+              }
+            }
           }
 
           .question-bottom, .section-bottom {

package/scss/specifics/formulaire/components/_icon.scss

@@ -236,4 +236,15 @@ i {
     font-family: 'formulaire-mdi';
     content: "\F99A";
   }
+
+  &.i-image::before {
+    font-family: 'formulaire-mdi';
+    content: "\F2E9";
+    color: $formulaire-orange;
+  }
+
+  &.i-close::before {
+    font-family: 'formulaire-mdi';
+    content: "\F159";
+  }
 }

package/scss/specifics/formulaire/components/_respond-question.scss

@@ -18,7 +18,7 @@
     &-main {
       display: flex;
       flex-direction: column;
-      font-size: 12px;
+      font-size: 14px;
 
       textarea {
         width: 100%;
@@ -50,6 +50,44 @@
       justify-content: end !important;
     }
   }
+
+  .image-container {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    flex-flow: wrap;
+
+    img {
+      width: 150px;
+      height: 150px;
+      object-fit: cover;
+      margin-top: 15px;
+    }
+
+    input[type="text"] {
+      margin-top: 10px;
+    }
+
+    .choice-image {
+      display: flex;
+      flex-direction: column;
+      margin-bottom: 15px;
+
+      .choice-text {
+        display: flex;
+        align-items: center;
+
+        .notCustomChoice {
+          height: 27.89px; // Too match the height of ODE inout text
+        }
+
+        .customInput {
+          margin-top: 0;
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
 }
 
 .respond-question .section, .result-element .section {

package/scss/specifics/ressource-aggregator/_ressource-aggregator.scss

@@ -33,13 +33,13 @@ body.mediacentre-v2 {
   }
 
   section.main {
-    top: 64px !important;
+    top: 0px !important;
     padding: 0 !important;
   }
 
   @media (max-width: $tablette) {
     section.main {
-      top: 50px !important;
+      top: 0px !important;
     }
   }