Skip to content

Commit 83e5a05

Browse files
yolouieseyolouiese
committed
#636: Responsive breakpoint switcher - applied requested changes
1 parent ad95995 commit 83e5a05

File tree

24 files changed

+498
-57
lines changed

24 files changed

+498
-57
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use Magento\Framework\App\ObjectManager;
1111
use Magento\Framework\Data\FormFactory;
12+
use Magento\Framework\View\Asset\Repository;
1213
use Magento\Framework\View\Element\UiComponent\ContextInterface;
1314
use Magento\Ui\Component\Wysiwyg\ConfigInterface;
1415
use Magento\Catalog\Api\CategoryAttributeRepositoryInterface;
@@ -30,6 +31,7 @@ class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
3031
*
3132
* @param ContextInterface $context
3233
* @param FormFactory $formFactory
34+
* @param Repository $assetRepo
3335
* @param ConfigInterface $wysiwygConfig
3436
* @param CategoryAttributeRepositoryInterface $attrRepository
3537
* @param PageBuilderState $pageBuilderState
@@ -48,6 +50,7 @@ class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
4850
public function __construct(
4951
ContextInterface $context,
5052
FormFactory $formFactory,
53+
Repository $assetRepo,
5154
ConfigInterface $wysiwygConfig,
5255
CategoryAttributeRepositoryInterface $attrRepository,
5356
PageBuilderState $pageBuilderState,
@@ -92,6 +95,12 @@ public function __construct(
9295
'Magento_PageBuilder',
9396
'breakpoints'
9497
);
98+
$wysiwygConfigData['viewports']['desktop']['icon'] = $assetRepo->getUrl(
99+
$wysiwygConfigData['viewports']['desktop']['icon']
100+
);
101+
$wysiwygConfigData['viewports']['mobile']['icon'] = $assetRepo->getUrl(
102+
$wysiwygConfigData['viewports']['mobile']['icon']
103+
);
95104

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

‎app/code/Magento/PageBuilder/etc/view.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<var name="label">Desktop</var>
2929
<var name="stage">true</var>
3030
<var name="default">true</var>
31-
<var name="button">desktop-button</var>
32-
<var name="icon">Magento_PageBuilder/css/images/switcher/switcher-desktop.svg</var>
31+
<var name="class">desktop-switcher</var>
32+
<var name="icon">Magento_PageBuilder::css/images/switcher/switcher-desktop.svg</var>
3333
<var name="conditions">
3434
<var name="min-width">1024px</var>
3535
</var>
@@ -60,8 +60,8 @@
6060
<var name="mobile">
6161
<var name="label">Mobile</var>
6262
<var name="stage">true</var>
63-
<var name="button">mobile-button</var>
64-
<var name="icon">Magento_PageBuilder/css/images/switcher/switcher-mobile.svg</var>
63+
<var name="class">mobile-switcher</var>
64+
<var name="icon">Magento_PageBuilder::css/images/switcher/switcher-mobile.svg</var>
6565
<var name="conditions">
6666
<var name="max-width">768px</var>
6767
<var name="min-width">640px</var>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_buttons.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
width: 30px;
6565
}
6666

67-
&.desktop-button {
67+
&.desktop-switcher {
6868
margin-right: -3px;
6969
}
7070
}

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,3 @@
166166
}
167167
}
168168
}
169-
170-
//
171-
// Default appearance styles rendered through Mobile viewport
172-
// _____________________________________________________
173-
.mobile-viewport {
174-
.pagebuilder-banner-wrapper {
175-
.pagebuilder-overlay:not(.pagebuilder-poster-overlay) {
176-
max-width: none;
177-
}
178-
}
179-
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
@import './_poster.less';
1212
@import './_collage-center';
1313
@import './_collage-right.less';
14+
@import './_mobile.less';

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// /**
2+
// * Copyright © Magento, Inc. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Default appearance styles rendered through Mobile viewport
8+
// _____________________________________________________
9+
.mobile-viewport {
10+
.pagebuilder-banner-wrapper {
11+
.pagebuilder-overlay:not(.pagebuilder-poster-overlay) {
12+
max-width: none;
13+
}
14+
}
15+
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -396,20 +396,3 @@
396396
box-shadow: 0 0 0 1px rgba(153, 153, 153, 0);
397397
}
398398
}
399-
400-
//
401-
// Default appearance styles rendered through Mobile viewport
402-
// _____________________________________________________
403-
.mobile-viewport {
404-
.pagebuilder-content-type {
405-
.pagebuilder-column-group {
406-
> .element-children {
407-
display: block;
408-
}
409-
}
410-
411-
&.children-min-height.pagebuilder-column {
412-
width: 100% !important;
413-
}
414-
}
415-
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_import.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
// _____________________________________________
99

1010
@import './_default.less';
11+
@import './_mobile.less';

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_mobile.less

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// /**
2+
// * Copyright © Magento, Inc. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Default appearance styles rendered through Mobile viewport
8+
// _____________________________________________________
9+
.mobile-viewport {
10+
.pagebuilder-content-type {
11+
.pagebuilder-column-group {
12+
> .element-children {
13+
display: block;
14+
}
15+
}
16+
17+
&.children-min-height.pagebuilder-column {
18+
width: 100% !important;
19+
}
20+
}
21+
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_import.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
// _____________________________________________
99

1010
@import './_default.less';
11+
@import './_mobile.less';

0 commit comments

Comments
 (0)