Skip to content

Commit 7be9593

Browse files
committed
MAGETWO-92697: Add vertical alignment to column configuration
- rename vertical alignment field
1 parent a4e69a5 commit 7be9593

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
<entity name="PageBuilderVerticalAlignmentPropertyTop" type="pagebuilder_vertical_alignment_property">
1313
<data key="name">Vertical alignment</data>
1414
<data key="section">layout</data>
15-
<data key="fieldName">vertical_alignment</data>
15+
<data key="fieldName">justify_content</data>
1616
<data key="value">flex-start</data>
1717
<data key="optionsList">[Top, Center, Bottom]</data>
1818
</entity>
1919
<entity name="PageBuilderVerticalAlignmentPropertyCenter" type="pagebuilder_vertical_alignment_property">
2020
<data key="name">Vertical alignment</data>
2121
<data key="section">layout</data>
22-
<data key="fieldName">vertical_alignment</data>
22+
<data key="fieldName">justify_content</data>
2323
<data key="value">center</data>
2424
<data key="optionsList">[Top, Center, Bottom]</data>
2525
</entity>
2626
<entity name="PageBuilderVerticalAlignmentPropertyBottom" type="pagebuilder_vertical_alignment_property">
2727
<data key="name">Vertical alignment</data>
2828
<data key="section">layout</data>
29-
<data key="fieldName">vertical_alignment</data>
29+
<data key="fieldName">justify_content</data>
3030
<data key="value">flex-end</data>
3131
<data key="optionsList">[Top, Center, Bottom]</data>
3232
</entity>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_column_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
</validation>
271271
</settings>
272272
</field>
273-
<field name="vertical_alignment" sortOrder="20" formElement="select">
273+
<field name="justify_content" sortOrder="20" formElement="select">
274274
<argument name="data" xsi:type="array">
275275
<item name="config" xsi:type="array">
276276
<item name="default" xsi:type="string">flex-start</item>

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/column.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<property name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
3838
<property name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3939
<property name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
40-
<property name="vertical_alignment" source="justify_content"/>
40+
<property name="justify_content" source="justify_content"/>
4141
<property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
4242
<property name="width" source="width"/>
4343
<static_property source="align_self" value="stretch"/>
@@ -84,7 +84,7 @@
8484
<property name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
8585
<property name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
8686
<property name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
87-
<property name="vertical_alignment" source="justify_content"/>
87+
<property name="justify_content" source="justify_content"/>
8888
<property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
8989
<property name="width" source="width"/>
9090
<static_property source="align_self" value="flex-start"/>
@@ -131,7 +131,7 @@
131131
<property name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
132132
<property name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
133133
<property name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
134-
<property name="vertical_alignment" source="justify_content"/>
134+
<property name="justify_content" source="justify_content"/>
135135
<property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
136136
<property name="width" source="width"/>
137137
<static_property source="align_self" value="center"/>
@@ -178,7 +178,7 @@
178178
<property name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
179179
<property name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
180180
<property name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
181-
<property name="vertical_alignment" source="justify_content"/>
181+
<property name="justify_content" source="justify_content"/>
182182
<property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
183183
<property name="width" source="width"/>
184184
<static_property source="align_self" value="flex-end"/>

0 commit comments

Comments
 (0)