From 14025f7fe271c3d7128f628dcdc6f93195fb5b69 Mon Sep 17 00:00:00 2001 From: Aaron Zinck Date: Mon, 12 Sep 2022 09:58:45 -0400 Subject: [PATCH 1/3] Reference a static patch rather than dynamically referencing a merge request --- services/drupal/composer.patches.json | 2 +- .../viewsreference_filter-fix_dependency-3193406.patch | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 services/drupal/patches/viewsreference_filter-fix_dependency-3193406.patch diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json index e0c9676432..6b0ab106d4 100644 --- a/services/drupal/composer.patches.json +++ b/services/drupal/composer.patches.json @@ -124,7 +124,7 @@ "drupal_git/viewsreference_filter": { "Fix autocomplete": "https://www.drupal.org/files/issues/2021-03-26/viewsreference_filter-autocomplete_problems-and-sort-combined-3201294-6--3168765-4.patch", "Allow different settings for different blocks": "https://www.drupal.org/files/issues/2020-10-20/viewsreference_filter-shared_config-3132416-3.patch", - "Fix views dependency declaration": "https://git.drupalcode.org/project/viewsreference_filter/-/merge_requests/1.diff" + "Fix views dependency declaration": "patches/viewsreference_filter-fix_dependency-3193406.patch" }, "guzzlehttp/guzzle": { "Add exception handling": "patches/guzzle_recursive_exception.patch" diff --git a/services/drupal/patches/viewsreference_filter-fix_dependency-3193406.patch b/services/drupal/patches/viewsreference_filter-fix_dependency-3193406.patch new file mode 100644 index 0000000000..d57925a148 --- /dev/null +++ b/services/drupal/patches/viewsreference_filter-fix_dependency-3193406.patch @@ -0,0 +1,10 @@ +diff --git a/viewsreference_filter.info.yml b/viewsreference_filter.info.yml +index 5a88100f1128774f23c9f4e54c61d8ce8e0ae025..a1dcc62c0d19b0748d1d43ef38dd71ce07aba0a6 100644 +--- a/viewsreference_filter.info.yml ++++ b/viewsreference_filter.info.yml +@@ -6,4 +6,4 @@ core_version_requirement: ^8 || ^9 + package: 'Views' + dependencies: + - viewsreference:viewsreference +- - views:views ++ - drupal:views From 87b2d132b688c45be069ab0233037e8db1a59283 Mon Sep 17 00:00:00 2001 From: Dan Mouyard Date: Mon, 12 Sep 2022 11:37:45 -0400 Subject: [PATCH 2/3] EPAD8-1838: Remove exit icon from social media links in the footer --- .../05-components/menu/menu--social/_menu--social.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/menu/menu--social/_menu--social.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/menu/menu--social/_menu--social.scss index 5c60de5e93..eabf68b163 100644 --- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/menu/menu--social/_menu--social.scss +++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/menu/menu--social/_menu--social.scss @@ -33,7 +33,7 @@ $social-menu-gap: rem(gesso-spacing(1)); // Hide external link icon/tag. &::after, - .external-link__tag { + .icon--exit { display: none !important; } } From fb4cebc10c5b1dae95cad68f961ee011a94b636c Mon Sep 17 00:00:00 2001 From: Dan Mouyard Date: Mon, 12 Sep 2022 11:38:43 -0400 Subject: [PATCH 3/3] EPAD8-1838: Remove unnecessary styles --- .../box/box--multipurpose/_box--multipurpose.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/box--multipurpose/_box--multipurpose.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/box--multipurpose/_box--multipurpose.scss index 5cd7b10083..a19653c02c 100644 --- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/box--multipurpose/_box--multipurpose.scss +++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/box--multipurpose/_box--multipurpose.scss @@ -3,10 +3,4 @@ .box--multipurpose { @extend %box--with-borders; - - > .box__title { - .external-link__tag { - background-color: gesso-brand(blue, dark); - } - } }