Skip to content

Commit

Permalink
Merge pull request #76 from eea/develop
Browse files Browse the repository at this point in the history
eraseIcon
  • Loading branch information
avoinea authored Apr 5, 2023
2 parents 7452725 + caa53bd commit ff19c45
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,23 @@ 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).

### [5.2.0](https://github.com/eea/volto-block-style/compare/5.1.0...5.2.0) - 5 April 2023

#### :nail_care: Enhancements

- change(eraseIcon): Change title tooltip to Clear block style [Alin Voinea - [`0d1cae9`](https://github.com/eea/volto-block-style/commit/0d1cae9a4460b23513902dd06c54920479729ae3)]
- refactor(StyleWrapperEdit.jsx): replace deleteSVG icon with eraserSVG icon [Miu Razvan - [`62b83f6`](https://github.com/eea/volto-block-style/commit/62b83f6fb984829ea29d631e3ee2c22f8e5d58e6)]

#### :house: Internal changes

- chore(package.json): update version to 5.2.0 [Miu Razvan - [`5cf900c`](https://github.com/eea/volto-block-style/commit/5cf900c488725c2f59d404829682f7171391d4e6)]

#### :hammer_and_wrench: Others

### [5.1.0](https://github.com/eea/volto-block-style/compare/5.0.1...5.1.0) - 27 March 2023

#### :hammer_and_wrench: Others

- Release 5.1.0 [Alin Voinea - [`6b4deb1`](https://github.com/eea/volto-block-style/commit/6b4deb143054d5027035b3ff5cb602e60cd8e9f9)]
### [5.0.1](https://github.com/eea/volto-block-style/compare/5.0.0...5.0.1) - 8 February 2023

## [5.0.0](https://github.com/eea/volto-block-style/compare/4.1.2...5.0.0) - 7 February 2023
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pipeline {
environment {
GIT_NAME = "volto-block-style"
NAMESPACE = "@eeacms"
SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.europa.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu,prod-www.eea.europa.eu,water.europa.eu-marine,demo-kitkat.dev2aws.eea.europa.eu,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en"
SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.europa.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu,water.europa.eu-marine,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en"
DEPENDENCIES = ""
VOLTO = ""
}
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-block-style",
"version": "5.1.0",
"version": "5.2.0",
"description": "volto-block-style: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down
4 changes: 2 additions & 2 deletions src/StyleWrapper/StyleWrapperEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Icon, SidebarPopup } from '@plone/volto/components';
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
import { StyleSchema } from './schema';
import clearSVG from '@plone/volto/icons/clear.svg';
import deleteSVG from '@plone/volto/icons/delete.svg';
import eraserSVG from '@eeacms/volto-block-style/icons/eraser.svg';

const StyleWrapperEdit = (props) => {
const {
Expand Down Expand Up @@ -68,7 +68,7 @@ const StyleWrapperEdit = (props) => {
<Icon name={clearSVG} size="24px" title="Close" />
</button>
<button onClick={deleteAllStyle} style={{ float: 'right' }}>
<Icon name={deleteSVG} size="24px" title="Delete block style" />
<Icon name={eraserSVG} size="24px" title="Clear block style" />
</button>
</>
}
Expand Down
3 changes: 3 additions & 0 deletions src/icons/eraser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ff19c45

Please sign in to comment.