Skip to content

Commit e6b56b8

Browse files
committed
PB-108 make multiple public lines appear properly on front-end
1 parent 2b9e4eb commit e6b56b8

File tree

5 files changed

+38
-12
lines changed

5 files changed

+38
-12
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
</css>
6363
</element>
6464
<element name="container">
65-
<static_style source="display" value="flex"/>
6665
</element>
6766
</elements>
6867
<converters>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// /**
2+
// * Copyright © Magento, Inc. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Default appearance styles
8+
// _____________________________________________
9+
10+
.pagebuilder-column-line {
11+
width:100%;
12+
position:relative;
13+
14+
.bottom-drop-placeholder, .column-drop-placeholder {
15+
background: rgba(142, 0, 6, 0.3);
16+
height:30px;
17+
display:none;
18+
z-index:26;
19+
}
20+
21+
.element-children {
22+
display:flex;
23+
width:100%
24+
}
25+
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_import.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
// _import imports all appearance less files
88
// _____________________________________________
99

10+
@import './_default.less';
1011
@import './_mobile.less';

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!-- @todo move styles to style sheet -->
8-
<div class="pagebuilder-column-line" style="width:100%; position:relative;">
9-
<div class="column-drop-placeholder" afterRender="function (element) { bindColumnLineDropPlaceholder.call($data, element); }"
10-
style="background: rgba(142, 0, 6, 0.3); height:30px; top:45px; display:none; z-index:26;" ></div>
7+
8+
<div class="pagebuilder-column-line">
9+
<div class="column-drop-placeholder"
10+
afterRender="function (element) { bindColumnLineDropPlaceholder.call($data, element); }">
11+
12+
</div>
1113
<div class="resize-ghost" afterRender="function (element) { bindGhost.call($data, element); }"></div>
1214
<div class="drop-placeholder" afterRender="function (element) { bindDropPlaceholder.call($data, element); }"></div>
1315
<div class="move-placeholder" afterRender="function (element) { bindMovePlaceholder.call($data, element); }"></div>
14-
<div class="element-children" style="display:flex; width:100%"
16+
<div class="element-children"
1517
each="$parent.getChildren()"
1618
afterRender="function (element) { bindInteractions.call($data, element); }">
1719
<render args="{name: preview.template, data: preview}"></render>
1820
</div>
19-
<div class="bottom-drop-placeholder" afterRender="function (element) { bindColumnLineBottomDropPlaceholder.call($data, element); }" style="background: rgba(142, 0, 6, 0.3); height:30px; display:none; z-index:26;" ></div>
21+
<div class="bottom-drop-placeholder"
22+
afterRender="function (element) { bindColumnLineBottomDropPlaceholder.call($data, element); }" >
23+
24+
</div>
2025
</div>

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_default.less

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
& when (@media-common = true) {
7-
.pagebuilder-column-group {
8-
display: flex;
9-
}
10-
}
6+
117

128
//
139
// Mobile (style-m.css)

0 commit comments

Comments
 (0)