Skip to content

Commit d2cc570

Browse files
irenelagnoirenelagno
authored
Merge pull request #71 from magento-trigger/MAGETWO-86867-cleanup
- Clean up LESS/CSS classes and icons
2 parents 3b25e36 + d19c77a commit d2cc570

File tree

180 files changed

+161
-7828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+161
-7828
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderActionsSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="PageBuilderActionsSection">
1212
<element name="openPageBuilder" type="button" selector=".init-magento-pagebuilder" timeout="30"/>
13-
<element name="openPageBuilderCatalog" type="button" selector="[data-index='description'] button.pagebuilder-edit-button"/>
13+
<element name="openPageBuilderCatalog" type="button" selector="[data-index='description'] button.action-default"/>
1414
<element name="openFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen']"/>
1515
<element name="exitFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen-exit']"/>
1616
<element name="stageLoading" type="button" selector="div.pagebuilder-stage-loading"/>
@@ -47,7 +47,7 @@
4747
<element name="contentBlockInStage" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[1]' parameterized="true"/>
4848
<element name="contentBlockInStageByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]' parameterized="true"/>
4949
<element name="contentBlockContainer" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]/descendant::div[contains(@class, "element-children")]' parameterized="true"/>
50-
<element name="contentBlockPreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type.pagebuilder-entity-preview" parameterized="true"/>
50+
<element name="contentBlockPreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type" parameterized="true"/>
5151
<element name="contentBlockOptionsMenu" type="button" selector='div.pagebuilder-{{arg1}}.pagebuilder-content-type div.pagebuilder-options' parameterized="true"/>
5252
<element name="contentBlockOptionsMenuByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]//div[contains(@class,"pagebuilder-options-visible")]' parameterized="true"/>
5353
<element name="contentBlockMove" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[1]/div[contains(@class,"pagebuilder-options-visible")]/descendant::*[@class="move-structural"]' parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductFormSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="PageBuilderProductAttribute">
12-
<element name="PageBuilderBtn" type="text" selector="[data-index='{{var1}}'] button.pagebuilder-edit-button" parameterized="true"/>
12+
<element name="PageBuilderBtn" type="text" selector="[data-index='{{var1}}'] button.action-default" parameterized="true"/>
1313
<element name="WarningMsg" type="text" selector=".pagebuilder-modal-content-body"/>
1414
<element name="AcceptBtn" type="button" selector=".action-primary.action-accept"/>
1515
</section>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeCest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1010
<test name="AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest">
11-
<annotations>
12-
<group value="skip"/>
13-
<!--https://jira.corp.magento.com/browse/MAGETWO-87944-->
14-
</annotations>
1511
<before>
1612
<actionGroup ref="disablePageBuilderSetting" stepKey="turnOffPageBuilder" after="switchToTinyMCE4"/>
1713
</before>

‎app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public function getConfig(): array
4343
'options' => $this->options->toOptionArray(),
4444
'filterPlaceholder' => __('Page Name'),
4545
'missingValuePlaceholder' => __('Page with ID: %s doesn\'t exist'),
46-
'isDisplayMissingValuePlaceholder' => true
46+
'isDisplayMissingValuePlaceholder' => true,
47+
'isRemoveSelectedIcon' => true,
4748
];
4849
}
4950
}

‎app/code/Magento/PageBuilder/docs/how-to-add-new-content-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Optional: For template knockout bindings, you can use the original data-bind syn
9696
Preview template `app/code/Vendor/ModuleName/view/adminhtml/web/template/content-type/simple/default/preview.html`.
9797

9898
``` HTML
99-
<div class="pagebuilder-content-type pagebuilder-entity pagebuilder-entity-preview" event="{mouseover: onMouseOver, mouseout: onMouseOut}, mouseoverBubble: false">
99+
<div class="pagebuilder-content-type" event="{mouseover: onMouseOver, mouseout: onMouseOut}, mouseoverBubble: false">
100100
<div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" html="data.main.html"></div>
101101
<!-- Display context menu options for content type -->
102102
<render args="getOptions().template" />

‎app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ var config = {
99

1010
/* Extra Resources Needed */
1111
'pagebuilder/html2canvas': 'Magento_PageBuilder/js/resource/html2canvas',
12-
'pagebuilder/highlight': 'Magento_PageBuilder/js/resource/highlight/highlight.pack',
1312
'hyperscript': 'Magento_PageBuilder/js/resource/hyperscript/hyperscript',
1413
'xyperscript': 'Magento_PageBuilder/js/resource/xyperscript/xyperscript',
1514
'google-map': 'Magento_PageBuilder/js/utils/map',

‎app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/enable_field/modal_content_body.phtml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
?>
88
<div class="pagebuilder-modal-content-body">
9-
<p><?= /* @escapeNotVerified */
10-
__('This will change your Admin and storefront by:') ?></p>
9+
<p><?= $block->escapeHtml(__('This will change your Admin and storefront by:')) ?></p>
1110
<ul>
1211
<li>
1312
<strong><?= $block->escapeHtml(__('Removing PageBuilder\'s advanced content tools')) ?></strong>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_map_form.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
<item name="multiple" xsi:type="boolean">false</item>
167167
<item name="showCheckbox" xsi:type="boolean">false</item>
168168
<item name="disableLabel" xsi:type="boolean">true</item>
169-
<item name="isRemoveSelectedIcon" xsi:type="boolean">false</item>
170169
<item name="levelsVisibility" xsi:type="number">1</item>
171170
</item>
172171
</argument>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_typography.less

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ body {
5151
margin: 0 0 40px;
5252

5353
.lib-typography(
54-
@_color: #333,
54+
@_color: @color-gray20,
5555
@_font-family: false,
5656
@_font-size: 40px,
5757
@_font-style: false,
@@ -64,7 +64,7 @@ body {
6464
margin: 25px 0 20px;
6565

6666
.lib-typography(
67-
@_color: #333,
67+
@_color: @color-gray20,
6868
@_font-family: false,
6969
@_font-size: 26px,
7070
@_font-style: false,
@@ -77,7 +77,7 @@ body {
7777
margin: 20px 0 10px;
7878

7979
.lib-typography(
80-
@_color: #333,
80+
@_color: @color-gray20,
8181
@_font-family: false,
8282
@_font-size: 18px,
8383
@_font-style: false,
@@ -90,7 +90,7 @@ body {
9090
margin: 20px 0;
9191

9292
.lib-typography(
93-
@_color: #333,
93+
@_color: @color-gray20,
9494
@_font-family: false,
9595
@_font-size: 14px,
9696
@_font-style: false,
@@ -103,7 +103,7 @@ body {
103103
margin: 20px 0;
104104

105105
.lib-typography(
106-
@_color: #333,
106+
@_color: @color-gray20,
107107
@_font-family: false,
108108
@_font-size: 12px,
109109
@_font-style: false,
@@ -116,7 +116,7 @@ body {
116116
margin: 20px 0;
117117

118118
.lib-typography(
119-
@_color: #333,
119+
@_color: @color-gray20,
120120
@_font-family: false,
121121
@_font-size: 10px,
122122
@_font-style: false,
@@ -129,7 +129,7 @@ body {
129129
// Text
130130
//
131131
p {
132-
color: #333;
132+
color: @color-gray20;
133133
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
134134
font-size: 14px;
135135
font-style: normal;
@@ -139,9 +139,9 @@ body {
139139
}
140140

141141
pre {
142-
background-color: #f6f6f6;
142+
background-color: @color-white-smoke;
143143
border: @pre__border-width solid #ccc;
144-
color: #111;
144+
color: @color-black;
145145
font-family: @font-family__monospace;
146146
font-size: @code__font-size;
147147
font-style: normal;
@@ -152,8 +152,8 @@ body {
152152
}
153153

154154
.cms-content-important {
155-
background-color: #f5f5f5;
156-
color: #333;
155+
background-color: @color-white-smoke;
156+
color: @color-gray20;
157157
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
158158
font-size: 22px;
159159
font-style: normal;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,15 @@
99

1010
@import '_preview.less';
1111
@import 'accordion/_import.less';
12-
@import 'anchor/_import.less';
1312
@import 'banner/_import.less';
14-
@import 'block/_import.less';
1513
@import 'button-item/_import.less';
1614
@import 'buttons/_import.less';
1715
@import 'buttons/_import.less';
18-
@import 'children/_import.less';
1916
@import 'column/_import.less';
2017
@import 'column-group/_import.less';
2118
@import 'divider/_import.less';
2219
@import 'heading/_import.less';
23-
@import 'html/_import.less';
2420
@import 'image/_import.less';
25-
@import 'map/_import.less';
2621
@import 'newsletter/_import.less';
2722
@import 'products/_import.less';
2823
@import 'row/_import.less';

0 commit comments

Comments
 (0)