Skip to content

Commit

Permalink
Merge pull request #363 from greenpeace/planet-4811-use-get-blocks-in…
Browse files Browse the repository at this point in the history
…-editor

PLANET-4811 Submenu WYSIWYG
  • Loading branch information
Inwerpsel authored Oct 27, 2020
2 parents 3d984c1 + b86985f commit 64ab908
Show file tree
Hide file tree
Showing 29 changed files with 741 additions and 846 deletions.
18 changes: 9 additions & 9 deletions assets/src/blocks/Gallery/GalleryBlock.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ const BLOCK_NAME = 'planet4-blocks/gallery';
const getStyleLabel = (label, help) => {
if (help) {
return (
<Tooltip text={__(help, 'planet4-blocks-backend')}>
<span>{__(label, 'planet4-blocks-backend')}</span>
<Tooltip text={ help }>
<span>{ label }</span>
</Tooltip>
);
}
return label;
}
};

export class GalleryBlock {
constructor() {
Expand Down Expand Up @@ -63,23 +63,23 @@ export class GalleryBlock {
{
name: 'slider',
label: getStyleLabel(
'Slider',
'The slider is a carousel of images. For more than 5 images, consider using a grid.'
__('Slider', 'planet4-blocks-backend'),
__('The slider is a carousel of images. For more than 5 images, consider using a grid.', 'planet4-blocks-backend'),
),
isDefault: true
},
{
name: 'three-columns',
label: getStyleLabel(
'3 Columns',
'The 3 columns image display is great for accentuating text, and telling a visual story.'
__('3 Columns', 'planet4-blocks-backend'),
__('The 3 columns image display is great for accentuating text, and telling a visual story.', 'planet4-blocks-backend'),
),
},
{
name: 'grid',
label: getStyleLabel(
'Grid',
'The grid shows thumbnails of lots of images. Good to use when showing lots of activity.'
__('Grid', 'planet4-blocks-backend'),
__('The grid shows thumbnails of lots of images. Good to use when showing lots of activity.', 'planet4-blocks-backend'),
),
}
],
Expand Down
57 changes: 0 additions & 57 deletions assets/src/blocks/Submenu/MenuLevel.js

This file was deleted.

118 changes: 0 additions & 118 deletions assets/src/blocks/Submenu/Submenu.js

This file was deleted.

Loading

0 comments on commit 64ab908

Please sign in to comment.