From b709bd426b50d63df4e6b7bfa359440a4745a4df Mon Sep 17 00:00:00 2001 From: berdysheva Date: Tue, 8 Nov 2022 17:52:48 +0300 Subject: [PATCH 1/5] feat(ExtendedFeatures): add content --- .../ExtendedFeatures/ExtendedFeatures.scss | 2 +- .../ExtendedFeatures/ExtendedFeatures.tsx | 81 ++++++++----- .../ExtendedFeatures/__stories__/data.json | 110 +++++++++++------- src/models/constructor-items/blocks.ts | 4 +- 4 files changed, 126 insertions(+), 71 deletions(-) diff --git a/src/blocks/ExtendedFeatures/ExtendedFeatures.scss b/src/blocks/ExtendedFeatures/ExtendedFeatures.scss index 5938954e5..4c19fe276 100644 --- a/src/blocks/ExtendedFeatures/ExtendedFeatures.scss +++ b/src/blocks/ExtendedFeatures/ExtendedFeatures.scss @@ -66,7 +66,7 @@ $block: '.#{$ns}ExtendedFeaturesBlock'; @include icon(); display: block; - margin-bottom: $indentXXXS; + margin-bottom: $indentXXS; } @media (max-width: map-get($gridBreakpoints, 'sm')) { diff --git a/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx b/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx index 67f092b17..1f6f0a4c5 100644 --- a/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx +++ b/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx @@ -1,11 +1,15 @@ -import React from 'react'; +import React, {useContext} from 'react'; -import {block} from '../../utils'; +import {block, getThemedValue} from '../../utils'; import {ExtendedFeaturesProps} from '../../models'; import {Row, Col} from '../../grid'; -import {Link, HTML, AnimateBlock, BlockHeader} from '../../components/'; +import {AnimateBlock, BlockHeader, HTML} from '../../components/'; import './ExtendedFeatures.scss'; +import {Content} from '../../sub-blocks'; +import Image from '../../components/Image/Image'; +import {ThemeValueContext} from '../../context/theme/ThemeValueContext'; +import {getMediaImage} from '../../components/Media/Image/utils'; const b = block('ExtendedFeaturesBlock'); @@ -21,31 +25,50 @@ export const ExtendedFeaturesBlock = ({ items, colSizes = DEFAULT_SIZES, animated, -}: ExtendedFeaturesProps) => ( - - -
- - {items.map(({title: itemTitle, text, link, label, icon}) => ( - - {icon && } - {itemTitle && ( -
- {itemTitle} - {label &&
{label}
} -
- )} - {text && ( -
- {text} -
- )} - {link && } - - ))} - -
- -); +}: ExtendedFeaturesProps) => { + const {themeValue: theme} = useContext(ThemeValueContext); + + return ( + + +
+ + {items.map(({title: itemTitle, text, link, links, label, icon}) => { + const itemLinks = links || []; + + const iconThemed = icon && getThemedValue(icon, theme); + const iconData = iconThemed && getMediaImage(iconThemed); + + if (link) { + itemLinks.push(link); + } + + return ( + + {iconData && } +
+ {itemTitle && ( +
+ {itemTitle} + {label && ( +
{label}
+ )} +
+ )} + +
+ + ); + })} + +
+ + ); +}; export default ExtendedFeaturesBlock; diff --git a/src/blocks/ExtendedFeatures/__stories__/data.json b/src/blocks/ExtendedFeatures/__stories__/data.json index ae811cec8..648776388 100644 --- a/src/blocks/ExtendedFeatures/__stories__/data.json +++ b/src/blocks/ExtendedFeatures/__stories__/data.json @@ -15,35 +15,50 @@ { "title": "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", - "icon": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/icons/icon.svg", - "link": { - "text": "Go", - "url": "#", - "arrow": true, - "theme": "normal" - } + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] }, { "title": "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", - "icon": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/icons/icon.svg", - "link": { - "text": "Go", - "url": "#", - "arrow": true, - "theme": "normal" - } + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] }, { "title": "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", - "icon": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/icons/icon.svg", - "link": { - "text": "Go", - "url": "#", - "arrow": true, - "theme": "normal" - } + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] } ] } @@ -62,39 +77,54 @@ }, "items": [ { - "title": "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", + "title": "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", - "icon": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/icons/icon.svg", - "link": { - "text": "Go", - "url": "#", - "arrow": true, - "theme": "normal" + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_dark.svg" }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ], "label": "New" }, { "title": "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", - "icon": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/icons/icon.svg", - "link": { - "text": "Go", - "url": "#", - "arrow": true, - "theme": "normal" + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_dark.svg" }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ], "label": "Preview" }, { "title": "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", - "icon": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/icons/icon.svg", - "link": { - "text": "Go", - "url": "#", - "arrow": true, - "theme": "normal" + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ], "label": "New" } ] diff --git a/src/models/constructor-items/blocks.ts b/src/models/constructor-items/blocks.ts index 5ec1da8a2..c141d8847 100644 --- a/src/models/constructor-items/blocks.ts +++ b/src/models/constructor-items/blocks.ts @@ -168,8 +168,10 @@ export interface ExtendedFeaturesItem { title?: string; text?: string; label?: string; - icon?: string; + icon?: ThemedImage; + /** @deprecated **/ link?: LinkProps; + links?: LinkProps[]; } export interface ExtendedFeaturesProps extends Animatable { From cf2162588b5939abfb4132b3fe68caf11684816c Mon Sep 17 00:00:00 2001 From: berdysheva Date: Wed, 9 Nov 2022 17:26:48 +0300 Subject: [PATCH 2/5] fix: imports order --- src/blocks/ExtendedFeatures/ExtendedFeatures.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx b/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx index 1f6f0a4c5..e7ab5ed7f 100644 --- a/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx +++ b/src/blocks/ExtendedFeatures/ExtendedFeatures.tsx @@ -4,13 +4,13 @@ import {block, getThemedValue} from '../../utils'; import {ExtendedFeaturesProps} from '../../models'; import {Row, Col} from '../../grid'; import {AnimateBlock, BlockHeader, HTML} from '../../components/'; - -import './ExtendedFeatures.scss'; import {Content} from '../../sub-blocks'; import Image from '../../components/Image/Image'; import {ThemeValueContext} from '../../context/theme/ThemeValueContext'; import {getMediaImage} from '../../components/Media/Image/utils'; +import './ExtendedFeatures.scss'; + const b = block('ExtendedFeaturesBlock'); const DEFAULT_SIZES = { From 5160309441141e2acf392411ffb1125ba4610aa6 Mon Sep 17 00:00:00 2001 From: berdysheva Date: Wed, 9 Nov 2022 18:09:28 +0300 Subject: [PATCH 3/5] fix(ExtendedFeatures): add transform --- src/blocks/CardLayout/__stories__/data.json | 2 +- src/blocks/ExtendedFeatures/README.md | 8 +- .../__stories__/ExtendedFeatures.stories.tsx | 55 ++++++- .../ExtendedFeatures/__stories__/data.json | 144 ++++++++++++++++-- src/text-transform/blocks.ts | 12 +- 5 files changed, 197 insertions(+), 24 deletions(-) diff --git a/src/blocks/CardLayout/__stories__/data.json b/src/blocks/CardLayout/__stories__/data.json index bda0223c8..2074b695c 100644 --- a/src/blocks/CardLayout/__stories__/data.json +++ b/src/blocks/CardLayout/__stories__/data.json @@ -20,7 +20,7 @@ "title": "Lorem ipsum", "description": "Dolor sit amet" }, - "description": "Four cards in a row on the desktop, three cards in a row on a tablet, two card in a row on a mobile phone.", + "description": "Four cards in a row on the desktop, three cards in a row on a tablet, two cards in a row on a mobile phone.", "colSizes": { "all": 6, "sm": 4, diff --git a/src/blocks/ExtendedFeatures/README.md b/src/blocks/ExtendedFeatures/README.md index 4a9a74f7c..5dc0c3b64 100644 --- a/src/blocks/ExtendedFeatures/README.md +++ b/src/blocks/ExtendedFeatures/README.md @@ -10,9 +10,11 @@ Extended Features block `items: FeatureItem[]` — Feature description -- `title?: string` — Title -- `text?: string` — Text -- `link?: Link` — Link below the text +- `title?: string` — Item's title +- `text?: string` — Item's text (with YFM support) +- `additionalInfo?: string` — Gray text (with YFM support) +- `links?: Link[]` — An array with link objects (see [Content blocks](?path=/story/information--common-types&viewMode=docs)) +- `buttons?: Button[]` — An array with button objects (see [Content blocks](?path=/story/information--common-types&viewMode=docs)) - `label?: New | Preview` — Label `colSizes?: Object` — Sizes of a single card in columns for different screen sizes, the value ranges from 1 to 12 columns. If 12 columns, a single card takes up the entire width of the screen. diff --git a/src/blocks/ExtendedFeatures/__stories__/ExtendedFeatures.stories.tsx b/src/blocks/ExtendedFeatures/__stories__/ExtendedFeatures.stories.tsx index a56d817a5..09cd29663 100644 --- a/src/blocks/ExtendedFeatures/__stories__/ExtendedFeatures.stories.tsx +++ b/src/blocks/ExtendedFeatures/__stories__/ExtendedFeatures.stories.tsx @@ -1,8 +1,13 @@ import React from 'react'; import {Meta, Story} from '@storybook/react/types-6-0'; -import {ExtendedFeaturesBlockModel, ExtendedFeaturesProps} from '../../../models'; +import { + ExtendedFeaturesBlockModel, + ExtendedFeaturesItem, + ExtendedFeaturesProps, +} from '../../../models'; import ExtendedFeatures from '../ExtendedFeatures'; import {PageConstructor} from '../../../containers/PageConstructor/PageConstructor'; +import {yfmTransform} from '../../../../.storybook/utils'; import data from './data.json'; @@ -22,8 +27,52 @@ export default { const DefaultTemplate: Story = (args) => ( ); + +const extendedFeaturesItems = (items: ExtendedFeaturesItem[]) => { + return items.map((item) => ({ + ...item, + text: item.text && yfmTransform(item.text), + })); +}; + +const ColSizesTemplate: Story = (args) => ( + +); + export const Default = DefaultTemplate.bind({}); export const WithLabel = DefaultTemplate.bind({}); +export const ColSizes = ColSizesTemplate.bind({}); -Default.args = data.default.content as ExtendedFeaturesProps; -WithLabel.args = data.withLabel.content as ExtendedFeaturesProps; +Default.args = { + ...data.default.content, + items: extendedFeaturesItems(data.default.content.items as ExtendedFeaturesItem[]), +} as ExtendedFeaturesProps; +WithLabel.args = { + ...data.withLabel.content, + items: extendedFeaturesItems(data.withLabel.content.items as ExtendedFeaturesItem[]), +} as ExtendedFeaturesProps; +ColSizes.args = { + ...data.default.content, + items: extendedFeaturesItems(data.default.content.items as ExtendedFeaturesItem[]), +} as ExtendedFeaturesProps; diff --git a/src/blocks/ExtendedFeatures/__stories__/data.json b/src/blocks/ExtendedFeatures/__stories__/data.json index ac8972cd1..64aedb069 100644 --- a/src/blocks/ExtendedFeatures/__stories__/data.json +++ b/src/blocks/ExtendedFeatures/__stories__/data.json @@ -1,11 +1,6 @@ { "default": { "content": { - "colSizes": { - "all": 12, - "sm": 6, - "md": 4 - }, "type": "extended-features-block", "title": { "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit", @@ -14,7 +9,7 @@ "items": [ { "title": "Sed do eiusmod tempor incididunt", - "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", "icon": { "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_light.svg", "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_dark.svg" @@ -30,7 +25,7 @@ }, { "title": "Sed do eiusmod tempor", - "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", "icon": { "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_light.svg", "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_dark.svg" @@ -46,7 +41,7 @@ }, { "title": "Sed do eiusmod tempor incididunt", - "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", "icon": { "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" @@ -65,11 +60,6 @@ }, "withLabel": { "content": { - "colSizes": { - "all": 12, - "sm": 6, - "md": 4 - }, "type": "extended-features-block", "title": { "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit", @@ -78,7 +68,7 @@ "items": [ { "title": "Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", - "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", "icon": { "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_light.svg", "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_dark.svg" @@ -101,7 +91,7 @@ }, { "title": "Sed do eiusmod tempor", - "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", "icon": { "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_light.svg", "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_dark.svg" @@ -124,7 +114,129 @@ }, { "title": "Sed do eiusmod tempor incididunt ", - "text": "Ut enim ad minim veniam quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] + } + ] + } + }, + "colSizes": { + "two": { + "title": "Extended Features", + "description": "Two features in a row on all devices", + "colSizes": { + "all": 6 + }, + "items": [ + { + "title": "Sed do eiusmod tempor incididunt", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] + }, + { + "title": "Sed do eiusmod tempor incididunt", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] + } + ] + }, + "three": { + "title": "Extended Features (default)", + "description": "Three Features in a row on the desktop, three features in a row on a tablet, two features in a row on a mobile phone." + }, + "four": { + "title": "Extended Features", + "description": "Four features in a row on the desktop, three features in a row on a tablet, two features in a row on a mobile phone.", + "colSizes": { + "all": 6, + "sm": 4, + "md": 3 + }, + "items": [ + { + "title": "Sed do eiusmod tempor incididunt", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_1_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] + }, + { + "title": "Sed do eiusmod tempor", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_2_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] + }, + { + "title": "Sed do eiusmod tempor incididunt", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", + "icon": { + "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", + "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" + }, + "links": [ + { + "text": "Go", + "url": "#", + "arrow": true, + "theme": "normal" + } + ] + }, + { + "title": "Sed do eiusmod tempor incididunt", + "text": "Ut enim ad minim veniam [quis nostrud](https://example.com) ullamco laboris nisi ut aliquip ex ea commodo consequat.", "icon": { "light": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_light.svg", "dark": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/icon_3_dark.svg" diff --git a/src/text-transform/blocks.ts b/src/text-transform/blocks.ts index 97c8bb6bc..077a03366 100644 --- a/src/text-transform/blocks.ts +++ b/src/text-transform/blocks.ts @@ -216,10 +216,20 @@ const config: BlocksConfig = { fields: ['description'], transformer: yfmTransformer, }, + // { + // fields: ['items'], + // transformer: typografTransformer, + // parser: parseFeatures, + // }, { fields: ['items'], transformer: typografTransformer, - parser: parseFeatures, + parser: createItemsParser(['title']), + }, + { + fields: ['items'], + transformer: yfmTransformer, + parser: createItemsParser(['text', 'additionalInfo']), }, ], [BlockType.PromoFeaturesBlock]: { From 3c7b489dac53b2892c8b58624a2db630f6548328 Mon Sep 17 00:00:00 2001 From: berdysheva Date: Wed, 9 Nov 2022 20:17:37 +0300 Subject: [PATCH 4/5] fix: paddig-right features-item --- src/blocks/ExtendedFeatures/ExtendedFeatures.scss | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/blocks/ExtendedFeatures/ExtendedFeatures.scss b/src/blocks/ExtendedFeatures/ExtendedFeatures.scss index 4c19fe276..885de2618 100644 --- a/src/blocks/ExtendedFeatures/ExtendedFeatures.scss +++ b/src/blocks/ExtendedFeatures/ExtendedFeatures.scss @@ -17,7 +17,10 @@ $block: '.#{$ns}ExtendedFeaturesBlock'; &__item { margin-top: $indentM; - padding-right: $indentM; + + &.col { + padding-right: $indentM; + } &-title { @include heading4(); @@ -73,6 +76,12 @@ $block: '.#{$ns}ExtendedFeaturesBlock'; &__item { margin-top: $indentM; } + + &__item { + &.col { + padding-right: $indentXXXS; + } + } } @include animate-slides(#{$class}__item); From 08e8dbaef62f16da188649ed0903f79c6236f25e Mon Sep 17 00:00:00 2001 From: berdysheva Date: Thu, 10 Nov 2022 14:21:06 +0300 Subject: [PATCH 5/5] fix: remove comments --- src/text-transform/blocks.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/text-transform/blocks.ts b/src/text-transform/blocks.ts index 077a03366..d56fd19b5 100644 --- a/src/text-transform/blocks.ts +++ b/src/text-transform/blocks.ts @@ -216,11 +216,6 @@ const config: BlocksConfig = { fields: ['description'], transformer: yfmTransformer, }, - // { - // fields: ['items'], - // transformer: typografTransformer, - // parser: parseFeatures, - // }, { fields: ['items'], transformer: typografTransformer,