Skip to content

Commit 0d9b4cc

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-43083' into PR-2
2 parents d0e6a1b + 27216c0 commit 0d9b4cc

File tree

6 files changed

+141
-284
lines changed

6 files changed

+141
-284
lines changed

‎app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,72 @@
44
// */
55

66
//
7-
// Common
8-
//--------------------------------------
7+
// Common
8+
// _____________________________________________
99

1010
& when (@media-common = true) {
1111

12-
.map-popup-wrapper {
13-
&.popup {
14-
.action {
15-
&.close {
16-
.lib-css(top, @popup-button-close__position-top);
12+
.map-popup-wrapper {
13+
&.popup {
14+
.action {
15+
&.close {
16+
.lib-css(top, @popup-button-close__position-top);
17+
}
1718
}
1819
}
1920
}
20-
}
2121

22-
.map-popup {
23-
.lib-popup(
24-
@_popup-margin-top: @indent__s,
25-
@_popup-margin-left: false,
26-
@_popup-content-margin: @indent__s 0 0,
27-
@_popup-position-bottom: false,
28-
@_popup-position-right: false,
29-
@_popup-position: absolute
30-
);
31-
.map-info-price {
32-
&:extend(.abs-add-clearfix all);
33-
margin-bottom: 15px;
34-
.price-box {
35-
margin: 0 0 @indent__base;
36-
.label {
37-
&:after {
38-
content: ": ";
22+
.map-popup {
23+
.lib-popup(
24+
@_popup-margin-top: @indent__s,
25+
@_popup-margin-left: false,
26+
@_popup-content-margin: @indent__s 0 0,
27+
@_popup-position-bottom: false,
28+
@_popup-position-right: false,
29+
@_popup-position: absolute
30+
);
31+
.map-info-price {
32+
&:extend(.abs-add-clearfix all);
33+
margin-bottom: 15px;
34+
.price-box {
35+
margin: 0 0 @indent__base;
36+
.label {
37+
&:after {
38+
content: ": ";
39+
}
3940
}
4041
}
4142
}
4243
}
43-
}
4444

45-
.map-old-price,
46-
.product-info-price .map-show-info {
47-
&:not(:last-child) {
48-
margin-right: @indent__s;
45+
.map-old-price,
46+
.product-info-price .map-show-info {
47+
&:not(:last-child) {
48+
margin-right: @indent__s;
49+
}
4950
}
50-
}
5151

52-
.map-old-price {
53-
text-decoration: none;
54-
.price-wrapper {
55-
text-decoration: line-through;
52+
.map-old-price {
53+
text-decoration: none;
54+
.price-wrapper {
55+
text-decoration: line-through;
56+
}
5657
}
57-
}
5858

59+
.map-form-addtocart {
60+
display: inline-block;
61+
text-align: center;
62+
img {
63+
display: block;
64+
margin: 0 auto;
65+
}
66+
}
5967
}
6068

6169
//
62-
// Mobile
63-
//--------------------------------------
70+
// Mobile
71+
// _____________________________________________
72+
6473
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
6574
.map-popup {
6675
max-width: 100%;

‎app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module/_paypal-button.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
&:before {
1616
content: '- ' attr(data-label) ' -';
1717
display: block;
18-
margin: 0 @indent__xs @indent__s;
18+
margin: @indent__xs @indent__xs @indent__s;
1919
text-transform: uppercase;
2020
}
2121
}

‎app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less

Lines changed: 66 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,96 @@
44
// */
55

66
//
7-
// Common
8-
//--------------------------------------
7+
// Common
8+
// _____________________________________________
99

1010
& when (@media-common = true) {
1111

12-
.map-popup-wrapper {
13-
&.popup {
14-
.action {
15-
&.close {
16-
.lib-css(top, @popup-button-close__position-top);
12+
.map-popup-wrapper {
13+
&.popup {
14+
.action {
15+
&.close {
16+
.lib-css(top, @popup-button-close__position-top);
17+
}
1718
}
1819
}
1920
}
20-
}
2121

22-
.map-popup {
23-
.lib-popup(
24-
@_popup-margin-top: @indent__s,
25-
@_popup-margin-left: false,
26-
@_popup-content-margin: false,
27-
@_popup-position-bottom: false,
28-
@_popup-position-right: false,
29-
@_popup-position: absolute
30-
);
31-
.map-info-price {
32-
&:extend(.abs-add-clearfix all);
33-
margin: 0 0 @indent__base;
34-
.price-box {
22+
.map-popup {
23+
.lib-popup(
24+
@_popup-margin-top: @indent__s,
25+
@_popup-margin-left: false,
26+
@_popup-content-margin: false,
27+
@_popup-position-bottom: false,
28+
@_popup-position-right: false,
29+
@_popup-position: absolute
30+
);
31+
.map-info-price {
32+
&:extend(.abs-add-clearfix all);
3533
margin: 0 0 @indent__base;
36-
.label {
37-
&:after {
38-
content: ": ";
34+
.price-box {
35+
margin: 0 0 @indent__base;
36+
.label {
37+
&:after {
38+
content: ": ";
39+
}
3940
}
4041
}
4142
}
42-
}
43-
.action {
44-
&.primary {
45-
margin-right: @indent__s;
43+
.action {
44+
&.primary {
45+
margin-right: @indent__s;
46+
}
47+
}
48+
.map-msrp {
49+
margin-bottom: @indent__s;
50+
}
51+
.actual-price {
52+
margin: 3px 0 15px;
53+
}
54+
.popup-header {
55+
display: none;
4656
}
4757
}
48-
.map-msrp {
49-
margin-bottom: @indent__s;
50-
}
51-
.actual-price {
52-
margin: 3px 0 15px;
53-
}
54-
.popup-header {
55-
display: none;
56-
}
57-
}
5858

59-
.map-old-price {
60-
text-decoration: none;
61-
.price-wrapper {
62-
text-decoration: line-through;
59+
.map-old-price {
60+
text-decoration: none;
61+
.price-wrapper {
62+
text-decoration: line-through;
63+
}
6364
}
64-
}
6565

66-
.map-old-price,
67-
.product-item .map-old-price,
68-
.product-info-price .map-show-info {
69-
&:not(:last-child) {
70-
margin-right: @indent__s;
66+
.map-old-price,
67+
.product-item .map-old-price,
68+
.product-info-price .map-show-info {
69+
&:not(:last-child) {
70+
margin-right: @indent__s;
71+
}
7172
}
72-
}
7373

74-
.product-options-bottom .price-box,
75-
.product-info-price .price-box {
76-
.old-price {
77-
.price-container > span {
78-
display: inline;
74+
.product-options-bottom .price-box,
75+
.product-info-price .price-box {
76+
.old-price {
77+
.price-container > span {
78+
display: inline;
79+
}
7980
}
8081
}
81-
}
8282

83+
.map-form-addtocart {
84+
display: inline-block;
85+
text-align: center;
86+
img {
87+
display: block;
88+
margin: 0 auto;
89+
}
90+
}
8391
}
8492

8593
//
86-
// Mobile
87-
//--------------------------------------
94+
// Mobile
95+
// _____________________________________________
96+
8897
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
8998
.map-popup {
9099
max-width: 100%;

0 commit comments

Comments
 (0)