Skip to content

Commit eedb482

Browse files
committed
Merge branch 'PB-108' of github.com:magento/magento2-page-builder into PB-108
2 parents 5cb1631 + 5915f66 commit eedb482

File tree

4 files changed

+332
-318
lines changed

4 files changed

+332
-318
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
//
99
// _____________________________________________
1010

11+
@color-red-berry: #8e00064d;
12+
1113
.pagebuilder-column-line {
1214
position: relative;
1315
width: 100%;
1416

1517
.bottom-drop-placeholder,
1618
.column-drop-placeholder {
17-
background: #8e00064d;
19+
background: @color-red-berry;
1820
display: none;
1921
height: 30px;
2022
z-index: 26;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// * Copyright © Magento, Inc. All rights reserved.
33
// * See COPYING.txt for license details.
44
// */
5+
56
//
67
// Mobile (style-m.css)
78
// _____________________________________________

dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public function reportDataProvider(): array
7878
['type' => 'block', 'count' => 1],
7979
['type' => 'row', 'count' => 7],
8080
['type' => 'column-group', 'count' => 5],
81+
['type' => 'column-line', 'count' => 5],
8182
['type' => 'column', 'count' => 12],
8283
['type' => 'video', 'count' => 2],
8384
['type' => 'heading', 'count' => 3],

0 commit comments

Comments
 (0)