Merge branch 'develop' of https://github.com/mage-os/mirror-magento2-…

…page-builder into develop
mage-os · Dec 14, 2023 · 4bbff14 · 4bbff14
2 parents b4667d1 + bf83c74
commit 4bbff14
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml
@@ -200,18 +200,18 @@
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
         <data key="value">#804042</data>
-        <data key="rgb">rgb(128, 64, 64)</data>
-        <data key="hex">#804040</data>
+        <data key="rgb">rgb(126, 63, 63)</data>
+        <data key="hex">#7e3f3f</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_CenterColorHueSlider" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
         <data key="value">#40807f</data>
-        <data key="rgb">rgb(64, 128, 127)</data>
-        <data key="hex">#40807f</data>
+        <data key="rgb">rgb(63, 123, 126)</data>
+        <data key="hex">#3f7b7e</data>
         <data key="rgbaCenterOfLightDarkSlider">rgba(64, 128, 127, 0.5)</data>
-        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*128,\s*127,\s*0.49(\d+)\)</data>
+        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(63,\s*123,\s*126,\s*0.49(\d+)\)</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>

diff --git a/...f/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml b/...f/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml
@@ -21,6 +21,7 @@
             <group value="pagebuilder-cms-page"/>
             <group value="pr_exclude"/>
             <group value="cloud"/>
+	    <skip><issueId value="AC-10534"/></skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

diff --git a/...Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml b/...Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml
@@ -19,9 +19,6 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-banner"/>
-            <skip>
-              <issueId value="ACQE-3836">Skipped</issueId>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>