@eeacms/volto-eea-design-system 1.12.1 → 1.13.0

package/CHANGELOG.md

@@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.13.0](https://github.com/eea/volto-eea-design-system/compare/1.12.1...1.13.0) - 8 June 2023
+
+#### :boom: Breaking Change
+
+- breaking(footer): use url parameter instead of link for footer actions [David Ichim - [`5b9cc2c`](https://github.com/eea/volto-eea-design-system/commit/5b9cc2c8a2979f3d49d69841a57684b3f80d5ea2)]
+- breaking(footer): renamed contact-block to contact-wrapper [David Ichim - [`2fbb7df`](https://github.com/eea/volto-eea-design-system/commit/2fbb7df66eb37e17ab5391feb46d7ce2cfdfcbf3)]
+
+#### :rocket: New Features
+
+- feat(search):  added matchpath to specify search location #352 from eea/searchpopup_update [ichim-david - [`7c236d5`](https://github.com/eea/volto-eea-design-system/commit/7c236d52f5de620f77b820387181fe1d902247d3)]
+
+#### :nail_care: Enhancements
+
+- change(footer): add dedicated classes for theme sites logos [David Ichim - [`adebd04`](https://github.com/eea/volto-eea-design-system/commit/adebd04bcf5dc5b28b90db540816384fc60b4073)]
+- change(footer): header can now be added anywhere in the footer section [David Ichim - [`6ae4872`](https://github.com/eea/volto-eea-design-system/commit/6ae48728dd961d783c6a8120c8a88dc38f63eed6)]
+
+#### :house: Internal changes
+
+
+#### :house: Documentation changes
+
+- docs: Update and rename Corporate-site-templates to 2-corporate-site-templates.md [Antonio De Marinis - [`41ffc55`](https://github.com/eea/volto-eea-design-system/commit/41ffc5545def9034e3955bf967a2b0b947023528)]
+
+#### :hammer_and_wrench: Others
+
+- test: Fix test config, coverage Refs #253277 [valentinab25 - [`12f31a2`](https://github.com/eea/volto-eea-design-system/commit/12f31a2018d8c73173fc7ff091c5c3ddd3b29f64)]
+- bump package version due to breaking changes [David Ichim - [`75c83f0`](https://github.com/eea/volto-eea-design-system/commit/75c83f024dc40388086faeaec449f04da68c0d9b)]
+- Rename to eea-storybook Refs #251478 [valentinab25 - [`bc4e753`](https://github.com/eea/volto-eea-design-system/commit/bc4e753a8e604ab323a32a1315c46fc5827aadbd)]
+- added matchpath, we can independently specify on which location to apply a rule for the search popup [Zoltan Szabo - [`f4a40e0`](https://github.com/eea/volto-eea-design-system/commit/f4a40e04f50e87f5b0383a1b28d3459a2b91199b)]
 ### [1.12.1](https://github.com/eea/volto-eea-design-system/compare/1.12.0...1.12.1) - 24 May 2023
 
 #### :bug: Bug Fixes
@@ -326,7 +355,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Release 1.0.0-beta.5 [Alin Voinea - [`e4417e1`](https://github.com/eea/volto-eea-design-system/commit/e4417e121477511c350ae3fbe4e70aadb445ed86)]
 - better useOnScreen hook [Andrei Grigore - [`c214b6b`](https://github.com/eea/volto-eea-design-system/commit/c214b6b76443f81c795ce2f3aa457562ec088b30)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`b227cf8`](https://github.com/eea/volto-eea-design-system/commit/b227cf8a8c44b9d91e9fda8a7999fb0a42bacdca)]
 - feature(mobile): increased performance by lazy loading footer images #303 from eea/increase_performance [ichim-david - [`80d1df1`](https://github.com/eea/volto-eea-design-system/commit/80d1df1c459680331d486f9e8e6a95c9db0adbf6)]
 - prettier [David Ichim - [`a7f8384`](https://github.com/eea/volto-eea-design-system/commit/a7f838470c1bcc4e2be115d514d92a1b686a5e9b)]
 - fixed less build failure due to changes in footer.less [David Ichim - [`190bc8c`](https://github.com/eea/volto-eea-design-system/commit/190bc8cfa88191b45808f1e27c6e2737ee3d15b1)]
@@ -397,7 +425,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore(docusaurus): ignore website/.yarn [Giorgos Stamatis - [`0b33ffd`](https://github.com/eea/volto-eea-design-system/commit/0b33ffd1dda61b126e3cc5ff48888124d6aee41b)]
 - style(header): react syntax fix [Antonis Tarantilis - [`3add127`](https://github.com/eea/volto-eea-design-system/commit/3add1271c785a92bea0ef925d7bc562cef1e0d92)]
 
 #### :house: Documentation changes
@@ -594,7 +621,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Release 1.0.0-alpha.10 [Alin Voinea - [`7014d08`](https://github.com/eea/volto-eea-design-system/commit/7014d080ce114bd0bc039abeecbd7229333b0971)]
 - Add variable definitions [kreafox - [`293fe65`](https://github.com/eea/volto-eea-design-system/commit/293fe65e2f24e6290e1286229169a77f9be4750e)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`ef58a6f`](https://github.com/eea/volto-eea-design-system/commit/ef58a6f5ad8deea26b1395a86778fe1159b7617b)]
 - Back to dev [Alin Voinea - [`31d4616`](https://github.com/eea/volto-eea-design-system/commit/31d461662b9184a7bbe190e86f3c47fab39229fe)]
 ### [1.0.0-alpha.9](https://github.com/eea/volto-eea-design-system/compare/1.0.0-alpha.8...1.0.0-alpha.9) - 28 December 2022
 
@@ -652,7 +678,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - bump package version [David Ichim - [`b4628be`](https://github.com/eea/volto-eea-design-system/commit/b4628bed134abc76e38a243d4e98143e19cef989)]
 - feature(docusaurus, storybook): logos selection for sites plus inverted options #253 from eea/doc-logo-page [ichim-david - [`dbfc90d`](https://github.com/eea/volto-eea-design-system/commit/dbfc90d035dc40e9d4054347f00fde4de486d63d)]
 - (feat): Add ability to disable the language select from website top menu  - refs #158616 [dobri1408 - [`411c8e4`](https://github.com/eea/volto-eea-design-system/commit/411c8e4afaf0b2b9edfdeeecdca22aa4cc41f329)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`c4769e9`](https://github.com/eea/volto-eea-design-system/commit/c4769e987d525f5dcafac8e6cf8a89fd8111667d)]
 - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`92feea0`](https://github.com/eea/volto-eea-design-system/commit/92feea09796c9ef0530f65fa1d34139905133215)]
 - Proof reading page header section [ichim-david - [`230239e`](https://github.com/eea/volto-eea-design-system/commit/230239e1b22734fb8606656985bc5e513731e244)]
 ### [1.0.0-alpha.7](https://github.com/eea/volto-eea-design-system/compare/1.0.0-alpha.6...1.0.0-alpha.7) - 16 December 2022
@@ -684,7 +709,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Release 1.0.0-alpha.7 [Alin Voinea - [`7e66bcc`](https://github.com/eea/volto-eea-design-system/commit/7e66bcc296b389bc55073e7f99681534977dce3a)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`ce47e9b`](https://github.com/eea/volto-eea-design-system/commit/ce47e9b163bcb4eda988e3a87718b54ffbd3f99f)]
 - added back descriptionDistance variable until package release [David Ichim - [`3af811a`](https://github.com/eea/volto-eea-design-system/commit/3af811a8d86a132e16de118697ba5a4302a8a4da)]
 - Back to dev [Alin Voinea - [`cb531c9`](https://github.com/eea/volto-eea-design-system/commit/cb531c933c907bdbb88c9de0f1df2eb7ce899a4c)]
 - Proper paths if the package is not installed, but in development [Tiberiu Ichim - [`7a2655f`](https://github.com/eea/volto-eea-design-system/commit/7a2655f7cf9d3c687f172eefcf2b4cff4b12f832)]
@@ -772,7 +796,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - feature(Docusaurus): Updates on color palette information including thematic websites #231 from eea/refactor-docusaurus [ichim-david - [`ec7843d`](https://github.com/eea/volto-eea-design-system/commit/ec7843dea07f626dc1c71ae1baa8bb5b0caa52f3)]
-- Upgrade Jenkinsfile storybook to yarn 3 [Alin Voinea - [`d20de8d`](https://github.com/eea/volto-eea-design-system/commit/d20de8d6e21a14660b7b5125a80218a8a6f19e62)]
 - Back to dev [Alin Voinea - [`563fbc5`](https://github.com/eea/volto-eea-design-system/commit/563fbc5fac0d4b0295690d0a3a4e04271753f18a)]
 - perf(docusaurus): added remixicon and roboto locally [Giorgos Stamatis - [`b67b1a7`](https://github.com/eea/volto-eea-design-system/commit/b67b1a72bc9cdc7c62a25967e81b430f8b62d558)]
 ### [1.0.0-alpha.4](https://github.com/eea/volto-eea-design-system/compare/1.0.0-alpha.3...1.0.0-alpha.4) - 22 November 2022
@@ -865,7 +888,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - modified left value of full width classes with toolbars [David Ichim - [`70d82d4`](https://github.com/eea/volto-eea-design-system/commit/70d82d47fbc2c00a3a709de0d5c087c8443a1eae)]
 - WIP settings column grid width when using full size class [David Ichim - [`affc7ac`](https://github.com/eea/volto-eea-design-system/commit/affc7ac99527aa92d5a192d90dc8c9ec46a66404)]
 - fix eslint [Miu Razvan - [`30c52e4`](https://github.com/eea/volto-eea-design-system/commit/30c52e4eb443555ca44c1b35df064e73d52c0a8b)]
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`76a41c7`](https://github.com/eea/volto-eea-design-system/commit/76a41c786995fd54afe4d1c345de939f683ffa70)]
 - fix broken variable call for contentBox.variables introduced in previous commit by mistake [David Ichim - [`d249c11`](https://github.com/eea/volto-eea-design-system/commit/d249c1160d19bedb174a2fde3fdab48d9ce297d4)]
 - clean up [Miu Razvan - [`89f3cb3`](https://github.com/eea/volto-eea-design-system/commit/89f3cb33d70a14806a953f0acd1807e94169ee5c)]
 - Feature(container): flexible container size #260 from eea/feature-flexible-container [ichim-david - [`8f84c5b`](https://github.com/eea/volto-eea-design-system/commit/8f84c5b67afe9cbe01b2a44a8f92a9a554e1036a)]
@@ -967,7 +989,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :nail_care: Enhancements
 
-- change(jenkins): added yarn policy for storybook building [ichim-david - [`3d1b844`](https://github.com/eea/volto-eea-design-system/commit/3d1b844efeea40b99c00c9aa97089e0a0be58a57)]
 - change(docusaurus): typography updates [ichim-david - [`60a93a4`](https://github.com/eea/volto-eea-design-system/commit/60a93a4aece4e478ae13c2dfe697fd3703aa178a)]
 - change(accordion): allow customization of accordion title with css variables [David Ichim - [`15e7d27`](https://github.com/eea/volto-eea-design-system/commit/15e7d27f02c640df582f51a51ef36e645723f842)]
 - change(content-box): added css variables that will set text color and background for children [David Ichim - [`86cac53`](https://github.com/eea/volto-eea-design-system/commit/86cac531cc94386b6022e1be80dba826b39f2443)]
@@ -1002,7 +1023,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Merge pull request #243 from eea/develop [ichim-david - [`576564c`](https://github.com/eea/volto-eea-design-system/commit/576564ce395ee6ac9e74bcb19d5c4f0b4cd3c33b)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`4a5be6e`](https://github.com/eea/volto-eea-design-system/commit/4a5be6eec78dae230626e61ea2c77e7f3c62510d)]
 - Back to dev [Alin Voinea - [`b251255`](https://github.com/eea/volto-eea-design-system/commit/b251255a7ed14d8290717726d86eaf54b87aa2d4)]
 ### [0.9.0](https://github.com/eea/volto-eea-design-system/compare/0.8.1...0.9.0) - 19 September 2022
 
@@ -1758,10 +1778,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - prettier changes [David Ichim - [`134da52`](https://github.com/eea/volto-eea-design-system/commit/134da52549b9d5eac5a12b7ad3005073500ac2c4)]
-- [JENKINSFILE] remove debug, add error per stage [valentinab25 - [`903eecd`](https://github.com/eea/volto-eea-design-system/commit/903eecdb6bcbb8d73cff5e447d80c85e2a2c906d)]
-- [JENKINSFILE] mention comment author in comment [valentinab25 - [`39a26aa`](https://github.com/eea/volto-eea-design-system/commit/39a26aa1ff0f35e93e8df9f442c29c5ab79ff493)]
-- [JENKINSFILE] format PR comments [valentinab25 - [`739438c`](https://github.com/eea/volto-eea-design-system/commit/739438c64950c745d630d1998314a2bed595b23a)]
-- [JENKINSFILE] Add failure comment, no jenkins fail [valentinab25 - [`c325bf1`](https://github.com/eea/volto-eea-design-system/commit/c325bf14f3fb0da150f2a56cda0a9f03d8d8a628)]
 ### [0.2.3](https://github.com/eea/volto-eea-design-system/compare/0.2.2...0.2.3) - 29 April 2022
 
 #### :rocket: New Features
@@ -2186,7 +2202,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - set profile section overflow to auto [nileshgulia1 - [`71ab47f`](https://github.com/eea/volto-eea-design-system/commit/71ab47f89a433233c14b394c3824e607dd18a393)]
 - remove segment custom width [nileshgulia1 - [`1d3ea40`](https://github.com/eea/volto-eea-design-system/commit/1d3ea40f98bbdc1eab95b4da739a659b5e29ec16)]
 - fix profile section css overflow [nileshgulia1 - [`db5126f`](https://github.com/eea/volto-eea-design-system/commit/db5126fc902e191d1e18fb7e4c54877c8d8786e6)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`647a6e3`](https://github.com/eea/volto-eea-design-system/commit/647a6e3e2093f2c4884c356eb148453551c8f33f)]
 - fix warning related to proptype [nileshgulia1 - [`946c6c6`](https://github.com/eea/volto-eea-design-system/commit/946c6c6bc9dece0985ae4b9f9cad6ece2be0ff2c)]
 - removed override already present in card.less [ichim-david - [`50d2ab2`](https://github.com/eea/volto-eea-design-system/commit/50d2ab26f85c8f409da02ec128cc1df34848ca69)]
 - update [Miu Razvan - [`bbcab87`](https://github.com/eea/volto-eea-design-system/commit/bbcab87ef4c8475f347f0daf4ab7e428e69c2316)]
@@ -2273,7 +2288,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - remove segment custom width [nileshgulia1 - [`4a60d84`](https://github.com/eea/volto-eea-design-system/commit/4a60d84d5fe76578b7760aa1dad6eef9a20916a7)]
 - Reformat header.less [Tiberiu Ichim - [`1f99dfc`](https://github.com/eea/volto-eea-design-system/commit/1f99dfc82c165304ca5600ce5138c1233615ab69)]
 - fix profile section css overflow [nileshgulia1 - [`8fd2654`](https://github.com/eea/volto-eea-design-system/commit/8fd265413149f1b5e033dffa0fbcb5ef5ecad15f)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`6051724`](https://github.com/eea/volto-eea-design-system/commit/6051724437a38675e659c797bb5586ef81286ec0)]
 - fix warning related to proptype [nileshgulia1 - [`824b9be`](https://github.com/eea/volto-eea-design-system/commit/824b9beff77aae139882cd50a1d670a02ec6f723)]
 - refactor breadcrumbs component, make it functional and customizable [nileshgulia1 - [`4ec374e`](https://github.com/eea/volto-eea-design-system/commit/4ec374e20565eb0a5aed0ff67a02cd6f77eba1f0)]
 - removed override already present in card.less [ichim-david - [`93c4e5a`](https://github.com/eea/volto-eea-design-system/commit/93c4e5aac9cc85ff2cc6c04180f6655d5f5616dc)]
@@ -2842,7 +2856,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`3af46d2`](https://github.com/eea/volto-eea-design-system/commit/3af46d2b14fa0b1ef44736f25b0f9ac93b23d18d)]
 - Refs #140454  updated eea-design-system readme with extra info on package contents [David Ichim - [`d2efc3d`](https://github.com/eea/volto-eea-design-system/commit/d2efc3ddae7b91efc82cf3bce8fb8e42d696a780)]
 - Refs #140454 add h1 to the list of elements that are max 800px and centered [David Ichim - [`7d3c30f`](https://github.com/eea/volto-eea-design-system/commit/7d3c30f409aa4cb43810839f8960589456cc1b2e)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`8d657d0`](https://github.com/eea/volto-eea-design-system/commit/8d657d056cde5163cfe90ac66bc973f55d82e5e9)]
 ### [0.1.0](https://github.com/eea/volto-eea-design-system/compare/0.0.1...0.1.0) - 17 November 2021
 
 #### :hammer_and_wrench: Others

package/jest-addon.config.js

@@ -5,6 +5,7 @@ module.exports = {
     '!src/**/*.d.ts',
   ],
   moduleNameMapper: {
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
@@ -17,7 +18,6 @@ module.exports = {
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
-    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
   },
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-design-system",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "@eeacms/volto-eea-design-system: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/ui/Footer/Contact.jsx

@@ -8,16 +8,16 @@ const Contact = ({ children, contacts }) =>
   children?.length ? (
     children
   ) : (
-    <div className="contact-block">
+    <div className="contact-wrapper">
       {contacts?.map((contact, index) => (
         <div className="contact" key={index}>
-          {isInternalURL(contact.link) ? (
-            <Link to={contact.link} className="bold">
+          {isInternalURL(contact.url) ? (
+            <Link to={contact.url} className="bold">
               {contact.text}
             </Link>
           ) : (
             <a
-              href={contact.link}
+              href={contact.url}
               target={'_blank'}
               rel="noopener noreferrer"
               className={'bold'}
@@ -28,21 +28,21 @@ const Contact = ({ children, contacts }) =>
           {contact.children && (
             <div className="subcontact">
               {contact.children.map((child, index) => (
-                <>
-                  {isInternalURL(child.link) ? (
-                    <Link to={child.link} key={index}>
+                <React.Fragment key={index}>
+                  {isInternalURL(child.url) ? (
+                    <Link to={child.url} key={index}>
                       {child.text}
                     </Link>
                   ) : (
                     <a
-                      href={child.link}
+                      href={child.url}
                       target={'_blank'}
                       rel="noopener noreferrer"
                     >
                       {child.text}
                     </a>
                   )}
-                </>
+                </React.Fragment>
               ))}
             </div>
           )}

package/src/ui/Footer/Footer.stories.js

@@ -33,64 +33,82 @@ Default.args = {
   header: 'Environmental information systems',
   description: '',
   actions: [
-    { link: '/privacy', title: 'Privacy' },
-    { link: '/sitemap', title: 'Sitemap' },
-    { link: 'https://www.eea.europa.eu/en/login', title: 'CMS Login' },
+    { url: '/privacy', title: 'Privacy' },
+    { url: '/sitemap', title: 'Sitemap' },
+    { url: 'https://www.eea.europa.eu/en/login', title: 'CMS Login' },
   ],
   copyright: [
-    { link: 'https://status.eea.europa.eu/', title: 'System status' },
+    { url: 'https://status.eea.europa.eu/', title: 'System status' },
     {
-      link: '/copyright',
+      url: '/copyright',
       title: '© Copyright 2023 EEA',
     },
   ],
   sites: [
-    { link: 'https://water.europa.eu/marine', src: Marine, alt: 'WISE marine' },
     {
-      link: 'https://water.europa.eu/freshwater',
+      url: 'https://water.europa.eu/marine',
+      src: Marine,
+      alt: 'WISE marine',
+      className: 'marine logo',
+    },
+    {
+      url: 'https://water.europa.eu/freshwater',
       src: Freshwater,
       alt: 'WISE freshwater',
+      className: 'freshwater logo',
+    },
+    {
+      url: 'https://biodiversity.europa.eu/',
+      src: Bise,
+      alt: 'Biodiversity',
+      className: 'biodiversity logo',
     },
-    { link: 'https://biodiversity.europa.eu/', src: Bise, alt: 'Biodiversity' },
     {
-      link: 'https://forest.eea.europa.eu/',
+      url: 'https://forest.eea.europa.eu/',
       src: Fise,
       alt: 'Forest information system for europe',
+      className: 'fise logo',
     },
     {
-      link: 'https://climate-adapt.eea.europa.eu/observatory',
+      url: 'https://climate-adapt.eea.europa.eu/observatory',
       src: ClimateHealth,
       alt: 'Information platform for chemical monitoring',
+      className: 'climate logo',
     },
     {
-      link: 'https://climate-adapt.eea.europa.eu/',
+      url: 'https://climate-adapt.eea.europa.eu/',
       src: Cca,
       alt: 'Climate adapt',
+      className: 'cca logo',
     },
     {
-      link: 'https://industry.eea.europa.eu/',
+      url: 'https://industry.eea.europa.eu/',
       src: Industry,
       alt: 'European industrial emissions portal',
+      className: 'industry logo',
     },
     {
-      link: 'https://climate-energy.eea.europa.eu/',
+      url: 'https://climate-energy.eea.europa.eu/',
       src: Energy,
       alt: 'Climate and energy in the EU',
+      className: 'energy logo',
     },
     {
-      link: 'https://land.copernicus.eu/',
+      url: 'https://land.copernicus.eu/',
       src: Copernicus,
       alt: 'Copernicus land monitoring service',
+      className: 'copernicus logo',
     },
     {
-      link: 'https://insitu.copernicus.eu/',
+      url: 'https://insitu.copernicus.eu/',
       src: Insitu,
       alt: 'Copernicus in situ',
+      className: 'insitu logo',
     },
   ],
   managedBy: [
     {
-      link: 'https://www.eea.europa.eu/',
+      url: 'https://www.eea.europa.eu/',
       src: EEA,
       alt: 'EEA Logo',
       className: 'site logo',
@@ -101,7 +119,7 @@ Default.args = {
       },
     },
     {
-      link: 'https://www.eionet.europa.eu/',
+      url: 'https://www.eionet.europa.eu/',
       src: Eionet,
       alt: 'EIONET Logo',
       className: 'eionet logo',
@@ -116,40 +134,40 @@ Default.args = {
     {
       name: 'twitter',
       icon: 'ri-twitter-fill',
-      link: 'https://twitter.com/euenvironment',
+      url: 'https://twitter.com/euenvironment',
     },
     {
       name: 'facebook',
       icon: 'ri-facebook-box-fill',
-      link: 'https://www.facebook.com/European.Environment.Agency',
+      url: 'https://www.facebook.com/European.Environment.Agency',
     },
     {
       name: 'linkedin',
       icon: 'ri-linkedin-fill',
-      link: 'https://www.linkedin.com/company/european-environment-agency',
+      url: 'https://www.linkedin.com/company/european-environment-agency',
     },
     {
       name: 'youtube',
       icon: 'ri-youtube-fill',
-      link: 'https://www.youtube.com/user/EEAvideos',
+      url: 'https://www.youtube.com/user/EEAvideos',
     },
     {
       name: 'instagram',
       icon: 'ri-instagram-fill',
-      link: 'https://www.instagram.com/ourplanet_eu',
+      url: 'https://www.instagram.com/ourplanet_eu',
     },
-    { name: 'rss', icon: 'ri-rss-fill', link: '/subscription/news-feeds' },
+    { name: 'rss', icon: 'ri-rss-fill', url: '/subscription/news-feeds' },
   ],
   contacts: [
     {
       text: 'About us',
-      link: '/about',
+      url: '/about',
       children: [
-        { text: 'FAQs', link: 'http://external.site' },
-        { text: 'Careers', link: '/careers' },
+        { text: 'FAQs', url: 'http://external.site' },
+        { text: 'Careers', url: '/careers' },
       ],
     },
-    { text: 'Contact us', link: '/contact-us' },
-    { text: 'Sign up to our newsletter', link: '/newsletter' },
+    { text: 'Contact us', url: '/contact-us' },
+    { text: 'Sign up to our newsletter', url: '/newsletter' },
   ],
 };

package/src/ui/Footer/FooterActions.jsx

@@ -15,13 +15,13 @@ const FooterActions = (props) => {
           <div className="actions">
             {props.actions &&
               props.actions.map((action, index) =>
-                isInternalURL(action.link) ? (
-                  <Link to={action.link} key={index}>
+                isInternalURL(action.url) ? (
+                  <Link to={action.url} key={index}>
                     {action.title}
                   </Link>
                 ) : (
                   <a
-                    href={action.link}
+                    href={action.url}
                     key={index}
                     target={'_blank'}
                     rel={'noreferrer'}
@@ -37,13 +37,13 @@ const FooterActions = (props) => {
           <div className="copyright">
             {props.copyright &&
               props.copyright.map((copyright, index) =>
-                isInternalURL(copyright.link) ? (
-                  <Link to={copyright.link} key={index}>
+                isInternalURL(copyright.url) ? (
+                  <Link to={copyright.url} key={index}>
                     {copyright.title}
                   </Link>
                 ) : (
                   <a
-                    href={copyright.link}
+                    href={copyright.url}
                     key={index}
                     target={'_blank'}
                     rel={'noreferrer'}

package/src/ui/Footer/FooterHeader.jsx

@@ -1,10 +1,8 @@
 import React from 'react';
 
 const FooterHeader = (props) => {
-  return (
-    <div className="theme-sites">
-      <h3 className="header text-center">{props.children}</h3>
-    </div>
-  );
+  return props.children ? (
+    <h2 className="footer-header text-center">{props.children}</h2>
+  ) : null;
 };
 export default FooterHeader;

package/src/ui/Footer/FooterSites.jsx

@@ -12,14 +12,22 @@ const Sites = (props) => {
       const nextItem = logos[i + 1];
       column.push(
         <Grid.Column className="logo" key={i}>
-          <a className="logo" href={item.link}>
+          <a className="logo" href={item.url}>
             <LazyLoadComponent>
-              <Image src={item.src} alt={item.alt}></Image>
+              <Image
+                className={item.className}
+                src={item.src}
+                alt={item.alt}
+              ></Image>
             </LazyLoadComponent>
           </a>
-          <a className="logo" href={nextItem.link}>
+          <a className="logo" href={nextItem.url}>
             <LazyLoadComponent>
-              <Image src={nextItem.src} alt={nextItem.alt}></Image>
+              <Image
+                className={nextItem.className}
+                src={nextItem.src}
+                alt={nextItem.alt}
+              ></Image>
             </LazyLoadComponent>
           </a>
         </Grid.Column>,

package/src/ui/Footer/Social.jsx

@@ -11,7 +11,7 @@ const Social = (props) => {
     <Grid.Row>
       <div className="social">
         {props.social?.map((item, index) => (
-          <a href={item.link} aria-label={`${item.name} link`} key={index}>
+          <a href={item.url} aria-label={`${item.name} link`} key={index}>
             <Icon className={item.icon}></Icon>
           </a>
         ))}

package/src/ui/Footer/SubFooter.jsx

@@ -23,7 +23,7 @@ const SubFooter = (props) => {
             >
               <div className="item">
                 <div className={manager.className}>
-                  <a href={manager.link}>
+                  <a href={manager.url}>
                     <LazyLoadComponent>
                       <Image src={manager.src} alt={manager.alt}></Image>
                     </LazyLoadComponent>
@@ -55,7 +55,7 @@ const SubFooter = (props) => {
             >
               <div className="item">
                 <div className={manager.className}>
-                  <a href={manager.link}>
+                  <a href={manager.url}>
                     <LazyLoadComponent>
                       <Image src={manager.src} alt={manager.alt}></Image>
                     </LazyLoadComponent>

package/src/ui/Header/HeaderSearchPopUp.js

@@ -23,7 +23,7 @@ function HeaderSearchPopUp({
   const headerSearchViews = headerSearchBox || [];
   const defaultView = headerSearchViews.filter((v) => v.isDefault);
   const localView = headerSearchViews.filter((v) =>
-    location.pathname.includes(v.path),
+    location.pathname.match(v.matchpath ? v.matchpath : v.path),
   );
   const activeView = localView.length > 0 ? localView[0] : defaultView[0];
 

package/theme/themes/eea/extras/footer.less

@@ -38,11 +38,21 @@ footer .theme-sites {
     margin: @mobileThemeSitesLogoMargin;
   }
 
-  .header {
-    font-size: @mobileFooterTitleFontSize;
-  }
+}
+footer .footer-header {
+  font-size: @mobileFooterTitleFontSize;
 }
 
+.theme-sites .logo.freshwater {
+  max-width: @freshwaterLogoMaxWidth;
+}
+.subfooter .item {
+  display: @subFooterItemDisplay;
+  justify-content: @subFooterItemJustifyContent;
+  width: @subFooterItemWidth;
+  height: @subFooterItemHeight;
+  align-items: @subFooterItemAlignItems;
+}
 .subfooter .item .ui.grid {
   align-items: center;
 }
@@ -54,11 +64,11 @@ footer .theme-sites {
   }
 }
 
-.subfooter .contact-block {
+.subfooter .contact-wrapper {
   margin-bottom: @tabletContactBlockMarginBottom;
 }
 
-.contact-block .subcontact a {
+.contact-wrapper .subcontact a {
   font-size: @computerSubContactIconFontSize;
   margin-right: @computerSubContactIconMarginRight;
   font-weight: @computerSubContactIconFontWeight;
@@ -149,7 +159,7 @@ footer .footer-wrapper .menu {
     font-weight: @mobileMenuCopyrightFontWeight;
   }
 
-  .contact-block .subcontact {
+  .contact-wrapper .subcontact {
     margin-top: @mobileSubcontactBlockMarginTop;
   }
 }
@@ -159,7 +169,7 @@ footer .footer-wrapper .menu {
     background: @computerFooterBackgroundGradient;
   }
 
-  footer .theme-sites .header {
+  footer .footer-header {
     font-size: @tabletFooterTitleFontSize;
   }
 
@@ -167,14 +177,6 @@ footer .footer-wrapper .menu {
     .logo img {
       max-height: 100px;
     }
-
-    .site.logo img {
-      padding-right: @siteLogoPaddingRight;
-    }
-
-    .contact-block {
-      padding-left: @siteLogoPaddingRight;
-    }
   }
 
   .subfooter .contact {
@@ -184,11 +186,11 @@ footer .footer-wrapper .menu {
     gap: @tabletContactGap;
   }
 
-  .subfooter .contact-block {
+  .subfooter .contact-wrapper {
     margin-inline: @tabletContactBlockMarginInline;
   }
 
-  .contact-block .subcontact a {
+  .contact-wrapper .subcontact a {
     font-size: @tabletSubContactIconFontSize;
     margin-right: @tabletSubContactIconMarginRight;
   }
@@ -239,7 +241,7 @@ footer .footer-wrapper .menu {
       }
     }
 
-    .contact-block .subcontact a {
+    .contact-wrapper .subcontact a {
       font-size: @computerSubContactIconFontSize;
       margin-right: @computerSubContactIconMarginRight;
     }

package/theme/themes/eea/extras/footer.variables

@@ -23,15 +23,20 @@
 @computerThemeSitesLogoMargin       : 0 auto @rem-space-10;
 @mobileFooterTitleFontSize          : @mobileH4;
 @tabletFooterTitleFontSize          : @h3;
+@freshwaterLogoMaxWidth             : 122px;
+
+/* Sub-footer Item */
+@subFooterItemDisplay: flex;
+@subFooterItemJustifyContent: center;
+@subFooterItemAlignItems: center;
+@subFooterItemWidth: 100%;
+@subFooterItemHeight: 100%;
 
 /* Sub-footer Item Header */
 @mobileItemHeaderMarginBottom       : @space-5;
 @computerItemHeaderMarginBottom     : @space-12;
 @computerLogoHeaderMarginLeft       : -50px;
 
-/* Site Logo */
-@siteLogoPaddingRight : 20%;
-
 /* Contact Info */
 @tabletContactBlockMarginInline     : 0;
 @tabletContactBlockMarginBottom     : @space-4;