Skip to content

Commit

Permalink
Merge pull request #48 from eea/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
avoinea committed Nov 15, 2021
2 parents 64b69c0 + 4d33130 commit aff4467
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 22 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
17 changes: 0 additions & 17 deletions src/customizations/components/theme/Navigation/Navigation.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,23 +259,6 @@ class Navigation extends Component {
className={this.state.isMobileMenuOpen ? 'open' : 'large screen only'}
>
<div className="navigation-links">
<NavLink
to="/ims"
key="/ims"
className="item"
activeClassName="active"
>
IMS
<sup
style={{
color: 'red',
fontSize: '65%',
transform: 'rotate(0deg)',
}}
>
BETA
</sup>
</NavLink>
{this.props.items.map((item) => (
<NavLink
to={item.url === '' ? '/' : item.url}
Expand Down
7 changes: 4 additions & 3 deletions theme/theme.config
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit aff4467

Please sign in to comment.