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

…page-builder into develop
mage-os · Jan 3, 2025 · 9463582 · 9463582
2 parents 973aa7f + 1a52ef4
commit 9463582
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/...PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml b/...PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2020 Adobe
+  * All Rights Reserved.
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -12,11 +12,11 @@
         <element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
         <element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
         <element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
-        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
+        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='Browse links']"/>
         <element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
         <element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
         <element name="targetInput" type="input" selector="button[title='Open link in...']"/>
-        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
+        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
         <element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
     </section>
 </sections>
diff --git a/...Builder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml b/...Builder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2020 Adobe
+  * All Rights Reserved.
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -43,7 +43,7 @@
         <element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
         <element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
         <element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
-        <element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
+        <element name="imageSelectorBrowse" type="button" selector="button[title='Browse files']"/>
         <element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
         <element name="formatOption" type="text" parameterized="true" selector="div[title='{{label}}']"/>
         <element name="HeadSelector" type="text" selector="div[title='Headings']"/>

diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2021 Adobe
+  * All Rights Reserved.
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="TinyMCESection">
-        <element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
+        <element name="Style" type="button" selector="button[title='Format Paragraph']"/>
     </section>
 </sections>
diff --git a/...Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less b/...Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -24,12 +24,6 @@
         box-sizing: border-box;
         width: 100%;
 
-        &.no-column-line {
-            .element-children {
-                display: flex;
-            }
-        }
-
         .drop-placeholder {
             background: @color-red-berry;
             bottom: 0;