Skip to content

Commit 672184c

Browse files
anthoulaanthoula
committed
Merge branch '1.1-develop' of github.com:magento/magento2-page-builder into MC-15812
2 parents f736ff4 + 036bf2d commit 672184c

File tree

6 files changed

+70
-8
lines changed

6 files changed

+70
-8
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</entity>
108108
<!-- Container Height -->
109109
<entity name="PageBuilderEmptySliderContainerHeight" type="pagebuilder_slider_height_property">
110-
<data key="value">368</data>
110+
<data key="value">360</data>
111111
</entity>
112112
<!-- CSS Classes -->
113113
<entity name="PageBuilderSliderAdvancedCssClasses_Default" type="pagebuilder_advanced_css_classes_property">

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,70 @@
616616
<argument name="padding" value="PageBuilderPaddingProperty10"/>
617617
</actionGroup>
618618
</test>
619+
<test name="SliderWithNoDotsEqualToMinHeight" extends="RowWithBordersAndPaddingEqualToMinHeight">
620+
<annotations>
621+
<features value="PageBuilder"/>
622+
<stories value="Slider"/>
623+
<title value="Slider with no dots is equal to min height"/>
624+
<description value="A user can see Slider height with no dots is equal to min height"/>
625+
<severity value="AVERAGE"/>
626+
<useCaseId value="MC-15742"/>
627+
<testCaseId value="MC-18088"/>
628+
<group value="pagebuilder"/>
629+
<group value="pagebuilder-slide"/>
630+
<group value="pagebuilder-sliderCommon"/>
631+
</annotations>
632+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
633+
<argument name="contentType" value="PageBuilderSliderContentType"/>
634+
</actionGroup>
635+
<actionGroup ref="expandPageBuilderPanelMenuSection" after="enterPageTitle" stepKey="expandMenuSection">
636+
<argument name="contentType" value="PageBuilderSliderContentType"/>
637+
</actionGroup>
638+
<actionGroup ref="dragContentTypeToStage" after="commentConfigureContentType" stepKey="dragContentTypeToStage">
639+
<argument name="contentType" value="PageBuilderSliderContentType"/>
640+
</actionGroup>
641+
<actionGroup ref="unFocusOptionMenu" after="dragContentTypeToStage" stepKey="unfocusSlideOptions">
642+
<argument name="contentType" value="PageBuilderSlideContentType"/>
643+
</actionGroup>
644+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel">
645+
<argument name="contentType" value="PageBuilderSliderContentType"/>
646+
</actionGroup>
647+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
648+
<argument name="property" value="PageBuilderSliderMinHeight_Default"/>
649+
</actionGroup>
650+
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" after="enterMinHeightProperty" stepKey="enterShowDotsDisabled">
651+
<argument name="property" value="PageBuilderSliderShowDots_Disabled"/>
652+
</actionGroup>
653+
<remove keyForRemoval="enterBorder"/>
654+
<remove keyForRemoval="enterBorderColor"/>
655+
<remove keyForRemoval="enterBorderWidth"/>
656+
<remove keyForRemoval="enterPadding"/>
657+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" after="saveEditPanelSettings" stepKey="openSlideItemEditPanel">
658+
<argument name="section" value="SlideOnBackend"/>
659+
</actionGroup>
660+
<actionGroup ref="fillSlideOutPanelFieldGeneral" after="openSlideItemEditPanel" stepKey="enterMinHeightPropertySlideItem">
661+
<argument name="property" value="PageBuilderSlideItemMinimumHeight_300"/>
662+
</actionGroup>
663+
<actionGroup ref="fillSlideOutPanelField" after="enterMinHeightPropertySlideItem" stepKey="enterBackgroundColor">
664+
<argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
665+
</actionGroup>
666+
<actionGroup ref="saveEditPanelSettings" after="enterBackgroundColor" stepKey="saveEditPanelSettings2"/>
667+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightBeforeSave">
668+
<argument name="content" value="{{SliderOnStage.containerCSS}}"/>
669+
<argument name="height" value="PageBuilderSliderMinHeight_Default"/>
670+
</actionGroup>
671+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightAfterSave">
672+
<argument name="content" value="{{SliderOnStage.containerCSS}}"/>
673+
<argument name="height" value="PageBuilderSliderMinHeight_Default"/>
674+
</actionGroup>
675+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
676+
<argument name="contentType" value="PageBuilderSliderContentType"/>
677+
</actionGroup>
678+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightStorefront">
679+
<argument name="content" value="{{SliderOnFrontend.all}}"/>
680+
<argument name="height" value="PageBuilderSliderMinHeight_Default"/>
681+
</actionGroup>
682+
</test>
619683
<test name="SliderMoveSlider">
620684
<annotations>
621685
<features value="PageBuilder"/>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
}
7676

7777
.slider-controls {
78-
padding: 14px 0;
78+
padding: 10px 0;
7979
text-align: center;
8080

8181
.slider-navigation {
@@ -334,11 +334,10 @@
334334
display: block;
335335
}
336336
.slick-dots {
337-
bottom: -30px;
338337
display: block;
339338
list-style: none;
340339
margin: 0;
341-
padding: 0;
340+
padding: 15px 0;
342341
text-align: center;
343342
width: 100%;
344343
li {

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

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

1010
[data-content-type='slide'] {
1111
box-sizing: border-box;
12+
line-height: 20px;
1213
min-height: inherit;
1314
overflow: hidden;
1415

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ div[data-content-type='slider'] {
1212

1313
&.slick-initialized {
1414
display: block;
15-
margin-bottom: 35px !important; // required due to inline styles added by Slick
1615
}
1716

1817
.slick-list,
@@ -21,6 +20,7 @@ div[data-content-type='slider'] {
2120
min-height: inherit;
2221

2322
> div {
23+
line-height: 0;
2424
min-height: inherit;
2525
overflow: hidden;
2626
width: 100%;

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/slick/_slick.less

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,10 @@
185185
}
186186

187187
.slick-dots {
188-
bottom: -30px;
189188
display: block;
190189
list-style: none;
191190
margin: 0;
192-
padding: 0;
193-
position: absolute;
191+
padding: 15px 0;
194192
text-align: center;
195193
width: 100%;
196194
li {

0 commit comments

Comments
 (0)