Skip to content

Commit 48f9a3e

Browse files
committed
ACP2E-3864: Update copyrights for PB and fix static failures
1 parent 0cd4938 commit 48f9a3e

File tree

5 files changed

+12
-20
lines changed

5 files changed

+12
-20
lines changed

app/code/Magento/PageBuilder/view/adminhtml/templates/form/element/conditions.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $id = $block->getData('formNamespace') . '_' . $attribute;
1212
$role = 'pagebuilder-conditions-form-placeholder-' . $attribute;
1313
?>
1414
<label class="admin__field-label">
15-
<span><?= $block->escapeHtml($block->getData('label')) ?></span>
15+
<span><?= $escaper->escapeHtml($block->getData('label')) ?></span>
1616
</label>
1717
<div class="admin__field-control">
1818
<div class="rule-tree">

app/code/Magento/PageBuilder/view/adminhtml/templates/html/head/babel_polyfill.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/* @var $block \Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill */
88
/** @var $escaper \Magento\Framework\Escaper */
99

10-
if ($block->shouldLoadPolyfill()) : ?>
10+
if ($block->shouldLoadPolyfill()): ?>
1111
<script src="<?= $escaper->escapeUrl($block->getJsUrl()) ?>"></script>
1212
<?php endif; ?>
1313

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_template-manager.less

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
// * All Rights Reserved.
44
// */
55

6-
//
7-
// Replace box-shadow with borders when capturing a screenshot for template manager
8-
// ______________________________________________________________________
9-
6+
// @codingStandardsIgnoreFile
107
.pagebuilder-stage.capture .pagebuilder-canvas {
118
margin: -10px;
129
padding: 10px;
@@ -48,10 +45,6 @@
4845
padding-top: 10px;
4946
}
5047

51-
//
52-
// Style modal and grid slide out panel
53-
// ______________________________________________________________________
54-
5548
.modal-popup.template-manager-save .modal-inner-wrap {
5649
max-width: 50rem;
5750

@@ -85,7 +78,7 @@
8578
padding: .5rem;
8679
}
8780
}
88-
// @codingStandardsIgnoreStart
81+
8982
.pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid,
9083
.pagebuilder-template-index .admin__data-grid-wrap {
9184
.data-grid th:nth-child(1) {
@@ -119,7 +112,7 @@
119112
width: 20rem;
120113
}
121114
}
122-
// @codingStandardsIgnoreEnd
115+
123116
.preview-image-preview-image-block {
124117
padding-bottom: 3rem;
125118
}
@@ -132,4 +125,3 @@
132125
font-size: inherit;
133126
}
134127
}
135-

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_swatches.less

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// Variables
88
// _____________________________________________
99

10+
// @codingStandardsIgnoreStart
1011
@swatch-attribute-option__selected__color: #646464;
1112

1213
@swatch-option__background: @color-gray94;
@@ -183,9 +184,9 @@
183184
box-shadow: unset;
184185
cursor: default;
185186
pointer-events: none;
186-
// @codingStandardsIgnoreStart
187+
187188
&:after {
188-
// ToDo: improve .lib-background-gradient() to support diagonal gradient
189+
// improve .lib-background-gradient() to support diagonal gradient
189190
background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
190191
background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
191192
background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
@@ -200,7 +201,6 @@
200201
right: 0;
201202
top: 0;
202203
}
203-
// @codingStandardsIgnoreEnd
204204
}
205205

206206
&-disabled {
@@ -357,3 +357,4 @@
357357
}
358358
}
359359
}
360+
// @codingStandardsIgnoreEnd

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
// * All Rights Reserved.
44
// */
55

6-
@color-gray: #ccc;
7-
86
//
97
// Default appearance styles
108
// _____________________________________________
119

1210

13-
// @codingStandardsIgnoreStart
11+
@color-gray: #ccc;
12+
1413
div[data-content-type='tabs'],
1514
.pagebuilder-content-type.pagebuilder-tabs {
1615
.tabs-navigation {
@@ -221,4 +220,4 @@ div[data-content-type='tabs'] {
221220
.pagebuilder-content-type-hidden .pagebuilder-content-type.pagebuilder-tabs .tabs-navigation li.tab-header.ui-state-active {
222221
z-index: 10;
223222
}
224-
// @codingStandardsIgnoreEnd
223+

0 commit comments

Comments
 (0)