Merge pull request #53 from eea/develop

change(megamenu): added icon on mega menu header section
eea · Aug 4, 2022 · a5d7bd1 · a5d7bd1
2 parents 90fdd4e + 346d3c0
commit a5d7bd1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,15 @@ 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).
 
+#### [0.6.18](https://github.com/eea/volto-eea-website-theme/compare/0.6.17...0.6.18)
+
+- change(megamenu): added icon on mega menu header section [`2ee9011`](https://github.com/eea/volto-eea-website-theme/commit/2ee901166a03b32db48379c5af109684c07a854c)
+
 #### [0.6.17](https://github.com/eea/volto-eea-website-theme/compare/0.6.16...0.6.17)
 
+> 3 August 2022
+
+- Develop [`#52`](https://github.com/eea/volto-eea-website-theme/pull/52)
 - Set focus on search input field in the popup on click [`#50`](https://github.com/eea/volto-eea-website-theme/pull/50)
 
 #### [0.6.16](https://github.com/eea/volto-eea-website-theme/compare/0.6.15...0.6.16)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/customizations/volto/components/theme/Header/Header.jsx b/src/customizations/volto/components/theme/Header/Header.jsx
@@ -203,8 +203,9 @@ const EEAHeader = ({ pathname, token, items, history }) => {
               active: item.url === router_pathname,
             })}
           >
-            {props?.children}
+            {props?.iconPosition !== 'right' && props?.children}
             <span>{item.title}</span>
+            {props?.iconPosition === 'right' && props?.children}
           </UniversalLink>
         )}
       ></Header.Main>