Skip to content

Commit 84de0db

Browse files
committed
Merge branch 'cms-team-1-delivery' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
2 parents d4318e3 + 1cf1a86 commit 84de0db

File tree

4 files changed

+27
-6
lines changed

4 files changed

+27
-6
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js

Lines changed: 3 additions & 1 deletion
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/template/content-type/column/full-height/master.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
*/
66
-->
77

8-
<div attr="data.main.attributes"
8+
<div class="pagebuilder-column"
9+
attr="data.main.attributes"
910
ko-style="data.main.style"
1011
css="data.main.css">
1112
<render args="renderChildTemplate"/>

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/preview.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ export default class Preview extends BasePreview {
6161
paddingLeft: "",
6262
paddingRight: "",
6363
paddingTop: "",
64+
border: "none",
65+
borderRadius: "0px",
6466
};
6567
}
6668
/**

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@
4646
<attribute name="name" source="data-role"/>
4747
<attribute name="appearance" source="data-appearance"/>
4848
</attributes>
49-
<css name="css_classes"/>
49+
<css name="css_classes">
50+
<filter>
51+
<class source="pagebuilder-column"/>
52+
</filter>
53+
</css>
5054
</element>
5155
</elements>
5256
<converters>
@@ -86,7 +90,11 @@
8690
<attribute name="name" source="data-role"/>
8791
<attribute name="appearance" source="data-appearance"/>
8892
</attributes>
89-
<css name="css_classes"/>
93+
<css name="css_classes">
94+
<filter>
95+
<class source="pagebuilder-column"/>
96+
</filter>
97+
</css>
9098
</element>
9199
</elements>
92100
<converters>
@@ -126,7 +134,11 @@
126134
<attribute name="name" source="data-role"/>
127135
<attribute name="appearance" source="data-appearance"/>
128136
</attributes>
129-
<css name="css_classes"/>
137+
<css name="css_classes">
138+
<filter>
139+
<class source="pagebuilder-column"/>
140+
</filter>
141+
</css>
130142
</element>
131143
</elements>
132144
<converters>
@@ -166,7 +178,11 @@
166178
<attribute name="name" source="data-role"/>
167179
<attribute name="appearance" source="data-appearance"/>
168180
</attributes>
169-
<css name="css_classes"/>
181+
<css name="css_classes">
182+
<filter>
183+
<class source="pagebuilder-column"/>
184+
</filter>
185+
</css>
170186
</element>
171187
</elements>
172188
<converters>

0 commit comments

Comments
 (0)