MC-22156: [PageBuilder] Content in Category Pages Aligning to Browser Margin Instead of Body Content Margin

rostyslav-hymon · rostyslav-hymon · commit 5ebc4d7b253b · 2019-11-20T09:31:46.000+02:00
diff --git a/app/code/Magento/PageBuilder/view/frontend/page_layout/catalog_category_view.xml b/app/code/Magento/PageBuilder/view/frontend/page_layout/catalog_category_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="category.view.container">
+            <referenceBlock name="category.description" template="Magento_PageBuilder::catalog/category/view/description.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/category/view/description.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/category/view/description.phtml
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/**
+ * Category view template
+ *
+ * @var $block \Magento\Catalog\Block\Category\View
+ */
+?>
+<?php if ($description = $block->getCurrentCategory()->getDescription()) :?>
+    <div class="category-description">
+        <?php $descriptionHtml = $this->helper(Magento\Catalog\Helper\Output::class)->categoryAttribute(
+            $block->getCurrentCategory(),
+            $description,
+            'description'
+        );?>
+        <?php if (stripos($description, 'data-appearance="contained"') === false) :?>
+            <div data-content-type="row" data-appearance="contained" data-element="main">
+                <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
+                    <div data-content-type="html" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">
+                        <?= /* @noEscape */$descriptionHtml; ?>
+                    </div>
+                </div>
+            </div>
+        <?php else : ?>
+            <?= /* @noEscape */$descriptionHtml; ?>
+    <?php endif; ?>
+    </div>
+<?php endif; ?>
+
