Skip to content

Commit ad95995

Browse files
Merge branch 'viewport-switcher' of github.com:magento/magento2-page-builder into 636-responsive-breakpoint-switcher
Conflicts: app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html
2 parents 5ec90ea + 073b3ee commit ad95995

File tree

6 files changed

+61
-13
lines changed

6 files changed

+61
-13
lines changed

app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
4242
* @param ViewConfigInterface $viewConfig
4343
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
4444
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
45+
* @SuppressWarnings(PHPMD.NPathComplexity)
4546
* @throws \Magento\Framework\Exception\NoSuchEntityException
4647
*/
4748
public function __construct(
@@ -90,7 +91,7 @@ public function __construct(
9091
$wysiwygConfigData['viewports'] = $viewConfig->getViewConfig()->getVarValue(
9192
'Magento_PageBuilder',
9293
'breakpoints'
93-
);;
94+
);
9495

9596
if ($overrideSnapshot) {
9697
$pageBuilderConfig = $pageBuilderConfig ?: ObjectManager::getInstance()->get(PageBuilderConfig::class);

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@
3232
right: 0;
3333
transform: translate(0, 12%);
3434
}
35+
36+
.tooltip {
37+
margin-left: 0;
38+
.tooltip-content {
39+
background: rgba(49, 48, 43, .8);
40+
font-size: 12px;
41+
padding: 7px 9px;
42+
text-align: left;
43+
44+
&:before {
45+
opacity: .65;
46+
}
47+
48+
.tooltip-label {
49+
font-weight: bold;
50+
}
51+
}
52+
}
3553
}
3654

3755
.admin__fieldset > .admin__field > .admin__control-grouped {

app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder.js

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,7 @@
1313
css="visible: panel.isVisible(), 'transition-out': isSnapshotTransition()"
1414
if="!isSnapshot()">
1515
<span class="viewport-buttons">
16-
<each args="data: Object.keys(viewports), as: 'name'">
17-
<button type="button"
18-
class="page-builder-viewport"
19-
css="$parent.viewports[name].button"
20-
disable="name === $parent.viewport()"
21-
click="$parent.toggleViewport.bind($parent, name)">
22-
<img data-bind="attr:{src: require.toUrl($parent.viewports[name].icon)}" draggable="false" aria-hidden="true"/>
23-
</button>
24-
</each>
16+
<render args="viewportTemplate"/>
2517
</span>
2618
<span class="template-buttons">
2719
<button type="button" translate="'Apply Template'" if="isAllowedTemplateApply" click="toggleTemplateManger"/>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!--
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<each args="data: Object.keys(viewports), as: 'name'">
8+
<span class="tooltip">
9+
<button type="button"
10+
class="page-builder-viewport"
11+
css="$parent.viewports[name].button"
12+
disable="name === $parent.viewport()"
13+
click="$parent.toggleViewport.bind($parent, name)">
14+
<img data-bind="attr:{src: require.toUrl($parent.viewports[name].icon)}" draggable="false" aria-hidden="true"/>
15+
</button>
16+
<span class="tooltip-content">
17+
<span class="tooltip-label" translate="$parent.viewports[name].label"/><br/>
18+
<span translate="'View your content for '"/><text args="name"/><br/>
19+
<span translate="'Width'"/>: <text args="Object.values($parent.viewports[name].conditions)[0]"/>
20+
</span>
21+
</span>
22+
</each>

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ export default class PageBuilder implements PageBuilderInterface {
223223
return this.template;
224224
}
225225

226+
get viewportTemplate(): string {
227+
return "Magento_PageBuilder/viewport/switcher";
228+
}
229+
226230
/**
227231
* Toggle template manager
228232
*/

0 commit comments

Comments
 (0)