From 960b3de62b7f2a3a70fcf1ba3e6659fe4076f0fe Mon Sep 17 00:00:00 2001 From: David Ichim Date: Wed, 20 Oct 2021 20:17:17 +0300 Subject: [PATCH 1/3] Refs #140454 added commented import to eea-volto-themes theme.less: - this will come from volto-eea-design-system allowing us to use an eea theme not just those found in volto themes folder - modified some other paths to make it more obvious where they come from --- theme/theme.config | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/theme/theme.config b/theme/theme.config index c4e2eb7..c87bf0a 100644 --- a/theme/theme.config +++ b/theme/theme.config @@ -82,18 +82,19 @@ *******************************/ /* Path to theme packages */ -@themesFolder : '~volto-themes'; +@themesFolder: '~volto-themes'; /* Path to site override folder */ -@siteFolder : '~@eeacms/volto-ims-theme/../theme/site'; +@siteFolder: '~@eeacms/volto-ims-theme/../theme/site'; /******************************* Import Theme *******************************/ @import (multiple) "~semantic-ui-less/theme.less"; +/* @import (multiple) "~eea-volto-themes/../theme.less"; */ -@fontPath : "~volto-themes/@{theme}/assets/fonts"; +@fontPath: "~volto-themes/default/assets/fonts"; .loadAddonOverrides() { @import (optional) "@{siteFolder}/@{addon}/@{addontype}s/@{addonelement}.overrides"; From aacda9d242661c6537d3317873673ba5c3d7cf29 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 15 Nov 2021 08:44:55 +0200 Subject: [PATCH 2/3] Remove BETA navigation menu item --- .../components/theme/Navigation/Navigation.jsx | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/customizations/components/theme/Navigation/Navigation.jsx b/src/customizations/components/theme/Navigation/Navigation.jsx index f4dc928..2552a34 100644 --- a/src/customizations/components/theme/Navigation/Navigation.jsx +++ b/src/customizations/components/theme/Navigation/Navigation.jsx @@ -259,23 +259,6 @@ class Navigation extends Component { className={this.state.isMobileMenuOpen ? 'open' : 'large screen only'} >
- - IMS - - BETA - - {this.props.items.map((item) => ( Date: Mon, 15 Nov 2021 06:55:42 +0000 Subject: [PATCH 3/3] Automated release 4.0.1 --- CHANGELOG.md | 10 +++++++++- package.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f0b877..f512392 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,16 @@ 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). -#### [4.0.0](https://github.com/eea/volto-ims-theme/compare/3.0.4...4.0.0) +#### [4.0.1](https://github.com/eea/volto-ims-theme/compare/4.0.0...4.0.1) +- Remove BETA navigation menu item [`aacda9d`](https://github.com/eea/volto-ims-theme/commit/aacda9d242661c6537d3317873673ba5c3d7cf29) +- Refs #140454 added commented import to eea-volto-themes theme.less: [`960b3de`](https://github.com/eea/volto-ims-theme/commit/960b3de62b7f2a3a70fcf1ba3e6659fe4076f0fe) + +### [4.0.0](https://github.com/eea/volto-ims-theme/compare/3.0.4...4.0.0) + +> 19 October 2021 + +- #139558 Treat any non volto links as external [`#45`](https://github.com/eea/volto-ims-theme/pull/45) - Release 4.0.0 [`c84e90a`](https://github.com/eea/volto-ims-theme/commit/c84e90a3cb07ce08da67effb3931877ecc2887d7) - Refs #139558 moved some customizations to volto-ims-policy: [`ff8d5b1`](https://github.com/eea/volto-ims-theme/commit/ff8d5b12c83692c3db6393364266382978ec973f) - Refs #139558 moved external routes to volto-ims-policy: [`daabfb5`](https://github.com/eea/volto-ims-theme/commit/daabfb5a5bf22e0b99e5864e564df149d98c1419) diff --git a/package.json b/package.json index 8281092..f6cc9d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-ims-theme", - "version": "4.0.0", + "version": "4.0.1", "description": "volto-ims-theme: Volto Theme: EEA IMS", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",