Skip to content

Commit 1541810

Browse files
author
Hwashiang Yu
committed
MC-4075: Alignment attribute not working as expected for product, map, divider, video
- Changed video to rely on text align for alignment instead of justify content for alignment inside other containers
1 parent 79ca9e7 commit 1541810

File tree

6 files changed

+10
-26
lines changed

6 files changed

+10
-26
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@
5555
<data key="name">Alignment</data>
5656
<data key="section">advanced</data>
5757
<data key="fieldName">text_align</data>
58-
<data key="value">flex-end</data>
58+
<data key="value">right</data>
5959
</entity>
6060
</entities>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'max-width: {{arg2}}px;')]" parameterized="true"/>
2323
<element name="noWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))][contains(@class,'pagebuilder-video-wrapper')]" parameterized="true"/>
2424
<!-- Advanced Configuration -->
25-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
26-
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[not(contains(@style,'justify-content:'))]" parameterized="true"/>
25+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[contains(@style, 'text-align: {{arg2}};')]" parameterized="true"/>
26+
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[not(contains(@style,'text-align:'))]" parameterized="true"/>
2727
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
2828
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
2929
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
@@ -46,8 +46,8 @@
4646
<element name="width" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'max-width: {{arg2}}')]" parameterized="true"/>
4747
<element name="noWidth" type="text" selector="(//div[@data-role='video']//iframe)[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
4848
<!-- Advanced Configuration -->
49-
<element name="alignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
50-
<element name="noAlignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][not(contains(@style,'justify-content'))]" parameterized="true"/>
49+
<element name="alignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
50+
<element name="noAlignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][not(contains(@style,'text-align'))]" parameterized="true"/>
5151
<element name="border" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
5252
<element name="borderColor" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
5353
<element name="noBorderColor" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'border-color:'))]" parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
reader="Magento_PageBuilder/js/master-format/read/configurable">
2525
<elements>
2626
<element name="main">
27-
<style name="text_align" source="justify_content"/>
27+
<style name="text_align" source="text_align"/>
2828
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
2929
<attribute name="name" source="data-role"/>
3030
<attribute name="appearance" source="data-appearance"/>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_video_form.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,4 @@
9595
</settings>
9696
</field>
9797
</fieldset>
98-
<fieldset name="advanced">
99-
<field name="text_align" formElement="select">
100-
<formElements>
101-
<select>
102-
<settings>
103-
<options class="Magento\PageBuilder\Model\Source\VideoAlignmentSource"/>
104-
</settings>
105-
</select>
106-
</formElements>
107-
</field>
108-
</fieldset>
10998
</form>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
}
2121
div[data-role='video'],
2222
.pagebuilder-video {
23-
display: flex;
24-
2523
> div:first-child,
2624
.pagebuilder-video-wrapper,
2725
.pagebuilder-video-container {
28-
display: flex;
29-
flex-grow: 1;
26+
display: inline-block;
27+
width: 100%;
3028
}
3129
.pagebuilder-video-container {
3230
padding-top: 56.25%;

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@
88
// _____________________________________________
99

1010
div[data-role='video'] {
11-
display: flex;
12-
1311
.pagebuilder-video-wrapper,
1412
.pagebuilder-video-container {
15-
display: flex;
16-
flex-grow: 1;
17-
height: 100%;
13+
display: inline-block;
14+
width: 100%;
1815
}
1916
.pagebuilder-video-container {
2017
padding-top: 56.25%;

0 commit comments

Comments
 (0)