Skip to content

Commit 3e53826

Browse files
committed
Merge branch '514_content-snapshot-category-admin-page' into 511_content-snapshot-product-admin-page
2 parents 0cca85e + d2f0c47 commit 3e53826

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@
4646
}
4747
}
4848

49-
5049
//
5150
// Page Builder full width field
52-
// _____________________________________________
53-
51+
// _____________________________________________
5452

5553
.admin__fieldset {
5654
> .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option) {

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

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

66
@border-size: 2px;
7-
@wysiwyg-overlay-background: rgba(0, 120, 249, 0.08);
8-
@wysiwyg-overlay-border: #4181E4;
7+
@wysiwyg-overlay-background: #0078f9;
8+
@wysiwyg-overlay-border: #4181e4;
99

1010
.pagebuilder-header {
1111
display: none;
@@ -96,15 +96,15 @@
9696
}
9797

9898
&.visible {
99+
display: block;
99100
opacity: 1;
100101
visibility: visible;
101-
display: block;
102102
}
103103
}
104104

105105
.pagebuilder-canvas {
106-
padding-top: 30px;
107106
padding-bottom: 120px;
107+
padding-top: 30px;
108108
}
109109

110110
.pagebuilder-panel-wrapper {
@@ -163,16 +163,16 @@
163163
border-radius: 2px;
164164
cursor: pointer;
165165
display: block;
166-
height: calc(~"100% + 2px");
166+
height: calc(~'100% + 2px');
167167
transform: translateY(-2px);
168168
transition: .175s ease-in-out;
169169
visibility: visible;
170-
width: calc(~"100% + 2px");
170+
width: calc(~'100% + 2px');
171171
z-index: @z-index-2;
172172
}
173173

174174
&._hover {
175-
background-color: @wysiwyg-overlay-background;
175+
background-color: fade(@wysiwyg-overlay-background, 8%);
176176
border-color: @wysiwyg-overlay-border;
177177
transform: translateY(0);
178178
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
.pagebuilder-panel-wrapper {
5050
-moz-transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
5151
-webkit-transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
52+
display: none;
5253
float: left;
5354
opacity: 0;
5455
position: relative;
@@ -58,16 +59,16 @@
5859
transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
5960
visibility: hidden;
6061
width: 150px;
61-
display: none;
6262

6363
&.no-position-sticky {
6464
top: 0;
6565
}
6666

6767
&.visible {
68+
display: block;
6869
opacity: 1;
6970
visibility: visible;
70-
display: block;
71+
z-index: 1;
7172

7273
&.sticky-top {
7374
position: fixed;

0 commit comments

Comments
 (0)