Skip to content

Commit c0bb4c5

Browse files
ENGCOM-5594: Fixes less compilation problems in the Magento/blank theme #24001
- Merge Pull Request #24001 from hostep/magento2:fix-for-issue-23619-blank-theme - Merged commits: 1. cbcb8c6 2. ed98703 3. beeb56c 4. d8c86b3 5. 937b2c0
2 parents c6427d1 + 937b2c0 commit c0bb4c5

File tree

7 files changed

+66
-14
lines changed

7 files changed

+66
-14
lines changed

app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333

3434
//
3535

36+
.modals-overlay {
37+
&:extend(.abs-modal-overlay all);
38+
}
39+
3640
.modal-popup,
3741
.modal-slide {
3842
.action-close {

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@
5353
}
5454

5555
.block-content {
56-
&:extend(.abs-add-clearfix-desktop all);
57-
58-
.box {
59-
&:extend(.abs-blocks-2columns all);
60-
}
61-
6256
.actions-toolbar {
6357
clear: both;
6458
.lib-actions-toolbar(
@@ -167,4 +161,16 @@
167161
&:extend(.abs-add-clearfix-desktop all);
168162
}
169163
}
164+
165+
.column {
166+
.block-addbysku {
167+
.block-content {
168+
&:extend(.abs-add-clearfix-desktop all);
169+
170+
.box {
171+
&:extend(.abs-blocks-2columns all);
172+
}
173+
}
174+
}
175+
}
170176
}

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
.opc-estimated-wrapper {
1717
&:extend(.abs-add-clearfix all);
18-
&:extend(.abs-no-display-desktop all);
1918
.lib-css(border-bottom, @border-width__base solid @color-gray80);
2019
margin: 0 0 15px;
2120
padding: 18px 15px;
@@ -37,7 +36,7 @@
3736
&:before {
3837
.lib-css(color, @button__color);
3938
}
40-
39+
4140
&:hover:before {
4241
.lib-css(color, @button__hover__color);
4342
}
@@ -53,6 +52,6 @@
5352

5453
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
5554
.opc-estimated-wrapper {
56-
display: none;
55+
&:extend(.abs-no-display-desktop all);
5756
}
5857
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
& when (@media-common = true) {
1919
.gift-message {
2020
.field {
21-
&:extend(.abs-clearfix all);
2221
margin-bottom: @indent__base;
2322

2423
.label {

app/design/frontend/Magento/blank/web/css/source/_extends.less

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
& when (@media-common = true) {
180180
.abs-block-title {
181181
margin-bottom: 15px;
182-
182+
183183
> strong {
184184
.lib-heading(h3);
185185
}
@@ -194,7 +194,7 @@
194194
.abs-account-blocks {
195195
.block-title {
196196
&:extend(.abs-block-title all);
197-
197+
198198
> .action {
199199
margin-left: 15px;
200200
}
@@ -849,6 +849,51 @@
849849
}
850850
}
851851

852+
//
853+
// Account pages: title
854+
// ---------------------------------------------
855+
856+
& when (@media-common = true) {
857+
.abs-account-title {
858+
> strong,
859+
> span {
860+
.lib-font-size(22);
861+
.lib-css(font-weight, @font-weight__light);
862+
}
863+
864+
.lib-css(border-bottom, 1px solid @border-color__base);
865+
.lib-css(margin-bottom, @indent__m);
866+
.lib-css(padding-bottom, @indent__s);
867+
}
868+
}
869+
870+
//
871+
// Ratings: vertical alignment
872+
// ---------------------------------------------
873+
874+
& when (@media-common = true) {
875+
.abs-rating-summary {
876+
.rating {
877+
&-summary {
878+
display: table-row;
879+
}
880+
881+
&-label {
882+
display: table-cell;
883+
padding-bottom: @indent__xs;
884+
padding-right: @indent__m;
885+
padding-top: 1px;
886+
vertical-align: top;
887+
}
888+
889+
&-result {
890+
display: table-cell;
891+
vertical-align: top;
892+
}
893+
}
894+
}
895+
}
896+
852897
//
853898
// Add colon
854899
// ---------------------------------------------

app/design/frontend/Magento/luma/web/css/source/_extends.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@
12121212
}
12131213

12141214
//
1215-
// Forms: margin-bottom for small forms
1215+
// Ratings: vertical alignment
12161216
// ---------------------------------------------
12171217

12181218
& when (@media-common = true) {

lib/web/css/source/components/_modals.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150

151151
// Modals overlay
152152
.modals-overlay {
153-
&:extend(.abs-modal-overlay all);
154153
.lib-css(z-index, @overlay__z-index);
155154
}
156155

0 commit comments

Comments
 (0)