Skip to content

Commit 36c7788

Browse files
nathanjosiahnathanjosiah
committed
MAGETWO-92321: [Tech Debt] Cleanup master format for text
- Made changes per AC
1 parent f517305 commit 36c7788

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1010
<section name="TextOnStage">
11-
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}]" parameterized="true"/>
12-
<element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][.='{{arg2}}']" parameterized="true"/>
13-
<element name="textAreaTextContains" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(.,'{{arg2}}')]" parameterized="true"/>
14-
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//p[contains(.,'{{arg2}}')]" parameterized="true"/>
11+
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}]" parameterized="true"/>
12+
<element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][.='{{arg2}}']" parameterized="true"/>
13+
<element name="textAreaTextContains" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(.,'{{arg2}}')]" parameterized="true"/>
14+
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//p[contains(.,'{{arg2}}')]" parameterized="true"/>
1515
<!-- Advanced Configuration -->
16-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
17-
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
18-
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
19-
<element name="noBorder" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-style:'))]" parameterized="true"/>
20-
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
21-
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
22-
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
23-
<element name="noBorderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-width:'))]" parameterized="true"/>
24-
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
25-
<element name="noBorderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-radius:'))]" parameterized="true"/>
26-
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
27-
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[@class='pagebuilder-text'])[{{arg1}}]" parameterized="true"/>
28-
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
29-
<element name="noMargins" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'margin:'))]" parameterized="true"/>
30-
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
31-
<element name="noPadding" type="text" selector="(//div[contains(@class,'pagebuilder-textarea')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'padding:'))]" parameterized="true"/>
16+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
17+
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
18+
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
19+
<element name="noBorder" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-style:'))]" parameterized="true"/>
20+
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
21+
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
22+
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
23+
<element name="noBorderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-width:'))]" parameterized="true"/>
24+
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
25+
<element name="noBorderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'border-radius:'))]" parameterized="true"/>
26+
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
27+
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[@class='pagebuilder-text'])[{{arg1}}]" parameterized="true"/>
28+
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
29+
<element name="noMargins" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'margin:'))]" parameterized="true"/>
30+
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
31+
<element name="noPadding" type="text" selector="(//div[contains(@class,'pagebuilder-text')]//div[contains(@class,'pagebuilder-text')])[{{arg1}}][not(contains(@style,'padding:'))]" parameterized="true"/>
3232
</section>
3333
<section name="TextOnConfiguration">
3434
<!-- WYSIWYG Enabled -->
@@ -68,7 +68,7 @@
6868
<element name="noPadding" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'padding:'))]" parameterized="true"/>
6969
</section>
7070
<section name="TextOnBackend">
71-
<element name="textInstance" type="button" selector='//div[contains(@class, "pagebuilder-textarea")][1]/div[1]'/>
71+
<element name="textInstance" type="button" selector='//div[contains(@class, "pagebuilder-text")][1]/div[1]'/>
7272
<element name="textArea" type="text" selector='#pagebuilder_text_form_content'/>
7373
<element name="triggerValidation" type="button" selector='div.modal-content div.mce-edit-area'/>
7474
</section>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
.pagebuilder-content-type {
12-
.pagebuilder-textarea {
12+
.pagebuilder-text {
1313
ol {
1414
list-style: decimal;
1515
padding-left: @margin;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
-->
77

8-
<div class="pagebuilder-content-type pagebuilder-textarea" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
9-
<div class="pagebuilder-text" if="data.main.html()" attr="data.main.attributes" ko-style="data.main.style" css="Object.assign(data.main.css(), {'placeholder-text': !data.main.html()})" html="data.main.html"></div>
10-
<div class="pagebuilder-text" ifnot="data.main.html()" attr="data.main.attributes" ko-style="data.main.style" css="Object.assign(data.main.css(), {'placeholder-text': !data.main.html()})" translate="'Text'"></div>
8+
<div class="pagebuilder-content-type pagebuilder-text" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
9+
<div class="pagebuilder-text" if="data.main.html()" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" html="data.main.html"></div>
10+
<div class="pagebuilder-text" ifnot="data.main.html()" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css()" class="placeholder-text" translate="'Text'"></div>
1111
<render args="getOptions().template" />
1212
</div>

0 commit comments

Comments
 (0)