From 606292dc833efdda124f211488a838d9d4746110 Mon Sep 17 00:00:00 2001 From: hanna_hnida Date: Tue, 20 Oct 2020 12:07:09 +0200 Subject: [PATCH 1/5] magento/magento2-page-builder#558: Developer can style content types output differently per viewport - Added body id in Storefront, in tinymce4 in admin --- app/code/Magento/Theme/view/frontend/layout/default.xml | 1 + lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js | 1 + 2 files changed, 2 insertions(+) diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml index 8eaac4aa3e794..bf76933b356c0 100644 --- a/app/code/Magento/Theme/view/frontend/layout/default.xml +++ b/app/code/Magento/Theme/view/frontend/layout/default.xml @@ -8,6 +8,7 @@ + diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js index 4393b6c882039..7e4d4f532f8d3 100644 --- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js +++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js @@ -205,6 +205,7 @@ define([ plugins: this.config.tinymce4.plugins, toolbar: this.config.tinymce4.toolbar, adapter: this, + body_id: "html-body", /** * @param {Object} editor From 2c3b5b994dc94adfcf5051df84039f4d0eec4bc1 Mon Sep 17 00:00:00 2001 From: hanna_hnida Date: Tue, 20 Oct 2020 15:32:34 +0200 Subject: [PATCH 2/5] magento/magento2-page-builder#558: Developer can style content types output differently per viewport - Fixed quote marks --- lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js index 7e4d4f532f8d3..d74838b0c26bf 100644 --- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js +++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js @@ -205,7 +205,7 @@ define([ plugins: this.config.tinymce4.plugins, toolbar: this.config.tinymce4.toolbar, adapter: this, - body_id: "html-body", + 'body_id': 'html-body', /** * @param {Object} editor From 754eb5a168e6b2bd78b972e482988fa0b695a612 Mon Sep 17 00:00:00 2001 From: hanna_hnida Date: Tue, 20 Oct 2020 18:11:04 +0200 Subject: [PATCH 3/5] magento/magento2-page-builder#558: Developer can style content types output differently per viewport - Fixed tinymce image selector --- .../CmsNewBlockBlockActionsSection/BlockContentSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml index 1d5e8541dd497..f4e26938d9008 100644 --- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml +++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
- +
From 7683dece30de99d5df537507487e1129cd85c023 Mon Sep 17 00:00:00 2001 From: hanna_hnida Date: Tue, 20 Oct 2020 18:12:21 +0200 Subject: [PATCH 4/5] magento/magento2-page-builder#558: Developer can style content types output differently per viewport - Fixed tinymce image selector --- .../CmsNewBlockBlockActionsSection/BlockContentSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml index 1d5e8541dd497..f4e26938d9008 100644 --- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml +++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
- +
From 0ab061a5da09ba5fc95a6cd3a1d87454c1f2a8d0 Mon Sep 17 00:00:00 2001 From: hanna_hnida Date: Tue, 20 Oct 2020 18:15:23 +0200 Subject: [PATCH 5/5] Revert "magento/magento2-page-builder#558: Developer can style content types output differently per viewport - Fixed tinymce image selector" This reverts commit 754eb5a168e6b2bd78b972e482988fa0b695a612. --- .../CmsNewBlockBlockActionsSection/BlockContentSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml index f4e26938d9008..1d5e8541dd497 100644 --- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml +++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
- +