Skip to content

Commit 2e9e30c

Browse files
davemacaulaydavemacaulay
committed
Merge branch '1.1-develop' into MC-16152
2 parents 7f60c51 + 9e20be3 commit 2e9e30c

36 files changed

+778
-645
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,6 +1948,9 @@
19481948
<group value="pagebuilder-image"/>
19491949
<group value="pagebuilder-banner"/>
19501950
<group value="pagebuilder-bannerCommon"/>
1951+
<skip>
1952+
<issueId value="MC-19863"/>
1953+
</skip>
19511954
</annotations>
19521955
<before>
19531956
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
// Source -> Inline WYSIWYG
88
// _____________________________________________
99

10+
._keyfocus {
11+
.inline-wysiwyg {
12+
&:focus {
13+
box-shadow: none;
14+
}
15+
}
16+
}
17+
1018
.inline-wysiwyg {
1119
.magento-placeholder {
1220
height: auto;

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,23 @@
77
// Default appearance styles
88
// _____________________________________________
99

10+
._keyfocus {
11+
[data-content-type='heading'] {
12+
&:focus {
13+
box-shadow: none;
14+
}
15+
}
16+
}
17+
1018
.pagebuilder-heading {
1119
&.pagebuilder-content-type {
1220
display: block;
21+
22+
&:focus {
23+
box-shadow: none;
24+
}
1325
}
26+
1427
> div {
1528
margin: 0;
1629
padding: 0;

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/_icons.less

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,53 @@
99
font-weight: normal;
1010
src: url('@{icons-pagebuilder__font-path}.eot');
1111
src: url('@{icons-pagebuilder__font-path}.eot?#iefix') format('embedded-opentype'),
12-
url('@{icons-pagebuilder__font-path}.woff') format('woff'),
13-
url('@{icons-pagebuilder__font-path}.ttf') format('truetype');
12+
url('@{icons-pagebuilder__font-path}.woff') format('woff'),
13+
url('@{icons-pagebuilder__font-path}.ttf') format('truetype');
1414
}
1515

16-
.pagebuilder-icon {
17-
font-family: @icons-pagebuilder__font-name;
18-
-webkit-font-smoothing: antialiased;
19-
font-style: normal;
20-
font-weight: normal;
21-
line-height: 1;
22-
speak: none;
23-
}
16+
//
17+
// Common
18+
// _____________________________________________
2419

25-
[class^='pagebuilder-icon-']:before,
26-
[class*=' pagebuilder-icon-']:before {
27-
display: inline-block;
28-
font-family: @icons-pagebuilder__font-name;
29-
-webkit-font-smoothing: antialiased;
30-
-moz-osx-font-smoothing: grayscale;
31-
font-style: normal;
32-
font-weight: normal;
33-
line-height: 1;
34-
speak: none;
35-
text-decoration: inherit;
36-
text-rendering: auto;
37-
text-transform: none;
38-
vertical-align: middle;
39-
}
20+
& when (@media-common = true) {
21+
.pagebuilder-icon {
22+
-webkit-font-smoothing: antialiased;
23+
font-family: @icons-pagebuilder__font-name;
24+
font-style: normal;
25+
font-weight: normal;
26+
line-height: 1;
27+
speak: none;
28+
}
4029

41-
.pagebuilder-icon-down:before {
42-
content: @icon-pagebuilder-caret-down__content;
43-
}
30+
[class^='pagebuilder-icon-']:before,
31+
[class*=' pagebuilder-icon-']:before {
32+
-moz-osx-font-smoothing: grayscale;
33+
-webkit-font-smoothing: antialiased;
34+
display: inline-block;
35+
font-family: @icons-pagebuilder__font-name;
36+
font-style: normal;
37+
font-weight: normal;
38+
line-height: 1;
39+
speak: none;
40+
text-decoration: inherit;
41+
text-rendering: auto;
42+
text-transform: none;
43+
vertical-align: middle;
44+
}
4445

45-
.pagebuilder-icon-next:before {
46-
content: @icon-pagebuilder-caret-next__content;
47-
}
46+
.pagebuilder-icon-down:before {
47+
content: @icon-pagebuilder-caret-down__content;
48+
}
4849

49-
.pagebuilder-icon-prev:before {
50-
content: @icon-pagebuilder-caret-prev__content;
51-
}
50+
.pagebuilder-icon-next:before {
51+
content: @icon-pagebuilder-caret-next__content;
52+
}
53+
54+
.pagebuilder-icon-prev:before {
55+
content: @icon-pagebuilder-caret-prev__content;
56+
}
5257

53-
.pagebuilder-icon-up:before {
54-
content: @icon-pagebuilder-caret-up__content;
58+
.pagebuilder-icon-up:before {
59+
content: @icon-pagebuilder-caret-up__content;
60+
}
5561
}

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/_layout.less

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,49 @@
77
// Product -- Full Width
88
// _____________________________________________
99

10-
.product-full-width-section {
11-
padding: .5em 0;
10+
& when (@media-common = true) {
11+
.product-full-width-section {
12+
padding: .5em 0;
1213

13-
.block.review-add {
14-
margin-top: 2.7rem;
14+
.block.review-add {
15+
margin-top: 2.7rem;
16+
}
1517
}
16-
}
1718

18-
.page-layout-product-full-width {
19-
.block.related {
20-
margin-top: 2.7rem;
19+
.page-layout-product-full-width {
20+
.block.related {
21+
margin-top: 2.7rem;
22+
}
2123
}
22-
}
23-
24-
.page-main-details .product-section-title {
25-
border-bottom: 1px solid @color-gray-middle2;
26-
margin-bottom: 15px;
27-
padding-bottom: 12px;
28-
}
2924

30-
.additional-attributes-wrapper .additional-attributes {
31-
border: none;
32-
width: auto;
25+
.page-main-details .product-section-title {
26+
border-bottom: 1px solid @color-gray-middle2;
27+
margin-bottom: 15px;
28+
padding-bottom: 12px;
29+
}
3330

34-
> tbody > tr {
35-
> th {
36-
border: none;
37-
padding: 5.5px 30px 10px 0;
38-
}
39-
> td {
40-
border: none;
41-
padding: 5.5px 5px 10px;
31+
.additional-attributes-wrapper .additional-attributes {
32+
border: none;
33+
width: auto;
34+
35+
> tbody > tr {
36+
> th {
37+
border: none;
38+
padding: 5.5px 30px 10px 0;
39+
}
40+
> td {
41+
border: none;
42+
padding: 5.5px 5px 10px;
43+
}
4244
}
4345
}
4446
}
45-
4647
//
4748
// Page -- Full Width
4849
// _____________________________________________
4950

50-
.cms-index-index.page-layout-cms-full-width .nav-sections {
51-
margin-bottom: 0;
51+
& when (@media-common = true) {
52+
.cms-index-index.page-layout-cms-full-width .nav-sections {
53+
margin-bottom: 0;
54+
}
5255
}

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/_module.less

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,58 @@
1616
@import 'slick/_slick.less';
1717
@import 'content-type/_import.less';
1818

19-
.cms-content-important {
20-
background-color: @color-white-smoke;
21-
color: @color-gray20;
22-
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
23-
font-size: 22px;
24-
font-style: normal;
25-
font-weight: 300;
26-
line-height: 1.1;
27-
margin: 0 0 35px -20px;
28-
padding: 20px;
29-
}
19+
//
20+
// Common
21+
// _____________________________________________
3022

31-
.pagebuilder-full-width {
32-
float: left;
33-
width: 100%;
34-
}
23+
& when (@media-common = true) {
24+
.cms-content-important {
25+
background-color: @color-white-smoke;
26+
color: @color-gray20;
27+
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
28+
font-size: 22px;
29+
font-style: normal;
30+
font-weight: 300;
31+
line-height: 1.1;
32+
margin: 0 0 35px -20px;
33+
padding: 20px;
34+
}
3535

36-
.pagebuilder-content-type {
37-
box-sizing: border-box;
38-
margin-bottom: 20px;
39-
}
36+
.pagebuilder-full-width {
37+
float: left;
38+
width: 100%;
39+
}
4040

41-
//
42-
// styles for legacy content types
43-
// _____________________________________________
41+
.pagebuilder-content-type {
42+
box-sizing: border-box;
43+
margin-bottom: 20px;
44+
}
4445

45-
.pagebuilder-accordion {
46-
.lib-data-accordion();
46+
//
47+
// Styles for legacy content types
48+
// ---------------------------------------------
49+
50+
.pagebuilder-accordion {
51+
.lib-data-accordion();
52+
}
4753
}
4854

4955
//
50-
// Responsive Classes
56+
// Mobile (style-m.css)
5157
// _____________________________________________
5258

53-
@media all and (min-width: (@screen__m + 1)) {
54-
.pagebuilder-mobile-only {
59+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
60+
.pagebuilder-mobile-hidden {
5561
display: none !important;
5662
}
5763
}
5864

59-
@media all and (max-width: @screen__m) {
60-
.pagebuilder-mobile-hidden {
65+
//
66+
// Desktop (style-l.css)
67+
// _____________________________________________
68+
69+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = (@screen__m + 1)) {
70+
.pagebuilder-mobile-only {
6171
display: none !important;
6272
}
6373
}
64-

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-center.less

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
// Collage center appearance styles
88
// _____________________________________________
99

10-
[data-appearance='collage-centered'] {
11-
.pagebuilder-banner-wrapper {
12-
.pagebuilder-overlay {
13-
margin-left: auto;
14-
margin-right: auto;
10+
& when (@media-common = true) {
11+
[data-appearance='collage-centered'] {
12+
.pagebuilder-banner-wrapper {
13+
.pagebuilder-overlay {
14+
margin-left: auto;
15+
margin-right: auto;
16+
}
1517
}
1618
}
1719
}

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-left.less

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
// Collage left appearance styles
88
// _____________________________________________
99

10-
[data-appearance='collage-left'] {
11-
.pagebuilder-banner-wrapper {
12-
.pagebuilder-overlay {
13-
margin-right: auto;
10+
& when (@media-common = true) {
11+
[data-appearance='collage-left'] {
12+
.pagebuilder-banner-wrapper {
13+
.pagebuilder-overlay {
14+
margin-right: auto;
15+
}
1416
}
1517
}
1618
}

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-right.less

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
// Collage right appearance styles
88
// _____________________________________________
99

10-
[data-appearance='collage-right'] {
11-
.pagebuilder-banner-wrapper {
12-
.pagebuilder-overlay {
13-
margin-left: auto;
10+
& when (@media-common = true) {
11+
[data-appearance='collage-right'] {
12+
.pagebuilder-banner-wrapper {
13+
.pagebuilder-overlay {
14+
margin-left: auto;
15+
}
1416
}
1517
}
1618
}

0 commit comments

Comments
 (0)