Merge branch 'develop' into MC-4014-performance

# Conflicts:
#	app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/preview.ts

Author: davemacaulay

app/code/Magento/PageBuilder/docs/CONTRIBUTING.md renamed to CONTRIBUTING.md

@@ -1,5 +1,6 @@
 # Contributing to Magento 2 code
 
+<!--{% comment %}-->
 ## Navigation
 
 1. [Introduction]
@@ -13,34 +14,14 @@
 5. [Roadmap and known issues]
 6. [How to create custom PageBuilder content type container]
 
-[Introduction]: README.md
-[Contribution guide]: CONTRIBUTING.md
-[Installation guide]: install.md
-[Developer documentation]: developer-documentation.md
-[Architecture overview]: architecture-overview.md
-[BlueFoot to PageBuilder data migration]: bluefoot-data-migration.md
-[Third-party content type migration]: new-content-type-example.md
-[Iconography]: iconography.md
-[Add image uploader to content type]: image-uploader.md
-[Module integration]: module-integration.md
-[Additional data configuration]: custom-configuration.md
-[Content type configuration]: content-type-configuration.md
-[How to add a new content type]: how-to-add-new-content-type.md
-[Events]: events.md
-[Bindings]: bindings.md
-[Master format]: master-format.md
-[Visual select]: visual-select.md
-[Reuse product conditions in content types]: product-conditions.md
-[Store component master format as widget directive]: widget-directive.md
-[Use the block chooser UI component]: block-chooser-component.md
-[Use the inline text editing component]: inline-editing-component.md
-[Render a backend content type preview]: content-type-preview.md
-[Custom Toolbar]: toolbar.md
-[Full width page layouts]: full-width-page-layouts.md
-[Add custom logic to content types]: add-custom-logic.md
-[Roadmap and Known Issues]: roadmap.md
-[How to create custom PageBuilder content type container]: how-to-create-custom-content-type-container.md
+[Introduction]: docs/introduction.md
+[Installation guide]: docs/install.md
+[Developer documentation]: docs/developer-documentation.md
+[Roadmap and Known Issues]: docs/roadmap.md
+[How to create custom PageBuilder content type container]: docs/how-to-create-custom-content-type-container.md
+<!--{% endcomment %}-->
 
+<!-- {% raw %} -->
 ## Overview
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
@@ -67,8 +48,8 @@ The Magento 2 development team will review all issues and contributions submitte
 
 If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
 
-1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) on GitHub (open or closed) and [list of known issues](roadmap.md#Known Issues) on our roadmap for similar proposals of intended contribution before starting work on a new contribution.
-2. Please contact us in Slack chanel if you want to work on issue from [list of known issues](roadmap.md#Known Issues).
+1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) on GitHub (open or closed) and [list of known issues](docs/roadmap.md#Known Issues) on our roadmap for similar proposals of intended contribution before starting work on a new contribution.
+2. Please contact us in Slack chanel if you want to work on issue from [list of known issues](docs/roadmap.md#Known Issues).
 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
 4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request). Instructions written for `https://github.com/magento/magento2` repository, but they also apply to `https://github.com/magento/magento2-page-builder`.
@@ -78,3 +59,5 @@ If you are a new GitHub user, we recommend that you create your own [free github
 
 Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
 The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).
+
+<!-- {% endraw %} -->

README.md

@@ -1,5 +1,7 @@
 # magento2-page-builder
 
+<!-- {% raw %} -->
+
 ## PageBuilder Early Access Program
 
 The PageBuilder Early Access Program (EAP) gives partners the following perks:
@@ -18,8 +20,8 @@ We offer two methods for installing PageBuilder:
 * As a [Composer package] - use this option if you do not plan to contribute to the PageBuilder code repository 
 * Using the [GitHub repository] - use this option to install PageBuilder from the GitHub repository and contribute to the code 
 
-[Composer package]: app/code/Magento/PageBuilder/docs/install.md#composer-installation
-[GitHub repository]: app/code/Magento/PageBuilder/docs/install.md#github-installation
+[Composer package]: docs/install.md#composer-installation
+[GitHub repository]: docs/install.md#github-installation
 
 ## Developer documentation
 
@@ -39,19 +41,19 @@ This project repository contains PageBuilder developer documentation on the foll
 1. [Visual select]
 1. [Custom Toolbar]
 
-[Architecture overview]: app/code/Magento/PageBuilder/docs/architecture-overview.md
-[BlueFoot to PageBuilder data migration]: app/code/Magento/PageBuilder/docs/bluefoot-data-migration.md
-[Third-party content type migration]: app/code/Magento/PageBuilder/docs/new-content-type-example.md
-[Iconography]: app/code/Magento/PageBuilder/docs/iconography.md
-[Module integration]: app/code/Magento/PageBuilder/docs/module-integration.md
-[Additional data configuration]: app/code/Magento/PageBuilder/docs/custom-configuration.md
-[Content type configuration]: app/code/Magento/PageBuilder/docs/content-type-configuration.md
-[How to add a new content type]: app/code/Magento/PageBuilder/docs/how-to-add-new-content-type.md
-[Events]: app/code/Magento/PageBuilder/docs/events.md
-[Bindings]: app/code/Magento/PageBuilder/docs/bindings.md
-[Master format]: app/code/Magento/PageBuilder/docs/master-format.md
-[Visual select]: app/code/Magento/PageBuilder/docs/visual-select.md
-[Custom Toolbar]: app/code/Magento/PageBuilder/docs/toolbar.md
+[Architecture overview]: docs/architecture-overview.md
+[BlueFoot to PageBuilder data migration]: docs/bluefoot-data-migration.md
+[Third-party content type migration]: docs/new-content-type-example.md
+[Iconography]: docs/iconography.md
+[Module integration]: docs/module-integration.md
+[Additional data configuration]: docs/custom-configuration.md
+[Content type configuration]: docs/content-type-configuration.md
+[How to add a new content type]: docs/how-to-add-new-content-type.md
+[Events]: docs/events.md
+[Bindings]: docs/bindings.md
+[Master format]: docs/master-format.md
+[Visual select]: docs/visual-select.md
+[Custom Toolbar]: docs/toolbar.md
 
 ## Contribute to PageBuilder
 
@@ -60,9 +62,9 @@ A good place to start is by looking at our [features roadmap] and list of [known
 
 If you are interested in contributing to this repository, please see our [Contribution Guide].
 
-[Contribution Guide]: app/code/Magento/PageBuilder/docs/CONTRIBUTING.md
-[features roadmap]: app/code/Magento/PageBuilder/docs/roadmap.md#planned-features-and-functionality
-[known issues]: app/code/Magento/PageBuilder/docs/roadmap.md#known-issues
+[Contribution Guide]: CONTRIBUTING.md
+[features roadmap]: docs/roadmap.md#planned-features-and-functionality
+[known issues]: docs/roadmap.md#known-issues
 
 ## PageBuilder updates from the Magento core team
 
@@ -71,7 +73,7 @@ The PageBuilder team updates the code every 2 weeks.
 
 To help you prepare for these changes, we are publishing a [roadmap] of features and issues that we are going to work on in the following months.
 
-[roadmap]: app/code/Magento/PageBuilder/docs/roadmap.md
+[roadmap]: docs/roadmap.md
 
 ## Provide feedback
 
@@ -86,4 +88,6 @@ To participate in technical discussions and ask questions, join us in [Slack].
 For all other questions or requests, contact [Olena Tkacheva].
 
 [Slack]: https://magentocommeng.slack.com/
-[Olena Tkacheva]: https://magentocommeng.slack.com/messages/@UAFV915FB
+[Olena Tkacheva]: https://magentocommeng.slack.com/messages/@UAFV915FB
+
+<!-- {% endraw %} -->

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup.xml

@@ -19,6 +19,23 @@
         <fillField selector="{{AdvancedForm.advancedMarginBottom}}" userInput="{{property.marginBottom}}" stepKey="fillMarginBottomField"/>
         <click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
     </actionGroup>
+    <actionGroup name="fillSlideOutPanelSingleFieldMarginsOrPadding">
+        <arguments>
+            <argument name="field" type="string"/>
+            <argument name="value" type="string"/>
+        </arguments>
+        <waitForElement selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" stepKey="waitForElement"/>
+        <fillField selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" userInput="{{value}}" stepKey="fillFieldMarginOrPadding"/>
+    </actionGroup>
+    <actionGroup name="validateMarginsOrPaddingError">
+        <arguments>
+            <argument name="property"/>
+            <argument name="errorMessage" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="waitForSectionChangedIcon"/>
+        <seeElement selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="seeElementSectionChangedIcon"/>
+        <see userInput="{{errorMessage}}" selector="{{AdvancedForm.advancedMarginAndPaddingErrorMessage}}" stepKey="seeErrorMessage"/>
+    </actionGroup>
     <actionGroup name="fillSlideOutPanelFieldPadding">
         <arguments>
             <argument name="property" defaultValue=""/>