Merge pull request #404 from UN-OCHA/develop

Deploy 22-11-2023

composer.json

@@ -28,7 +28,7 @@
         "drupal/allowed_formats": "^2.0",
         "drupal/choices": "^2.1",
         "drupal/components": "^3.0@beta",
-        "drupal/config_split": "@rc",
+        "drupal/config_split": "^2.0.0@rc",
         "drupal/core-composer-scaffold": "^10",
         "drupal/core-dev": "^10",
         "drupal/core-recommended": "^10",
@@ -71,7 +71,7 @@
         "drush/drush": "^11.3",
         "oomphinc/composer-installers-extender": "^2.0",
         "orakili/composer-drupal-info-file-patch-helper": "^1",
-        "unocha/common_design": "^9.1",
+        "unocha/common_design": "^9.2",
         "unocha/ocha_key_figures": "^2.0",
         "unocha/ocha_search": "^1.0",
         "webflo/drupal-finder": "^1.2.2"

html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css

@@ -183,11 +183,3 @@
   float: left;
   margin: 0 4px 0 0;
 }
-
-/* UNO display rules */
-.rw-entity-meta--core dt.rw-entity-meta__tag-label--format,
-.rw-entity-meta--core dd.rw-entity-meta__tag-value--format,
-.rw-entity-meta--core dt.rw-entity-meta__tag-label--posted,
-.rw-entity-meta--core dd.rw-entity-meta__tag-value--posted {
-  display: none;
-}

html/themes/custom/common_design_subtheme/components/rw-icons/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php

@@ -243,9 +243,8 @@ function parse_icon($category, $path, \DomElement $parent) {
 
   // Clean the imported symbol's content.
   foreach ($symbol->childNodes as $child) {
-    if ($child->hasAttributes()) {
-      $child->removeAttributeNS('http://www.w3.org/2000/svg', 'default');
-    }
+    $child->removeAttributeNS('http://www.w3.org/2000/svg', 'default');
+    $child->removeAttributeNS('http://www.w3.org/2000/svg', '');
   }
 
   return $id;

html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json

@@ -40,6 +40,19 @@
         ]
       }
     },
+    "toggle": {
+      "source": "img/icons/common",
+      "include": [
+        "up",
+        "down"
+      ],
+      "sizes": {
+        "12": [
+          "blue",
+          "white"
+        ]
+      }
+    },
     "content": {
       "source": "img/icons/common",
       "include": [

html/themes/custom/common_design_subtheme/components/uno-document/uno-document.css

@@ -73,13 +73,13 @@
   display: none;
 }
 
-.paragraph--type--reliefweb-document.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--posted,
-.paragraph--type--reliefweb-document.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--posted {
+.paragraph--type--reliefweb-document.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--published,
+.paragraph--type--reliefweb-document.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--published {
   display: inline-block;
 }
 
-.paragraph--type--reliefweb-document.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--posted,
-.paragraph--type--reliefweb-document.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--posted,
+.paragraph--type--reliefweb-document.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--published,
+.paragraph--type--reliefweb-document.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--published,
 .paragraph--type--reliefweb-document.paragraph--view-mode--teasers .cd-read-more,
 .paragraph--type--reliefweb-document.paragraph--view-mode--cards .cd-read-more {
   font-size: var(--cd-font-size--small);

html/themes/custom/common_design_subtheme/components/uno-donors/uno-donors.css

@@ -173,7 +173,24 @@ ul.uno-donors__list--with-figures .uno-donors__amount {
 }
 
 /* Javascript enabled */
-.js .uno-donors button {
+/* Overrides the default behavior when the donor list os collapsed so that it
+ * is always displayed and only the number of displayed donors changes. */
+.js .uno-donors--collapsible .uno-donors__list.cd-disclosure--is-collapsed {
+  display: block;
+}
+/* Display only the first 10 donors. */
+.js .uno-donors--collapsible .uno-donors__list.cd-disclosure--is-collapsed .uno-donor {
+  display: none;
+}
+.js .uno-donors--collapsible .uno-donors__list.cd-disclosure--is-collapsed .uno-donor:nth-child(-n+10) {
+  display: block;
+}
+/* Show all the paragraphs when toggled. */
+.js .uno-donors--collapsible .uno-donors__list:not(.cd-disclosure--is-collapsed) .uno-donor {
+  display: block;
+}
+/* Style the toggler. */
+.js .uno-donors--collapsible .cd-disclosure-toggler {
   display: inline-flex;
   align-items: center;
   justify-content: space-between;
@@ -193,39 +210,30 @@ ul.uno-donors__list--with-figures .uno-donors__amount {
   fill: var(--brand-primary--dark);
   -webkit-appearance: none;
 }
-.js .uno-donors--collapsible button svg {
-  width: 0.75rem;
-  height: 0.75rem;
-  margin-inline-start: 1rem;
-  margin-inline-end: 0.25rem;
-  transition: fill 0.3s ease-in;
-  fill: currentColor;
-}
-.js .uno-donors--collapsible button:hover,
-.js .uno-donors--collapsible button:active,
-.js .uno-donors--collapsible button:focus {
+.js .uno-donors--collapsible .cd-disclosure-toggler:hover,
+.js .uno-donors--collapsible .cd-disclosure-toggler:active,
+.js .uno-donors--collapsible .cd-disclosure-toggler:focus {
   color: white;
   border-color: var(--brand-primary--dark);
   background-color: var(--brand-primary);
 }
-/* Overrides the default behavior when data-cd-hidden is set as the description
- * is always displayed, only the number of paragraphs changes. */
-.js .uno-donors--collapsible .uno-donors__list[data-cd-hidden] {
-  display: block;
-}
-.js .uno-donors--collapsible .uno-donors__list .uno-donor {
-  display: none;
-}
-/* Display only the first 3 paragraphs. */
-.js .uno-donors--collapsible .uno-donors__list .uno-donor {
-  display: none;
+.js .uno-donors--collapsible .cd-disclosure-toggler::after {
+  display: inline-block;
+  overflow: hidden;
+  width: 12px;
+  height: 12px;
+  margin: 0 4px 0 16px;
+  content: "";
+  vertical-align: middle;
+  background: var(--rw-icons--toggle--down--12--blue);
 }
-.js .uno-donors--collapsible .uno-donors__list .uno-donor:nth-child(-n+10) {
-  display: block;
+.js .uno-donors--collapsible .cd-disclosure-toggler[aria-expanded="true"]::after {
+  background: var(--rw-icons--toggle--up--12--blue);
 }
-/* Show all the paragraphs when toggled. */
-.js .uno-donors--collapsible .uno-donors__list[data-cd-hidden="false"] .uno-donor {
-  display: block;
+.js .uno-donors--collapsible .cd-disclosure-toggler:hover::after,
+.js .uno-donors--collapsible .cd-disclosure-toggler:active::after,
+.js .uno-donors--collapsible .cd-disclosure-toggler:focus::after {
+  background: var(--rw-icons--toggle--up--12--white);
 }
 
 .uno-donors__amount__suffix {

html/themes/custom/common_design_subtheme/components/uno-river/uno-river.css

@@ -130,13 +130,13 @@
   display: none;
 }
 
-.paragraph--type--reliefweb-river.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--posted,
-.paragraph--type--reliefweb-river.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--posted {
+.paragraph--type--reliefweb-river.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--published,
+.paragraph--type--reliefweb-river.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--published {
   display: inline-block;
 }
 
-.paragraph--type--reliefweb-river.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--posted,
-.paragraph--type--reliefweb-river.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--posted,
+.paragraph--type--reliefweb-river.paragraph--view-mode--teasers .rw-entity-meta .rw-entity-meta__tag-value--published,
+.paragraph--type--reliefweb-river.paragraph--view-mode--cards .rw-entity-meta .rw-entity-meta__tag-value--published,
 .paragraph--type--reliefweb-river.paragraph--view-mode--teasers .cd-read-more,
 .paragraph--type--reliefweb-river.paragraph--view-mode--cards .cd-read-more {
   font-size: var(--cd-font-size--small);

html/themes/custom/common_design_subtheme/components/uno-stories/uno-stories.css

@@ -49,6 +49,10 @@
     padding-top: 2rem;
   }
 
+  .uno-stories__content .node--type-story.node--view-mode-featured .cd-card__title {
+    flex: 1 0 100%;
+  }
+
   .uno-stories__content .node--type-story.node--view-mode-featured .cd-card__title a {
     font-size: var(--cd-font-size--medium);
   }