Merge remote-tracking branch 'origin/main' into UHF-11235

City-of-Helsinki · Feb 10, 2025 · 99b0473 · 99b0473
2 parents 679821f + edd2f84
commit 99b0473
Show file tree

Hide file tree

Showing 63 changed files with 597 additions and 459 deletions.
diff --git a/.github/workflows/visual.yml b/.github/workflows/visual.yml
@@ -131,7 +131,7 @@ jobs:
       - name: Evaluate if we should re-create reference images
         id: evaluate-reference-images
         if: |
-          contains( github.event.pull_request.labels.*.name, 'recreate-reference-images') ||
+          contains(github.event.pull_request.labels.*.name, 'recreate-reference-images') ||
           hashFiles('backstop/full/bitmaps_reference/') != '' ||
           github.ref == 'refs/heads/main'
         run: echo "generate-references=true" >> $GITHUB_OUTPUT

diff --git a/backstop/backstop_dynamic_config.js b/backstop/backstop_dynamic_config.js
@@ -21,7 +21,7 @@ function getConfig(hostname, protocol, type) {
     '.breadcrumb__container',
     '.block--react-and-share',
     '.footer',
-    '.sliding-popup-bottom',
+    '.hds-cc--banner',
     'iframe',
   ];
 

diff --git a/backstop/onBefore.js b/backstop/onBefore.js
@@ -1,32 +1,6 @@
-module.exports = async (page, scenario, vp, isReference, browserContext, config) => {
+module.exports = async (page) => {
+  // Simulate the "prefers-reduced-motion: reduce" media query,
+  // which is a user setting that reduces animations and transitions.
+  // It will provide less distorted test images.
   await page.emulateMedia({ reducedMotion: 'reduce' });
-
-  const { hostname } = config;
-
-  browserContext.addCookies([
-    {
-      'name': 'cookie-agreed-version',
-      'value': '1.1.0',
-      'domain': hostname,
-      'path': '/',
-      'httpOnly': false,
-      'secure': false
-    },
-    {
-      'name': 'cookie-agreed',
-      'value': '2',
-      'domain': hostname,
-      'path': '/',
-      'httpOnly': false,
-      'secure': false
-    },
-    {
-      'name': 'cookie-agreed-categories',
-      'value': '%5B%22essential%22%2C%22preference%22%2C%22statistics%22%2C%22marketing%22%2C%22chat%22%5D',
-      'domain': hostname,
-      'path': '/',
-      'httpOnly': false,
-      'secure': false
-    }
-  ]);
 };
diff --git a/dist/css/nav_global.min.css b/dist/css/nav_global.min.css
diff --git a/dist/css/styles.min.css b/dist/css/styles.min.css
diff --git a/dist/js/district-and-project-search.min.js b/dist/js/district-and-project-search.min.js
diff --git a/dist/js/embedded-content-cookie-compliance.min.js b/dist/js/embedded-content-cookie-compliance.min.js
diff --git a/dist/js/health-station-search.min.js b/dist/js/health-station-search.min.js
diff --git a/dist/js/job-search.min.js b/dist/js/job-search.min.js
diff --git a/dist/js/linkedevents.min.js b/dist/js/linkedevents.min.js
diff --git a/dist/js/maternity-and-child-health-clinic-search.min.js b/dist/js/maternity-and-child-health-clinic-search.min.js
diff --git a/dist/js/news-archive.min.js b/dist/js/news-archive.min.js
diff --git a/dist/js/ploughing-schedule.min.js b/dist/js/ploughing-schedule.min.js
diff --git a/dist/js/school-search.min.js b/dist/js/school-search.min.js
diff --git a/hdbt.libraries.yml b/hdbt.libraries.yml
@@ -65,7 +65,7 @@ hdbt-icons:
       dist/css/hdbt-icons.css: {}
 
 embedded-content-cookie-compliance:
-  version: 1.0
+  version: 1.1
   js:
     dist/js/embedded-content-cookie-compliance.min.js: {
       minified: true