Skip to content

Commit 6d6ddf4

Browse files
committed
MAGETWO-92697: Add vertical alignment to column configuration
- remove static properties from main element - rename content to container
1 parent 586f122 commit 6d6ddf4

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/master.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<div class="pagebuilder-column"
99
attr="data.main.attributes"
10-
ko-style="Object.assign(data.main.style(), data.content.style())"
10+
ko-style="Object.assign(data.main.style(), data.container.style())"
1111
css="data.main.css">
1212
<render args="renderChildTemplate"/>
1313
</div>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
data-bind="visible: $index() < $parent.parent.children().length - 1"></div>
1717
<div class="pagebuilder-resizing" css="{active: resizing}"></div>
1818
<render args="getOptions().template"></render>
19-
<div class="element-children content-type-container" each="parent.getChildren()" ko-style="data.content.style" css="getChildrenCss()" attr="{id: parent.id + '-children'}" data-bind="sortable: getSortableOptions()" afterRender="function (element) { if (typeof afterChildrenRender === 'function') { afterChildrenRender(element); } }">
19+
<div class="element-children content-type-container" each="parent.getChildren()" ko-style="data.container.style" css="getChildrenCss()" attr="{id: parent.id + '-children'}" data-bind="sortable: getSortableOptions()" afterRender="function (element) { if (typeof afterChildrenRender === 'function') { afterChildrenRender(element); } }">
2020
<if args="$parent.isContainer()">
2121
<div class="pagebuilder-drop-indicator"></div>
2222
</if>

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
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"/>
44-
<static_property source="display" value="flex" persist="false"/>
45-
<static_property source="flex_direction" value="column" persist="false"/>
4644
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
4745
</style_properties>
4846
<attributes>
@@ -55,7 +53,7 @@
5553
</filter>
5654
</css>
5755
</element>
58-
<element name="content">
56+
<element name="container">
5957
<style_properties>
6058
<property name="justify_content" source="justify_content"/>
6159
<static_property source="display" value="flex"/>
@@ -95,8 +93,6 @@
9593
<property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
9694
<property name="width" source="width"/>
9795
<static_property source="align_self" value="flex-start"/>
98-
<static_property source="display" value="flex" persist="false"/>
99-
<static_property source="flex_direction" value="column" persist="false"/>
10096
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
10197
</style_properties>
10298
<attributes>
@@ -109,7 +105,7 @@
109105
</filter>
110106
</css>
111107
</element>
112-
<element name="content">
108+
<element name="container">
113109
<style_properties>
114110
<property name="justify_content" source="justify_content"/>
115111
<static_property source="display" value="flex"/>
@@ -149,8 +145,6 @@
149145
<property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
150146
<property name="width" source="width"/>
151147
<static_property source="align_self" value="center"/>
152-
<static_property source="display" value="flex" persist="false"/>
153-
<static_property source="flex_direction" value="column" persist="false"/>
154148
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
155149
</style_properties>
156150
<attributes>
@@ -163,7 +157,7 @@
163157
</filter>
164158
</css>
165159
</element>
166-
<element name="content">
160+
<element name="container">
167161
<style_properties>
168162
<property name="justify_content" source="justify_content"/>
169163
<static_property source="display" value="flex"/>
@@ -203,8 +197,6 @@
203197
<property name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
204198
<property name="width" source="width"/>
205199
<static_property source="align_self" value="flex-end"/>
206-
<static_property source="display" value="flex" persist="false"/>
207-
<static_property source="flex_direction" value="column" persist="false"/>
208200
<complex_property name="margins_and_padding" reader="Magento_PageBuilder/js/property/margins-and-paddings" converter="Magento_PageBuilder/js/converter/style/margins-and-paddings"/>
209201
</style_properties>
210202
<attributes>
@@ -217,7 +209,7 @@
217209
</filter>
218210
</css>
219211
</element>
220-
<element name="content">
212+
<element name="container">
221213
<style_properties>
222214
<property name="justify_content" source="justify_content"/>
223215
<static_property source="display" value="flex"/>

0 commit comments

Comments
 (0)