Skip to content

Commit 1f103b3

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'MC-15083-performance-issues' into cms-team-1-delivery
2 parents c7a4996 + 3e66507 commit 1f103b3

File tree

6 files changed

+20
-29
lines changed

6 files changed

+20
-29
lines changed

‎app/code/Magento/PageBuilder/view/adminhtml/layout/editor.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
10+
<referenceContainer name="after.body.start">
11+
<block class="Magento\PageBuilder\Block\GoogleMapsApi" name="google.maps.api" template="Magento_PageBuilder::googlemaps.phtml" />
12+
<block class="Magento\PageBuilder\Block\WysiwygSetup" name="wysiwyg.setup" template="Magento_PageBuilder::wysiwyg_setup.phtml" />
13+
</referenceContainer>
1014
<block class="Magento\Framework\View\Element\Template" name="head.additional" as="head.additional" template="Magento_PageBuilder::html/container.phtml">
1115
<block class="Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill" name="pagebuilder.babel.polyfill" as="pagebuilder.babel.polyfill" template="Magento_PageBuilder::html/head/babel_polyfill.phtml"/>
1216
</block>

‎app/code/Magento/PageBuilder/view/base/templates/wysiwyg_setup.phtml renamed to ‎app/code/Magento/PageBuilder/view/adminhtml/templates/wysiwyg_setup.phtml

File renamed without changes.

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_import.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@
1010
@import '_container.less';
1111
@import '_map.less';
1212
@import '_margins-and-padding.less';
13-
@import 'tinymce.css';
1413
@import 'uploader/preview/_image.less';
1514
@import '_visual-select.less';

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/tinymce.css

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@
44
*/
55

66
@font-face {
7-
font-family: "Open Sans";
7+
font-family: 'Open Sans';
88
font-style: normal;
99
font-weight: 300;
1010
src: url('../../../../fonts/opensans/light/opensans-300.woff2') format('woff2'), url('../../../../fonts/opensans/light/opensans-300.woff') format('woff');
1111
}
1212

1313
@font-face {
14-
font-family: "Open Sans";
14+
font-family: 'Open Sans';
1515
font-style: normal;
1616
font-weight: 400;
1717
src: url('../../../../fonts/opensans/regular/opensans-400.woff2') format('woff2'), url('../../../../fonts/opensans/regular/opensans-400.woff') format('woff');
1818
}
1919

2020
@font-face {
21-
font-family: "Open Sans";
21+
font-family: 'Open Sans';
2222
font-style: normal;
2323
font-weight: 600;
2424
src: url('../../../../fonts/opensans/semibold/opensans-600.woff2') format('woff2'), url('../../../../fonts/opensans/semibold/opensans-600.woff') format('woff');
2525
}
2626

2727
@font-face {
28-
font-family: "Open Sans";
28+
font-family: 'Open Sans';
2929
font-style: normal;
3030
font-weight: 700;
3131
src: url('../../../../fonts/opensans/bold/opensans-700.woff2') format('woff2'), url('../../../../fonts/opensans/bold/opensans-700.woff') format('woff');
3232
}
3333

3434
h1 {
3535
color: #333;
36-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
36+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
3737
font-size: 40px;
3838
font-style: normal;
3939
font-weight: 300;
@@ -44,7 +44,7 @@ h1 {
4444

4545
h2 {
4646
color: #333;
47-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
47+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
4848
font-size: 26px;
4949
font-style: normal;
5050
font-weight: 300;
@@ -55,7 +55,7 @@ h2 {
5555

5656
h3 {
5757
color: #333;
58-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
58+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
5959
font-size: 18px;
6060
font-style: normal;
6161
font-weight: 600;
@@ -66,7 +66,7 @@ h3 {
6666

6767
h4 {
6868
color: #333;
69-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
69+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
7070
font-size: 14px;
7171
font-style: normal;
7272
font-weight: 700;
@@ -77,7 +77,7 @@ h4 {
7777

7878
h5 {
7979
color: #333;
80-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
80+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
8181
font-size: 12px;
8282
font-style: normal;
8383
font-weight: 700;
@@ -88,7 +88,7 @@ h5 {
8888

8989
h6 {
9090
color: #333;
91-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
91+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
9292
font-size: 10px;
9393
font-style: normal;
9494
font-weight: 700;
@@ -99,7 +99,7 @@ h6 {
9999

100100
p {
101101
color: #333;
102-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
102+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
103103
font-size: 14px;
104104
font-style: normal;
105105
font-weight: 400;
@@ -111,7 +111,7 @@ pre {
111111
background-color: #f6f6f6;
112112
border: 1px solid #ccc;
113113
color: #111;
114-
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
114+
font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
115115
font-size: 12px;
116116
font-style: normal;
117117
font-weight: 400;
@@ -123,7 +123,7 @@ pre {
123123
.cms-content-important {
124124
background-color: #f5f5f5;
125125
color: #333;
126-
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
126+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
127127
font-size: 22px;
128128
font-style: normal;
129129
font-weight: 300;

‎app/code/Magento/PageBuilder/view/base/layout/default.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/view/frontend/layout/default.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
10+
<referenceContainer name="after.body.start">
11+
<block class="Magento\PageBuilder\Block\GoogleMapsApi" name="google.maps.api" template="Magento_PageBuilder::googlemaps.phtml" />
12+
</referenceContainer>
1013
<referenceBlock name="head.components">
1114
<block class="Magento\PageBuilder\Block\WidgetInitializer" name="pagebuilder.widget.initializer" template="Magento_PageBuilder::widget_initializer.phtml" />
1215
</referenceBlock>

0 commit comments

Comments
 (0)