Skip to content

Commit 4356b05

Browse files
committed
Merge branch 'MC-5107-dynamic-block-use-default-value-checkbox' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
2 parents e4754a5 + 26d9113 commit 4356b05

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<element name="exitFullScreen" type="button" selector=".pagebuilder-header .action-close"/>
1515
<element name="stageLoading" type="button" selector="div.pagebuilder-stage-loading"/>
1616
<element name="stageWrapper" type="button" selector="//div[@class='pagebuilder-stage-wrapper']"/>
17+
<element name="enabled" type="button" selector="//div[not(contains(@class, '_disabled')) and contains(@data-bind,'visible: visible')]/div[@class='pagebuilder-stage-wrapper']"/>
18+
<element name="disabled" type="button" selector="//div[contains(@class, '_disabled') and contains(@data-bind,'visible: visible')]/div[@class='pagebuilder-stage-wrapper']"/>
1719
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-full-screen"/>
1820
<element name="stageWidthJS" type="button" selector="document.querySelector('div[class~=\'stage-container\']').clientWidth"/>
1921
<element name="modal" type="text" selector='aside.modal-popup._show'/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
.pagebuilder-stage-wrapper {
2626
position: relative;
2727

28+
._disabled & {
29+
opacity: .5;
30+
pointer-events: none;
31+
}
32+
2833
&.stage-full-screen {
2934
background: @color-white;
3035
height: 100%;

app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/wysiwyg.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77

8-
<div visible="visible">
8+
<div visible="visible" css="{'_disabled': disabled}">
99
<button if="wysiwygConfigData()['pagebuilder_button']"
1010
type="button"
1111
class="action-default action"

0 commit comments

Comments
 (0)