Merge branch 'develop' into corrected-media-gallery-url

Author: sivaschenko

app/code/Magento/PageBuilder/Model/Dom/NodeList.php

@@ -44,7 +44,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function item($index): ?ElementInterface
+    public function item(int $index): ?ElementInterface
     {
         return $this->objectManager->create(ElementInterface::class, [ 'element' => $this->nodeList->item($index) ]);
     }

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemMoveSlideItemsToRearrangeTest.xml

@@ -101,13 +101,9 @@
         <seeElement selector="{{SlideOnBackend.messageContent('2', PageBuilderSlideItemContent_Slide2.value)}}" stepKey="seeSlide2ContentAfterSave"/>
         <!-- Change Slide Order -->
         <comment userInput="Change Slide Order" stepKey="commentSortingSlides"/>
-        <executeJS function="return document.querySelectorAll('{{SliderOnStage.slideNavigationDragHandle}}')[0].clientWidth / 4" stepKey="xCoordinateToMoveTo"/>
-        <comment userInput="xCoordinateToMoveTo: $xCoordinateToMoveTo" stepKey="commentXCoordinate"/>
-        <executeJS function="return document.querySelectorAll('{{SliderOnStage.slideNavigationDragHandle}}')[0].clientHeight / 2" stepKey="yCoordinateToMoveTo"/>
-        <comment userInput="yCoordinateToMoveTo: $yCoordinateToMoveTo" stepKey="commentYCoordinate"/>
         <click selector="{{SliderOnStage.slideNavigationDot('1', '3')}}" stepKey="clickSlideDot"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <dragAndDrop selector1="{{SliderOnStage.slideNavigationDragHandleByIndex('1', '3')}}" selector2="{{SliderOnStage.slideNavigationDot('1', '1')}}" x="$xCoordinateToMoveTo" y="$yCoordinateToMoveTo" stepKey="dragAndDropSlide"/>
+        <dragAndDrop selector1="{{SliderOnStage.slideNavigationDragHandleByIndex('1', '3')}}" selector2="{{SliderOnStage.slideNavigationDot('1', '1')}}" x="-1" stepKey="dragAndDropSlide"/>
         <waitForPageLoad stepKey="waitForDragAndDrop"/>
         <!-- Validate Stage After Sorting -->
         <comment userInput="Validate Stage After Sorting" stepKey="commentValidateStage2"/>

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

@@ -91,6 +91,22 @@
             margin: 0;
         }
 
+        .map-old-price {
+            display: inline-block;
+
+            &:not(:last-child) {
+                margin-right: @indent__s;
+            }
+
+            .price-wrapper {
+                text-decoration: line-through;
+            }
+        }
+
+        .map-fallback-price {
+            display: none;
+        }
+
         .actions-primary {
             display: inline-block;
             max-width: 100%;

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

@@ -21,5 +21,6 @@
     .pagebuilder-column {
         background-attachment: scroll !important;
         flex-basis: 100%;
+        max-width: 100%;
     }
 }