Skip to content

Commit 879e108

Browse files
committed
PB-500 fix ability to hide column groups on the front-end
1 parent 6d79bdf commit 879e108

File tree

2 files changed

+4
-2
lines changed
  • app/code/Magento/PageBuilder/view/adminhtml

2 files changed

+4
-2
lines changed

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column_group.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
5252
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
5353
<static_style source="align_self" value="stretch"/>
54-
<static_style source="display" value="flex"/>
5554
<attribute name="background_images" source="data-background-images"/>
5655
<attribute name="name" source="data-content-type"/>
5756
<attribute name="appearance" source="data-appearance"/>
@@ -62,6 +61,9 @@
6261
</filter>
6362
</css>
6463
</element>
64+
<element name="container">
65+
<static_style source="display" value="flex"/>
66+
</element>
6567
</elements>
6668
<converters>
6769
<converter name="background_images" component="Magento_PageBuilder/js/mass-converter/background-images">

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

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

88
<div class="pagebuilder-column-group pagebuilder-content-type-affordance pagebuilder-content-type pagebuilder-affordance-column-group"
9-
ko-style="getStyle(data.main, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight', 'width', 'alignSelf', 'minHeight'])"
9+
ko-style="Object.assign(data.container.style, getStyle(data.main, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight', 'width', 'alignSelf', 'minHeight']))"
1010
event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false"
1111
css="Object.assign(data.main.css(), {'empty-container': $parent.children().length == 0})"
1212
attr="data.main.attributes">

0 commit comments

Comments
 (0)