Skip to content

Commit 41a68f5

Browse files
committed
MC-5423: Scheduled Update slide out issues
- Resolve build failures
1 parent c91e50b commit 41a68f5

File tree

3 files changed

+9
-33
lines changed

3 files changed

+9
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<section name="PageBuilderStage">
1212
<element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
1313
<element name="openFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen']"/>
14-
<element name="exitFullScreen" type="button" selector=".pagebuilder-header .action-close"/>
14+
<element name="exitFullScreen" type="button" selector=".pagebuilder-header .icon-pagebuilder-fullscreen-exit"/>
1515
<element name="stageLoading" type="button" selector="div.pagebuilder-stage-loading"/>
1616
<element name="stageWrapper" type="button" selector="//div[@class='pagebuilder-stage-wrapper']"/>
1717
<element name="enabled" type="button" selector="//div[not(contains(@class, '_disabled'))]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[@class='pagebuilder-stage-wrapper']"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@
437437
<argument name="contentType" value="PageBuilderRowContentType"/>
438438
</actionGroup>
439439
<click selector="{{PageBuilderStage.openFullScreen}}" stepKey="enterFullScreen"/>
440+
<waitForElementVisible selector="{{PageBuilderStage.exitFullScreen}}" stepKey="waitForExitVisible"/>
440441
<scrollTo selector="{{RowOnStage.base('6')}}" stepKey="scrollToBottom"/>
441442
<seeElement selector="{{PageBuilderStage.exitFullScreen}}" stepKey="verifyHeader"/>
442443
</test>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
@border-size: 2px;
77

88
.pagebuilder-header {
9-
text-align: right;
109
margin-bottom: 15px;
10+
text-align: right;
1111

1212
> .icon-pagebuilder-fullscreen {
1313
cursor: pointer;
@@ -24,9 +24,9 @@
2424
}
2525

2626
.pagebuilder-stage-wrapper {
27-
-webkit-transition: .35s ease-in-out;
2827
-moz-transition: .35s ease-in-out;
29-
background: white;
28+
-webkit-transition: .35s ease-in-out;
29+
background: #fff;
3030
position: relative;
3131
transition: .35s ease-in-out;
3232

@@ -36,8 +36,8 @@
3636
}
3737

3838
&.stage-full-screen {
39-
-webkit-transform: translateZ(0);
4039
-moz-transform: translateZ(0);
40+
-webkit-transform: translateZ(0);
4141
background: @color-white;
4242
height: 100%;
4343
left: 0;
@@ -146,44 +146,19 @@
146146
}
147147
}
148148

149-
.pagebuilder-add-row-wrapper {
150-
float: left;
151-
text-align: center;
152-
width: 100%;
153-
154-
.pagebuilder-add-row {
155-
-moz-border-radius: 5px;
156-
-webkit-border-radius: 5px;
157-
158-
background: @row-color;
159-
border-radius: 5px;
160-
color: @color-white;
161-
display: inline-block;
162-
font-size: 26px;
163-
height: 50px;
164-
line-height: 50px;
165-
width: 50px;
166-
167-
&:hover {
168-
background: darken(@row-color, 15%);
169-
}
170-
}
171-
}
172-
173149
.pagebuilder-stage {
174150
-moz-transition: margin-left .35s ease-in-out;
175-
-webkit-transition: margin-left .35s ease-in-out;
176151
-moz-user-select: none;
152+
-webkit-transition: margin-left .35s ease-in-out;
153+
-webkit-user-select: none;
177154
-ms-user-select: none;
178155
-o-user-select: none;
179-
-webkit-user-select: none;
180-
181156
font-size: 0;
182157
margin-left: 170px;
183158
min-height: 200px;
184159
padding: 0;
185-
user-select: none;
186160
transition: margin-left .35s ease-in-out;
161+
user-select: none;
187162

188163
&.stage-full-screen {
189164
background: @color-black;

0 commit comments

Comments
 (0)