Merge branch 'cms-team-2-sprint-15' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-2-sprint-15

Author: krissyhiserote

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

@@ -9,6 +9,7 @@
 
 .pagebuilder-banner {
     background-color: @color-gray98;
+    cursor: text;
 
     .pagebuilder-overlay {
         -moz-transition: background-color 500ms ease;
@@ -36,7 +37,7 @@
         position: relative;
 
         &.pagebuilder-toolbar-active {
-            border: 1px solid @color-gray80;
+            box-shadow: 0 0 0 1px @color-gray80;
         }
         .mce-tinymce-inline {
             left: 0;

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/preview.html

@@ -7,7 +7,7 @@
 
 <div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
     <render args="getOptions().template" />
-    <div class="pagebuilder-banner-wrapper" css="data.desktop_image.css" attr="data.desktop_image.attributes" ko-style="Object.assign({}, data.desktop_image.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})" event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
+    <div class="pagebuilder-banner-wrapper" css="data.desktop_image.css" attr="data.desktop_image.attributes" ko-style="Object.assign({}, data.desktop_image.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})" event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor }">
         <div class="pagebuilder-overlay" css="data.overlay.css" attr="data.overlay.attributes" ko-style="data.overlay.style">
             <scope args="getUploader().getUiComponent()">
                 <render />

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/preview.html

@@ -7,7 +7,7 @@
 
 <div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
     <render args="getOptions().template" />
-    <div class="pagebuilder-banner-wrapper" attr="data.desktop_image.attributes" ko-style="Object.assign({}, data.desktop_image.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})" css="data.desktop_image.css" event="{ mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper }">
+    <div class="pagebuilder-banner-wrapper" attr="data.desktop_image.attributes" ko-style="Object.assign({}, data.desktop_image.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})" css="data.desktop_image.css" event="{ mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor }">
         <div class="pagebuilder-overlay" css="data.overlay.css" attr="data.overlay.attributes" ko-style="data.overlay.style">
             <scope args="getUploader().getUiComponent()">
                 <render />

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/preview.html

@@ -7,7 +7,7 @@
 
 <div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
     <render args="getOptions().template" />
-    <div class="pagebuilder-banner-wrapper" attr="data.desktop_image.attributes" ko-style="Object.assign({}, data.desktop_image.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})" css="data.desktop_image.css" event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
+    <div class="pagebuilder-banner-wrapper" attr="data.desktop_image.attributes" ko-style="Object.assign({}, data.desktop_image.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})" css="data.desktop_image.css" event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor }">
         <div class="pagebuilder-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css">
             <scope args="getUploader().getUiComponent()">
                 <render />

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/preview.html

@@ -8,11 +8,11 @@
 <div class="pagebuilder-content-type pagebuilder-banner type-nested" attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
     <render args="getOptions().template" />
     <div class="pagebuilder-banner-wrapper" attr="data.desktop_image.attributes" ko-style="data.desktop_image.style" css="data.desktop_image.css" event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
-        <div class="pagebuilder-overlay pagebuilder-poster-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css">
+        <div class="pagebuilder-overlay pagebuilder-poster-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css" event="mousedown: activateEditor">
             <scope args="getUploader().getUiComponent()">
                 <render />
             </scope>
-            <div class="pagebuilder-poster-content" event="mousedown: activateEditor">
+            <div class="pagebuilder-poster-content">
                 <div class="pagebuilder-banner-text-content">
                     <div if="isWysiwygSupported()" class="inline-wysiwyg" ko-style="data.content.style" css="data.content.css" attr="data.content.attributes" afterRender="initWysiwyg" event="mousedown: stopEvent">
                         <div html="data.content.html" />