Merge pull request #691 from UN-OCHA/develop

Develop -> Main - v2.1.5

.docksal/docksal.env

@@ -1,4 +1,4 @@
 DOCKSAL_STACK=default
 DOCROOT=html
 DB_IMAGE="docksal/db:1.1-mysql-5.7"
-CLI_IMAGE='docksal/cli:php8.0-build'
+CLI_IMAGE='docksal/cli:php8.2-build'

PATCHES/common_design--default-logo-remove.patch

@@ -0,0 +1,14 @@
+diff --git a/components/cd/cd-header/cd-logo.css b/components/cd/cd-header/cd-logo.css
+index b8e7821..c7b7d96 100644
+--- a/components/cd/cd-header/cd-logo.css
++++ b/components/cd/cd-header/cd-logo.css
+@@ -14,9 +14,6 @@
+   float: left;
+   width: var(--brand-logo-mobile-width, 52px);
+   height: var(--cd-site-header-height);
+-  background:
+-    linear-gradient(transparent, transparent),
+-    url(../../../img/logos/ocha-logo-blue.svg) center no-repeat;
+ }
+
+ /* Mobile: Hides logo set in info.yml in favour of background image. */

composer.json

@@ -41,7 +41,7 @@
         "drupal/imagemagick": "^3.4",
         "drupal/inline_entity_form": "^1.0@rc",
         "drupal/mailsystem": "^4.4",
-        "drupal/maintenance200": "^1.1",
+        "drupal/maintenance200": "^2",
         "drupal/memcache": "^2.5",
         "drupal/metatag": "^1.22",
         "drupal/mimemail": "^1.0@alpha",
@@ -71,6 +71,7 @@
         "reliefweb/simple-datepicker": "^v1.3",
         "symfony/uid": "^6.2",
         "unocha/common_design": "^9.2",
+        "unocha/ocha_monitoring": "^1.0",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {