Skip to content

Commit 0456eef

Browse files
committed
Merge branch '2.3-develop' into MAGETWO-86867-cleanup
# Conflicts: # app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_default.less # app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less
2 parents c469a0e + 3a35732 commit 0456eef

File tree

88 files changed

+4963
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+4963
-1550
lines changed

app/code/Magento/PageBuilder/docs/content-type-configuration.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,3 +470,9 @@ define([], function () {
470470
return EmptyMobileImage;
471471
});
472472
```
473+
474+
## Preview component settings
475+
476+
| Property | Description | Example |
477+
| ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | -------------- |
478+
|`fieldsToIgnoreOnRemove`| array containing field names to ignore when evaluating whether an element has been configured. The default value is an empty array. | `["tab_name"]` |
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
//
7+
// Default appearance styles
8+
// _____________________________________________
9+
10+
.pagebuilder-content-type {
11+
&.tab-align-left {
12+
.pagebuilder-tab-item {
13+
border-top-left-radius: 0 !important;
14+
}
15+
}
16+
&.tab-align-right {
17+
.pagebuilder-tab-item {
18+
border-top-right-radius: 0 !important;
19+
}
20+
}
21+
&.pagebuilder-tab-item {
22+
min-height: inherit;
23+
24+
&.empty-container {
25+
min-height: 220px;
26+
}
27+
28+
> .element-children {
29+
min-height: inherit;
30+
padding: 0;
31+
}
32+
}
33+
}

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

Lines changed: 78 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,6 @@
88
// _____________________________________________
99

1010
.pagebuilder-content-type.pagebuilder-tabs {
11-
12-
.tabs-content {
13-
border: @entityBorderWidth solid #ccc;
14-
overflow: hidden;
15-
position: relative;
16-
z-index: 9;
17-
18-
> .element-children {
19-
min-height: inherit;
20-
padding: 0;
21-
}
22-
23-
.pagebuilder-content-type.pagebuilder-tab {
24-
min-height: inherit;
25-
26-
&.empty-container {
27-
min-height: 220px;
28-
}
29-
30-
> .element-children {
31-
min-height: inherit;
32-
padding: 0;
33-
}
34-
}
35-
}
36-
3711
.tabs-navigation {
3812
display: block;
3913
font-size: 0;
@@ -75,6 +49,64 @@
7549
&:hover {
7650
text-decoration: none;
7751
}
52+
53+
.tab-drag-handle {
54+
height: 100%;
55+
left: 2px;
56+
opacity: 0;
57+
position: absolute;
58+
top: 0;
59+
transition: all .3s;
60+
visibility: hidden;
61+
width: 14px;
62+
63+
&.disabled:before {
64+
color: @color-light-gray;
65+
cursor: not-allowed;
66+
}
67+
68+
&.disabled:active:before {
69+
cursor: not-allowed;
70+
}
71+
72+
&:before {
73+
.abs-icon;
74+
color: @color-dark-gray0;
75+
content: @icon-gripper__content;
76+
display: block;
77+
font-size: 16px;
78+
position: absolute;
79+
top: 50%;
80+
transform: translateY(-50%);
81+
82+
cursor: move; /* fallback if grab cursor is unsupported */
83+
cursor: grab;
84+
cursor: -moz-grab;
85+
cursor: -webkit-grab;
86+
}
87+
88+
&:active:before {
89+
cursor: grabbing;
90+
cursor: -moz-grabbing;
91+
cursor: -webkit-grabbing;
92+
}
93+
}
94+
}
95+
96+
&.sortable-placeholder {
97+
opacity: .3;
98+
}
99+
100+
&.ui-sortable-helper {
101+
box-shadow: 0 1px 10px rgba(0, 0, 0, .3);
102+
opacity: .7;
103+
white-space: nowrap;
104+
105+
a.tab-title .tab-drag-handle:before {
106+
cursor: grabbing;
107+
cursor: -moz-grabbing;
108+
cursor: -webkit-grabbing;
109+
}
78110
}
79111

80112
&:last-child {
@@ -92,13 +124,33 @@
92124
}
93125

94126
&.focused {
127+
a.tab-title .tab-drag-handle {
128+
opacity: 1;
129+
visibility: visible;
130+
}
131+
95132
.pagebuilder-options {
96133
.pagebuilder-options-visible;
97134
}
98135
}
99136
}
100137
}
101138

139+
.tabs-content {
140+
border: 1px solid transparent;
141+
position: relative;
142+
z-index: 9;
143+
144+
> .element-children {
145+
min-height: inherit;
146+
padding: 0;
147+
148+
> .pagebuilder-content-type-wrapper:not(:first-child) {
149+
display: none;
150+
}
151+
}
152+
}
153+
102154
&.tab-align-left {
103155
.tabs-content {
104156
border-top-left-radius: 0 !important;

app/code/Magento/PageBuilder/view/adminhtml/web/js/preview-sortable.js renamed to app/code/Magento/PageBuilder/view/adminhtml/web/js/binding/sortable-children.js

Lines changed: 14 additions & 11 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/js/content-type/preview.js

Lines changed: 15 additions & 1 deletion
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/js/content-type/slider/preview.js

Lines changed: 1 addition & 1 deletion
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/js/content-type/tab-item/preview.js

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

0 commit comments

Comments
 (0)