Skip to content

Commit b5b8fc6

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'origin/MC-539-refactor-margins-padding' into cms-team-2-sprint-11
2 parents 2272e53 + eadfad5 commit b5b8fc6

File tree

36 files changed

+312
-327
lines changed

36 files changed

+312
-327
lines changed

‎app/code/Magento/PageBuilder/docs/how-to-add-new-content-type.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ To add configuration for a new content type, create a file under the following l
7878
<property name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
7979
<property name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
8080
<property name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
81-
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
81+
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
82+
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
8283
</style_properties>
8384
<attributes>
8485
<attribute name="name" source="data-role"/>
@@ -282,7 +283,8 @@ Now, let's add content type that can contain other content types. Create configu
282283
<property name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
283284
<property name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
284285
<property name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
285-
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
286+
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
287+
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
286288
</style_properties>
287289
<attributes>
288290
<attribute name="name" source="data-role"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/converter/style/margins-and-paddings.js renamed to ‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/converter/style/margins.js

Lines changed: 7 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/converter/style/paddings.js

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/converter/style/margins.js

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/converter/style/margins-and-paddings.js renamed to ‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/converter/style/paddings.js

Lines changed: 11 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/margins-and-paddings.js

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/property/margins-and-paddings.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)