Skip to content
This repository has been archived by the owner on Oct 25, 2022. It is now read-only.

Commit

Permalink
Merge pull request #243 from eea/develop
Browse files Browse the repository at this point in the history
fix(slate): BlockChooser Icon
  • Loading branch information
avoinea committed Jun 8, 2022
2 parents e182a4c + a538954 commit 0fc7c62
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,21 @@ 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).

#### [6.2.0](https://github.com/eea/volto-slate/compare/6.1.0...6.2.0)

- Release 6.2.0 [`ea3ba38`](https://github.com/eea/volto-slate/commit/ea3ba3857dcc7ae42340750c5965440935f14ab6)
- fix(slate): BlockChooser Icon [`f8e1a75`](https://github.com/eea/volto-slate/commit/f8e1a75e8439a1562f1bbbfe70bba2e2fd0001a9)

#### [6.1.0](https://github.com/eea/volto-slate/compare/6.0.1...6.1.0)

> 26 May 2022
- Add responsive table variation [`#242`](https://github.com/eea/volto-slate/pull/242)
- i18n: German [`92fbba3`](https://github.com/eea/volto-slate/commit/92fbba3a6a592f637e2df7c741bb416270c7a89d)
- i18n [`915de56`](https://github.com/eea/volto-slate/commit/915de566855de4e3d3fb1cf335b9cdb3e5866f5e)
- Release 6.1.0 [`af20f4f`](https://github.com/eea/volto-slate/commit/af20f4fe6b988a7caf8aa403524882a5056d6c71)
- Roll back table variations -> add responsive toggle instead [`be2e145`](https://github.com/eea/volto-slate/commit/be2e145ea750bd0f271d9d8f1e7850f148d73bf0)
- Add table type for unit tests [`d4d0823`](https://github.com/eea/volto-slate/commit/d4d0823314658cbd1635a0c30c35b968a05386e3)
- Add responsive table variation [`84b8755`](https://github.com/eea/volto-slate/commit/84b8755a0be9d8aaff2afc7164ac558ca80d7c1c)

#### [6.0.1](https://github.com/eea/volto-slate/compare/6.0.0...6.0.1)

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": "volto-slate",
"version": "6.1.0",
"version": "6.2.0",
"description": "Slate.js integration with Volto",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down
4 changes: 2 additions & 2 deletions src/blocks/Table/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import codeSVG from '@plone/volto/icons/code.svg';
import iconSVG from '@plone/volto/icons/table.svg';
import TableBlockEdit from './TableBlockEdit';
import TableBlockView from './TableBlockView';
import { extractTables } from './deconstruct';
Expand Down Expand Up @@ -30,7 +30,7 @@ export default function install(config) {
config.blocks.blocksConfig.slateTable = {
id: 'slateTable',
title: 'Slate Table',
icon: codeSVG,
icon: iconSVG,
group: 'text',
view: TableBlockView,
edit: TableBlockEdit,
Expand Down
4 changes: 2 additions & 2 deletions src/blocks/Text/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import codeSVG from '@plone/volto/icons/code.svg';
import iconSVG from '@plone/volto/icons/subtext.svg';
import TextBlockView from './TextBlockView';
import TextBlockEdit from './TextBlockEdit';
import TextBlockSchema from './TextBlockSchema';
Expand Down Expand Up @@ -108,7 +108,7 @@ export default (config) => {
config.blocks.blocksConfig.slate = {
id: 'slate',
title: 'Slate',
icon: codeSVG,
icon: iconSVG,
group: 'text',
view: TextBlockView,
edit: TextBlockEdit,
Expand Down

0 comments on commit 0fc7c62

Please sign in to comment.