diff --git a/composer.json b/composer.json index 50150830..8175a64d 100644 --- a/composer.json +++ b/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" diff --git a/composer.lock b/composer.lock index 789b9c48..788e92d3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a3c16d2f4107a4af3d4bd97ee698ba7f", + "content-hash": "5048ff880de3c7323fbb47551ed50648", "packages": [ { "name": "asm89/stack-cors", @@ -264,12 +264,12 @@ "version": "v10.2.0", "source": { "type": "git", - "url": "https://github.com/Choices-js/Choices.git", + "url": "git@github.com:jshjohnson/Choices.git", "reference": "5dbea2825a5887d88d6947443f4874bb7b84cc3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Choices-js/Choices/zipball/5dbea2825a5887d88d6947443f4874bb7b84cc3a", + "url": "https://api.github.com/repos/jshjohnson/Choices/zipball/5dbea2825a5887d88d6947443f4874bb7b84cc3a", "reference": "5dbea2825a5887d88d6947443f4874bb7b84cc3a" }, "type": "bower-asset" @@ -5164,17 +5164,17 @@ }, { "name": "drupal/sophron", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sophron.git", - "reference": "2.0.1" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sophron-2.0.1.zip", - "reference": "2.0.1", - "shasum": "eb9b22e843400392ba7fa35dc99c644d2cf08982" + "url": "https://ftp.drupal.org/files/projects/sophron-2.0.2.zip", + "reference": "2.0.2", + "shasum": "ed5d910d6612ea591950b67384cc5ff26c5c7cc9" }, "require": { "drupal/core": "^10", @@ -5183,8 +5183,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.1", - "datestamp": "1676319965", + "version": "2.0.2", + "datestamp": "1699798487", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6064,16 +6064,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d" + "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", - "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/0795b7db12838ffb7bc564e0a02cf53fb1463ec0", + "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0", "shasum": "" }, "require": { @@ -6120,9 +6120,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.2" + "source": "https://github.com/FileEye/MimeMap/tree/2.0.3" }, - "time": "2023-08-29T16:20:26+00:00" + "time": "2023-11-11T14:14:23+00:00" }, { "name": "fileeye/pel", @@ -7149,37 +7149,37 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.1", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c" + "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/920c6b972a832046327f66dc6ff7448e3b5d6e4c", - "reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6", + "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6", "shasum": "" }, "require": { "php": "^7.4 || ^8.0", "phpstan/phpstan": "^1.10.1", "phpstan/phpstan-deprecation-rules": "^1.1.4", - "symfony/finder": "~3.4.5 ||^4.2 || ^5.0 || ^6.0", - "symfony/yaml": "~3.4.5 || ^4.2|| ^5.0 || ^6.0", + "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0", + "symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0", "webflo/drupal-finder": "^1.2" }, "require-dev": { "behat/mink": "^1.8", "composer/installers": "^1.9", - "drupal/core-recommended": "^8.8@alpha || ^9.0", - "drush/drush": "^9.6 || ^10.0 || ^11", + "drupal/core-recommended": "^9.0", + "drush/drush": "^10.0 || ^11 || ^12", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9", + "phpunit/phpunit": "^8.5 || ^9", "slevomat/coding-standard": "^7.1", "squizlabs/php_codesniffer": "^3.3", - "symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.0" + "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0" }, "suggest": { "jangregor/phpstan-prophecy": "Provides a prophecy/prophecy extension for phpstan/phpstan.", @@ -7233,7 +7233,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.1" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.4" }, "funding": [ { @@ -7249,7 +7249,7 @@ "type": "tidelift" } ], - "time": "2023-11-03T13:17:28+00:00" + "time": "2023-11-14T22:47:32+00:00" }, { "name": "mikey179/vfsstream", @@ -11103,16 +11103,16 @@ }, { "name": "symfony/browser-kit", - "version": "v6.3.2", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d" + "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ca4a988488f61ac18f8f845445eabdd36f89aa8d", - "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e270297dbee59168274c2b535ab1bccd593e6ffe", + "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe", "shasum": "" }, "require": { @@ -11151,7 +11151,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.3.2" + "source": "https://github.com/symfony/browser-kit/tree/v6.3.8" }, "funding": [ { @@ -11167,20 +11167,20 @@ "type": "tidelift" } ], - "time": "2023-07-06T06:56:43+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/console", - "version": "v6.3.4", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", "shasum": "" }, "require": { @@ -11241,7 +11241,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.4" + "source": "https://github.com/symfony/console/tree/v6.3.8" }, "funding": [ { @@ -11257,7 +11257,7 @@ "type": "tidelift" } ], - "time": "2023-08-16T10:10:12+00:00" + "time": "2023-10-31T08:09:35+00:00" }, { "name": "symfony/css-selector", @@ -11326,16 +11326,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993" + "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993", - "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f30f545c4151f611148fc19e28d54d39e0a00bc", + "reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc", "shasum": "" }, "require": { @@ -11387,7 +11387,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.3.5" + "source": "https://github.com/symfony/dependency-injection/tree/v6.3.8" }, "funding": [ { @@ -11403,7 +11403,7 @@ "type": "tidelift" } ], - "time": "2023-09-25T16:46:40+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/deprecation-contracts", @@ -11898,16 +11898,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e" + "reference": "ce332676de1912c4389222987193c3ef38033df6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/59d1837d5d992d16c2628cd0d6b76acf8d69b33e", - "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ce332676de1912c4389222987193c3ef38033df6", + "reference": "ce332676de1912c4389222987193c3ef38033df6", "shasum": "" }, "require": { @@ -11955,7 +11955,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.7" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.8" }, "funding": [ { @@ -11971,20 +11971,20 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:55:27+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6d4098095f93279d9536a0e9124439560cc764d0" + "reference": "929202375ccf44a309c34aeca8305408442ebcc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6d4098095f93279d9536a0e9124439560cc764d0", - "reference": "6d4098095f93279d9536a0e9124439560cc764d0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/929202375ccf44a309c34aeca8305408442ebcc1", + "reference": "929202375ccf44a309c34aeca8305408442ebcc1", "shasum": "" }, "require": { @@ -12068,7 +12068,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.3.7" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.8" }, "funding": [ { @@ -12084,7 +12084,7 @@ "type": "tidelift" } ], - "time": "2023-10-29T14:31:45+00:00" + "time": "2023-11-10T13:47:32+00:00" }, { "name": "symfony/intl", @@ -12170,16 +12170,16 @@ }, { "name": "symfony/lock", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "7e5d1412827aa97e90f9af9495d452f0b9465a85" + "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/7e5d1412827aa97e90f9af9495d452f0b9465a85", - "reference": "7e5d1412827aa97e90f9af9495d452f0b9465a85", + "url": "https://api.github.com/repos/symfony/lock/zipball/5379d56b6cedba2d9dfb86563c4ed73de5b194ca", + "reference": "5379d56b6cedba2d9dfb86563c4ed73de5b194ca", "shasum": "" }, "require": { @@ -12229,7 +12229,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.3.7" + "source": "https://github.com/symfony/lock/tree/v6.3.8" }, "funding": [ { @@ -12245,7 +12245,7 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:55:27+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/mime", @@ -12333,16 +12333,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v6.3.6", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d" + "reference": "45610900872a35b77db7698651f36129906041ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d", - "reference": "c6f1df6a76c2c12bd14a0a5bf7c556dd935efe1d", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/45610900872a35b77db7698651f36129906041ea", + "reference": "45610900872a35b77db7698651f36129906041ea", "shasum": "" }, "require": { @@ -12394,7 +12394,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.6" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.8" }, "funding": [ { @@ -12410,7 +12410,7 @@ "type": "tidelift" } ], - "time": "2023-10-12T15:02:41+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/polyfill-ctype", @@ -13540,16 +13540,16 @@ }, { "name": "symfony/serializer", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9" + "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9", - "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9", + "url": "https://api.github.com/repos/symfony/serializer/zipball/b3ad1515a276473f7919ac97e560017284a7c4bf", + "reference": "b3ad1515a276473f7919ac97e560017284a7c4bf", "shasum": "" }, "require": { @@ -13614,7 +13614,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.3.7" + "source": "https://github.com/symfony/serializer/tree/v6.3.8" }, "funding": [ { @@ -13630,7 +13630,7 @@ "type": "tidelift" } ], - "time": "2023-10-26T18:15:14+00:00" + "time": "2023-11-07T10:11:25+00:00" }, { "name": "symfony/service-contracts", @@ -13716,16 +13716,16 @@ }, { "name": "symfony/string", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + "reference": "13880a87790c76ef994c91e87efb96134522577a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", + "reference": "13880a87790c76ef994c91e87efb96134522577a", "shasum": "" }, "require": { @@ -13782,7 +13782,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -13798,7 +13798,7 @@ "type": "tidelift" } ], - "time": "2023-09-18T10:38:32+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "symfony/translation-contracts", @@ -13880,16 +13880,16 @@ }, { "name": "symfony/validator", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1" + "reference": "f75b40e088d095db1e788b81605a76f4563cb80e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/9cc736663fa5839b9710ac2c303bb0b951014fc1", - "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1", + "url": "https://api.github.com/repos/symfony/validator/zipball/f75b40e088d095db1e788b81605a76f4563cb80e", + "reference": "f75b40e088d095db1e788b81605a76f4563cb80e", "shasum": "" }, "require": { @@ -13956,7 +13956,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.3.7" + "source": "https://github.com/symfony/validator/tree/v6.3.8" }, "funding": [ { @@ -13972,20 +13972,20 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:11:45+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.3.6", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97" + "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/999ede244507c32b8e43aebaa10e9fce20de7c97", - "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/81acabba9046550e89634876ca64bfcd3c06aa0a", + "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a", "shasum": "" }, "require": { @@ -14040,7 +14040,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.3.8" }, "funding": [ { @@ -14056,7 +14056,7 @@ "type": "tidelift" } ], - "time": "2023-10-12T18:45:56+00:00" + "time": "2023-11-08T10:42:36+00:00" }, { "name": "symfony/var-exporter", @@ -14134,16 +14134,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8" + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8", - "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", "shasum": "" }, "require": { @@ -14186,7 +14186,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.7" + "source": "https://github.com/symfony/yaml/tree/v6.3.8" }, "funding": [ { @@ -14202,7 +14202,7 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:31:00+00:00" + "time": "2023-11-06T10:58:05+00:00" }, { "name": "theseer/tokenizer", @@ -14385,16 +14385,16 @@ }, { "name": "unocha/common_design", - "version": "v9.1.0", + "version": "v9.2.2", "source": { "type": "git", "url": "https://github.com/UN-OCHA/common_design.git", - "reference": "b58e4f2ec8508942b5e08acaeccfe58e928a8042" + "reference": "f582963b5848d92b42de871b628f52c5a9f34930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/b58e4f2ec8508942b5e08acaeccfe58e928a8042", - "reference": "b58e4f2ec8508942b5e08acaeccfe58e928a8042", + "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/f582963b5848d92b42de871b628f52c5a9f34930", + "reference": "f582963b5848d92b42de871b628f52c5a9f34930", "shasum": "" }, "require": { @@ -14409,9 +14409,9 @@ "description": "OCHA Common Design base theme for Drupal 9+", "support": { "issues": "https://github.com/UN-OCHA/common_design/issues", - "source": "https://github.com/UN-OCHA/common_design/tree/v9.1.0" + "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.2" }, - "time": "2023-09-13T11:46:43+00:00" + "time": "2023-10-26T10:03:06+00:00" }, { "name": "unocha/ocha_key_figures", diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css index 8085e3ca..6ebff198 100644 --- a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css +++ b/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; -} diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/VERSION b/html/themes/custom/common_design_subtheme/components/rw-icons/VERSION index 9084fa2f..524cb552 100644 --- a/html/themes/custom/common_design_subtheme/components/rw-icons/VERSION +++ b/html/themes/custom/common_design_subtheme/components/rw-icons/VERSION @@ -1 +1 @@ -1.1.0 +1.1.1 diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg b/html/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg index eaadc3b8..b6c4e6e0 100644 --- a/html/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg +++ b/html/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php index 9b3ee159..8b6bc97e 100644 --- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php +++ b/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; diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css index daae3f00..44e7259b 100644 --- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css +++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css @@ -8,78 +8,84 @@ --rw-icons--common--18--dark-blue--x: -64px; --rw-icons--common--18--dark-grey--x: -82px; --rw-icons--common--18--white--x: -100px; - --rw-icons--common--arrow-right--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") 0 0 no-repeat; - --rw-icons--common--arrow-right--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -8px 0 no-repeat; - --rw-icons--common--arrow-right--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -16px 0 no-repeat; - --rw-icons--common--arrow-right--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -28px 0 no-repeat; - --rw-icons--common--arrow-right--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -40px 0 no-repeat; - --rw-icons--common--arrow-right--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -52px 0 no-repeat; - --rw-icons--common--arrow-right--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -64px 0 no-repeat; - --rw-icons--common--arrow-right--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -82px 0 no-repeat; - --rw-icons--common--arrow-right--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -100px 0 no-repeat; - --rw-icons--common--close--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") 0 -8px no-repeat; - --rw-icons--common--close--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -8px -8px no-repeat; - --rw-icons--common--close--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -16px -12px no-repeat; - --rw-icons--common--close--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -28px -12px no-repeat; - --rw-icons--common--close--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -40px -12px no-repeat; - --rw-icons--common--close--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -52px -12px no-repeat; - --rw-icons--common--close--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -64px -18px no-repeat; - --rw-icons--common--close--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -82px -18px no-repeat; - --rw-icons--common--close--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -100px -18px no-repeat; - --rw-icons--common--download--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") 0 -16px no-repeat; - --rw-icons--common--download--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -8px -16px no-repeat; - --rw-icons--common--download--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -16px -24px no-repeat; - --rw-icons--common--download--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -28px -24px no-repeat; - --rw-icons--common--download--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -40px -24px no-repeat; - --rw-icons--common--download--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -52px -24px no-repeat; - --rw-icons--common--download--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -64px -36px no-repeat; - --rw-icons--common--download--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -82px -36px no-repeat; - --rw-icons--common--download--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -100px -36px no-repeat; - --rw-icons--common--external-link--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") 0 -24px no-repeat; - --rw-icons--common--external-link--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -8px -24px no-repeat; - --rw-icons--common--external-link--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -16px -36px no-repeat; - --rw-icons--common--external-link--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -28px -36px no-repeat; - --rw-icons--common--external-link--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -40px -36px no-repeat; - --rw-icons--common--external-link--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -52px -36px no-repeat; - --rw-icons--common--external-link--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -64px -54px no-repeat; - --rw-icons--common--external-link--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -82px -54px no-repeat; - --rw-icons--common--external-link--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -100px -54px no-repeat; - --rw-icons--common--help--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") 0 -32px no-repeat; - --rw-icons--common--help--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -8px -32px no-repeat; - --rw-icons--common--help--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -16px -48px no-repeat; - --rw-icons--common--help--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -28px -48px no-repeat; - --rw-icons--common--help--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -40px -48px no-repeat; - --rw-icons--common--help--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -52px -48px no-repeat; - --rw-icons--common--help--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -64px -72px no-repeat; - --rw-icons--common--help--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -82px -72px no-repeat; - --rw-icons--common--help--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -100px -72px no-repeat; - --rw-icons--content--16--dark-grey--x: -118px; - --rw-icons--content--24--grey--x: -134px; - --rw-icons--content--36--dark-blue--x: -158px; - --rw-icons--content--infographic--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -118px 0 no-repeat; - --rw-icons--content--infographic--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -134px 0 no-repeat; - --rw-icons--content--infographic--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -158px 0 no-repeat; - --rw-icons--content--interactive--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -118px -16px no-repeat; - --rw-icons--content--interactive--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -134px -24px no-repeat; - --rw-icons--content--interactive--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -158px -36px no-repeat; - --rw-icons--content--job--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -118px -32px no-repeat; - --rw-icons--content--job--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -134px -48px no-repeat; - --rw-icons--content--job--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -158px -72px no-repeat; - --rw-icons--content--map--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -118px -48px no-repeat; - --rw-icons--content--map--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -134px -72px no-repeat; - --rw-icons--content--map--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -158px -108px no-repeat; - --rw-icons--content--report--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -118px -64px no-repeat; - --rw-icons--content--report--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -134px -96px no-repeat; - --rw-icons--content--report--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -158px -144px no-repeat; - --rw-icons--content--training--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -118px -80px no-repeat; - --rw-icons--content--training--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -134px -120px no-repeat; - --rw-icons--content--training--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -158px -180px no-repeat; - --rw-icons--map-marker--24--blue--x: -194px; - --rw-icons--map-marker--24--grey--x: -218px; - --rw-icons--map-marker--24--orange--x: -242px; - --rw-icons--map-marker--24--red--x: -266px; - --rw-icons--map-marker--marker--24--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -194px 0 no-repeat; - --rw-icons--map-marker--marker--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -218px 0 no-repeat; - --rw-icons--map-marker--marker--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -242px 0 no-repeat; - --rw-icons--map-marker--marker--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.0") -266px 0 no-repeat; + --rw-icons--common--arrow-right--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") 0 0 no-repeat; + --rw-icons--common--arrow-right--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -8px 0 no-repeat; + --rw-icons--common--arrow-right--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -16px 0 no-repeat; + --rw-icons--common--arrow-right--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -28px 0 no-repeat; + --rw-icons--common--arrow-right--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -40px 0 no-repeat; + --rw-icons--common--arrow-right--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -52px 0 no-repeat; + --rw-icons--common--arrow-right--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -64px 0 no-repeat; + --rw-icons--common--arrow-right--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -82px 0 no-repeat; + --rw-icons--common--arrow-right--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -100px 0 no-repeat; + --rw-icons--common--close--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") 0 -8px no-repeat; + --rw-icons--common--close--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -8px -8px no-repeat; + --rw-icons--common--close--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -16px -12px no-repeat; + --rw-icons--common--close--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -28px -12px no-repeat; + --rw-icons--common--close--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -40px -12px no-repeat; + --rw-icons--common--close--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -52px -12px no-repeat; + --rw-icons--common--close--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -64px -18px no-repeat; + --rw-icons--common--close--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -82px -18px no-repeat; + --rw-icons--common--close--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -100px -18px no-repeat; + --rw-icons--common--download--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") 0 -16px no-repeat; + --rw-icons--common--download--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -8px -16px no-repeat; + --rw-icons--common--download--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -16px -24px no-repeat; + --rw-icons--common--download--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -28px -24px no-repeat; + --rw-icons--common--download--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -40px -24px no-repeat; + --rw-icons--common--download--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -52px -24px no-repeat; + --rw-icons--common--download--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -64px -36px no-repeat; + --rw-icons--common--download--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -82px -36px no-repeat; + --rw-icons--common--download--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -100px -36px no-repeat; + --rw-icons--common--external-link--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") 0 -24px no-repeat; + --rw-icons--common--external-link--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -8px -24px no-repeat; + --rw-icons--common--external-link--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -16px -36px no-repeat; + --rw-icons--common--external-link--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -28px -36px no-repeat; + --rw-icons--common--external-link--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -40px -36px no-repeat; + --rw-icons--common--external-link--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -52px -36px no-repeat; + --rw-icons--common--external-link--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -64px -54px no-repeat; + --rw-icons--common--external-link--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -82px -54px no-repeat; + --rw-icons--common--external-link--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -100px -54px no-repeat; + --rw-icons--common--help--8--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") 0 -32px no-repeat; + --rw-icons--common--help--8--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -8px -32px no-repeat; + --rw-icons--common--help--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -16px -48px no-repeat; + --rw-icons--common--help--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -28px -48px no-repeat; + --rw-icons--common--help--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -40px -48px no-repeat; + --rw-icons--common--help--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -52px -48px no-repeat; + --rw-icons--common--help--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -64px -72px no-repeat; + --rw-icons--common--help--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -82px -72px no-repeat; + --rw-icons--common--help--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -100px -72px no-repeat; + --rw-icons--toggle--12--blue--x: -118px; + --rw-icons--toggle--12--white--x: -130px; + --rw-icons--toggle--down--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -118px 0 no-repeat; + --rw-icons--toggle--down--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -130px 0 no-repeat; + --rw-icons--toggle--up--12--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -118px -12px no-repeat; + --rw-icons--toggle--up--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -130px -12px no-repeat; + --rw-icons--content--16--dark-grey--x: -142px; + --rw-icons--content--24--grey--x: -158px; + --rw-icons--content--36--dark-blue--x: -182px; + --rw-icons--content--infographic--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -142px 0 no-repeat; + --rw-icons--content--infographic--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -158px 0 no-repeat; + --rw-icons--content--infographic--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -182px 0 no-repeat; + --rw-icons--content--interactive--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -142px -16px no-repeat; + --rw-icons--content--interactive--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -158px -24px no-repeat; + --rw-icons--content--interactive--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -182px -36px no-repeat; + --rw-icons--content--job--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -142px -32px no-repeat; + --rw-icons--content--job--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -158px -48px no-repeat; + --rw-icons--content--job--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -182px -72px no-repeat; + --rw-icons--content--map--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -142px -48px no-repeat; + --rw-icons--content--map--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -158px -72px no-repeat; + --rw-icons--content--map--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -182px -108px no-repeat; + --rw-icons--content--report--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -142px -64px no-repeat; + --rw-icons--content--report--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -158px -96px no-repeat; + --rw-icons--content--report--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -182px -144px no-repeat; + --rw-icons--content--training--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -142px -80px no-repeat; + --rw-icons--content--training--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -158px -120px no-repeat; + --rw-icons--content--training--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -182px -180px no-repeat; + --rw-icons--map-marker--24--blue--x: -218px; + --rw-icons--map-marker--24--grey--x: -242px; + --rw-icons--map-marker--24--orange--x: -266px; + --rw-icons--map-marker--24--red--x: -290px; + --rw-icons--map-marker--marker--24--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -218px 0 no-repeat; + --rw-icons--map-marker--marker--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -242px 0 no-repeat; + --rw-icons--map-marker--marker--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -266px 0 no-repeat; + --rw-icons--map-marker--marker--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg?v=1.1.1") -290px 0 no-repeat; } diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json index 2851d7db..e8178001 100644 --- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json +++ b/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": [ diff --git a/html/themes/custom/common_design_subtheme/components/uno-document/uno-document.css b/html/themes/custom/common_design_subtheme/components/uno-document/uno-document.css index 1b5cb1a4..609347d8 100644 --- a/html/themes/custom/common_design_subtheme/components/uno-document/uno-document.css +++ b/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); diff --git a/html/themes/custom/common_design_subtheme/components/uno-donors/uno-donors.css b/html/themes/custom/common_design_subtheme/components/uno-donors/uno-donors.css index 04a1dff0..09c62134 100644 --- a/html/themes/custom/common_design_subtheme/components/uno-donors/uno-donors.css +++ b/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 { diff --git a/html/themes/custom/common_design_subtheme/components/uno-river/uno-river.css b/html/themes/custom/common_design_subtheme/components/uno-river/uno-river.css index 2446e4d3..f25b84d9 100644 --- a/html/themes/custom/common_design_subtheme/components/uno-river/uno-river.css +++ b/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); diff --git a/html/themes/custom/common_design_subtheme/components/uno-stories/uno-stories.css b/html/themes/custom/common_design_subtheme/components/uno-stories/uno-stories.css index e18a514e..c483e50a 100644 --- a/html/themes/custom/common_design_subtheme/components/uno-stories/uno-stories.css +++ b/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); } diff --git a/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg index d8f01211..fc00ff02 100644 --- a/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg +++ b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg index dbc52e65..9d3c1b7f 100644 --- a/html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg +++ b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg @@ -1 +1 @@ - + diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg index ce99fc5b..8fa7dde8 100644 --- a/html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg +++ b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg @@ -1 +1 @@ - + diff --git a/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg b/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg index 1f9057e5..631f626c 100644 --- a/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg +++ b/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html index 9bfb4bd8..e3f7acd1 100644 --- a/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html +++ b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html @@ -116,6 +116,7 @@ cd-icon--arrow-right-dims { width: 48px; height: 48px; } cd-icon--arrow-up-dims { width: 48px; height: 48px; } cd-icon--arrow-up--highlighted-dims { width: 48px; height: 48px; } + cd-icon--cd-icons-sprite-dims { width: 100px; height: 100px; } cd-icon--copyurl-dims { width: 14px; height: 14px; } cd-icon--creative-commons-dims { width: 64px; height: 64px; } cd-icon--expand-left-dims { width: 48px; height: 48px; } @@ -146,7 +147,7 @@ cd-icon--social-links--email-dims { width: 48px; height: 48px; } cd-icon--social-links--facebook-dims { width: 30px; height: 30px; } cd-icon--social-links--linkedin-dims { width: 30px; height: 30px; } - cd-icon--social-links--twitter-dims { width: 17.219px; height: 14px; } + cd-icon--social-links--twitter-dims { width: 30px; height: 30px; } cd-icon--user-dims { width: 48px; height: 48px; } cd-icon--user--white-dims { width: 48px; height: 48px; } @@ -181,15 +182,16 @@ + - + - - + + @@ -204,14 +206,14 @@ - - + + - + @@ -328,6 +330,14 @@

cd-icon--arrow-up,

cd-icon--arrow-up--highlighted,

+
  • +
    + + + +
    +

    cd-icon--cd-icons-sprite,

    +
  • @@ -699,6 +709,14 @@

    cd-icon--arrow-up

    cd-icon--arrow-up--highlighted

    • +
  • +
    + + + +
    +

    cd-icon--cd-icons-sprite

    +
  • @@ -971,7 +989,7 @@

    cd-icon--user--white

    diff --git a/html/themes/custom/common_design_subtheme/templates/modules/unocha_donors/unocha-donors-list--oct-top-donors.html.twig b/html/themes/custom/common_design_subtheme/templates/modules/unocha_donors/unocha-donors-list--oct-top-donors.html.twig index 93ba12c4..bc634ae0 100644 --- a/html/themes/custom/common_design_subtheme/templates/modules/unocha_donors/unocha-donors-list--oct-top-donors.html.twig +++ b/html/themes/custom/common_design_subtheme/templates/modules/unocha_donors/unocha-donors-list--oct-top-donors.html.twig @@ -22,6 +22,8 @@ #} {% if list is not empty %} {{ attach_library('common_design_subtheme/uno-donors') }} +{{ attach_library('common_design/cd-disclosure') }} + {% set year = year ?? date('Y') %} {% set title = 'Funding for OCHA in @year'|t({'@year': year}) %} {% set title_id = id ~ '-title' %} @@ -78,41 +80,61 @@ } } if (count > 10) { - content.setAttribute('data-cd-toggable', '{% trans %}Show all donors{% endtrans %}'); - content.setAttribute('data-cd-toggable-expanded', '{% trans %}Show top 10 donors{% endtrans %}'); - content.setAttribute('data-cd-toggable-keep', ''); - content.setAttribute('data-cd-insert-after', ''); - content.setAttribute('data-cd-icon', 'arrow-down'); - content.setAttribute('data-cd-component', 'uno-donors'); - content.setAttribute('data-cd-replace', '{{ list_id }}-dummy'); - } + content.classList.add('cd-disclosure'); + content.setAttribute('data-cd-disclosure', ''); + content.setAttribute('data-cd-disclosure-label', '{% trans %}Show all donors{% endtrans %}'); + content.setAttribute('data-cd-disclosure-insert', 'after'); + content.setAttribute('data-cd-disclosure-classnames', 'cd-disclosure-toggler'); + + // Scroll to the title of the section containing the donor list when + // expanding it so that users can read the full list and use the + // keyboard navigation to go through the content. When hiding the list, + // scroll to the toggler to avoid jumping lower on the page. + if ('MutationObserver' in window) { + var observer = new MutationObserver(function (mutations) { + for (var mutation of mutations) { + if (mutation.type === 'attributes') { + // This happens the first time the disclosure element is + // processed by the cd-disclosure.js script. The script creates + // the toggler button which we can now observe to detect user + // interaction. + if (mutation.attributeName === 'data-cd-processed') { + observer.disconnect(); - // Scroll to the title of the section containing the text content when - // expanding it so that users can read the full description and use the - // keyboard navigation to go through the content. When hiding the text, - // scroll to the toggler to avoid jumping lower on the page. - if ('MutationObserver' in window) { - var observer = new MutationObserver(function (mutations) { - for (var mutation of mutations) { - if (mutation.type === 'attributes' && mutation.attributeName === 'data-cd-hidden') { - if (mutation.target.getAttribute('data-cd-hidden') === 'false') { - if (title) { - title.setAttribute('tabindex', 0); - title.focus(); - title.scrollIntoView(); - title.removeAttribute('tabindex'); + // Repurpose the observer to observe changes to the toggler. + var toggler = document.querySelector('[aria-controls="{{ list_id }}"]'); + console.log(toggler); + if (toggler) { + observer.observe(toggler, {attributes: true, attributeOldValue: true}); + } + + return; } - } - else if (mutation.oldValue === 'false') { - var toggler = document.getElementById('{{ list_id }}-toggler'); - if (toggler) { - toggler.scrollIntoView(); + // This happens when interacting with the button. + else if (mutation.attributeName === 'aria-expanded') { + if (mutation.oldValue === 'false') { + mutation.target.innerText = '{% trans %}Show top 10 donors{% endtrans %}'; + // Focus the title of the section, so people can read from + // the top of the section now that it is revealed. + if (title) { + title.setAttribute('tabindex', 0); + title.focus(); + title.scrollIntoView(); + title.removeAttribute('tabindex'); + } + } + else { + mutation.target.innerText = '{% trans %}Show all donors{% endtrans %}'; + // Focus the button to avoid jumping lower on the page, where + // the toggler previously was. + mutation.target.scrollIntoView(); + } } } } - } - }); - observer.observe(content, {attributes: true, attributeOldValue: true}); + }); + observer.observe(content, {attributes: true, attributeOldValue: true}); + } } })(); diff --git a/html/themes/custom/common_design_subtheme/templates/modules/unocha_reliefweb/unocha-reliefweb-river-article--report.html.twig b/html/themes/custom/common_design_subtheme/templates/modules/unocha_reliefweb/unocha-reliefweb-river-article--report.html.twig index 6693825b..9af964d0 100644 --- a/html/themes/custom/common_design_subtheme/templates/modules/unocha_reliefweb/unocha-reliefweb-river-article--report.html.twig +++ b/html/themes/custom/common_design_subtheme/templates/modules/unocha_reliefweb/unocha-reliefweb-river-article--report.html.twig @@ -77,20 +77,6 @@ '#theme': 'unocha_reliefweb_entity_meta', '#attributes': meta_attributes, '#meta': { - 'format': { - 'type': 'simple', - 'label': 'Format'|t, - 'value': entity.format, - 'label_attributes': create_attribute() - .addClass('visually-hidden'), - 'value_attributes': create_attribute() - .addClass('rw-entity-meta__tag-value--format--' ~ entity.format|clean_class), - }, - 'posted': { - 'type': 'date', - 'label': 'Posted'|t, - 'value': entity.posted, - }, 'published': { 'type': 'date', 'label': 'Originally published'|t,