Merge remote-tracking branch 'origin/MC-1416' into MC-1416

danmooney2 · danmooney2 · commit 04fbe340b1c3 · 2018-08-02T09:54:50.000-05:00
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less
@@ -10,7 +10,9 @@
 .inline-wysiwyg {
     .magento-placeholder {
         height: auto;
+        margin: 5px;
         min-height: 20px;
+        vertical-align: baseline;
     }
     &.mce-edit-focus {
         outline: none;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less
@@ -18,10 +18,6 @@
                 margin: 0 0 @margin 0;
             }
         }
-        p {
-            margin-bottom: 0;
-            padding-bottom: @margin;
-        }
         .mce-tinymce-inline {
             left: -2px !important;
             right: -2px;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/tabs/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/tabs/preview.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts
@@ -49,7 +49,6 @@ export default class Preview extends PreviewCollection {
             }
             $(this.element).tabs({
                 create: (event: Event, ui: JQueryUI.TabsCreateOrLoadUIParams) => {
-                    this.$activeTabPositioner = $(this.element).find('.active-tab-positioner');
                     this.setFocusedTab(activeTabIndex || 0);
                 },
             });

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,6 @@`
`18`	`18`	`margin: 0 0 @margin 0;`
`19`	`19`	`}`
`20`	`20`	`}`
`21`		`- p {`
`22`		`- margin-bottom: 0;`
`23`		`- padding-bottom: @margin;`
`24`		`- }`
`25`	`21`	`.mce-tinymce-inline {`
`26`	`22`	`left: -2px !important;`
`27`	`23`	`right: -2px;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ export default class Preview extends PreviewCollection {`
`49`	`49`	`}`
`50`	`50`	`$(this.element).tabs({`
`51`	`51`	`create: (event: Event, ui: JQueryUI.TabsCreateOrLoadUIParams) => {`
`52`		`- this.$activeTabPositioner = $(this.element).find('.active-tab-positioner');`
`53`	`52`	`this.setFocusedTab(activeTabIndex \|\| 0);`
`54`	`53`	`},`
`55`	`54`	`});`