Skip to content

Commit d4a2a6d

Browse files
VladimirZaetsVladimirZaets
authored
ENGCOM-3342: LESS code clean up #18957 
2 parents 7abf025 + 6e7d5bc commit d4a2a6d

File tree

9 files changed

+215
-200
lines changed

9 files changed

+215
-200
lines changed

‎app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// _____________________________________________
99

1010
& when (@media-common = true) {
11-
1211
.block-banners,
1312
.block-banners-inline {
1413
&:extend(.abs-margin-for-blocks-and-widgets);
@@ -22,7 +21,7 @@
2221
}
2322

2423
.banner-item-content {
25-
.lib-css(margin-bottom, @indent__base);
24+
margin-bottom: @indent__base;
2625

2726
img {
2827
display: block;

‎app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
// */
55

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

1010
@toolbar-mode-icon-font-size: 24px;
1111
@toolbar-element-background: @panel__background-color;
1212

13-
& when (@media-common = true) {
13+
//
14+
// Common
15+
// _____________________________________________
1416

17+
& when (@media-common = true) {
1518
.page-products {
1619
.columns {
1720
position: relative;
@@ -72,12 +75,12 @@
7275
.sorter-action {
7376
vertical-align: top;
7477
.lib-icon-font(
75-
@icon-arrow-up,
76-
@_icon-font-size: 28px,
77-
@_icon-font-line-height: 32px,
78-
@_icon-font-color: @header-icons-color,
79-
@_icon-font-color-hover: @header-icons-color-hover,
80-
@_icon-font-text-hide: true
78+
@icon-arrow-up,
79+
@_icon-font-size: 28px,
80+
@_icon-font-line-height: 32px,
81+
@_icon-font-color: @header-icons-color,
82+
@_icon-font-color-hover: @header-icons-color-hover,
83+
@_icon-font-text-hide: true
8184
);
8285
}
8386

@@ -99,7 +102,7 @@
99102
}
100103

101104
.limiter-label {
102-
font-weight: 400;
105+
font-weight: @font-weight__regular;
103106
}
104107

105108
.limiter {
@@ -176,11 +179,11 @@
176179
}
177180

178181
.lib-icon-font(
179-
@icon-grid,
180-
@_icon-font-size: @toolbar-mode-icon-font-size,
181-
@_icon-font-text-hide: true,
182-
@_icon-font-color: @text__color__muted,
183-
@_icon-font-color-hover: @text__color__muted
182+
@icon-grid,
183+
@_icon-font-size: @toolbar-mode-icon-font-size,
184+
@_icon-font-text-hide: true,
185+
@_icon-font-color: @text__color__muted,
186+
@_icon-font-color-hover: @text__color__muted
184187
);
185188
}
186189

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@
148148
.action {
149149
&.close {
150150
.lib-button-icon(
151-
@icon-remove,
152-
@_icon-font-size: 32px,
153-
@_icon-font-line-height: 32px,
154-
@_icon-font-text-hide: true
151+
@icon-remove,
152+
@_icon-font-size: 32px,
153+
@_icon-font-line-height: 32px,
154+
@_icon-font-text-hide: true
155155
);
156156
.lib-button-reset();
157157
height: 40px;
@@ -254,12 +254,12 @@
254254

255255
.toggle {
256256
.lib-icon-font(
257-
@_icon-font-content: @icon-down,
258-
@_icon-font-size: 28px,
259-
@_icon-font-line-height: 16px,
260-
@_icon-font-text-hide: false,
261-
@_icon-font-position: after,
262-
@_icon-font-display: block
257+
@_icon-font-content: @icon-down,
258+
@_icon-font-size: 28px,
259+
@_icon-font-line-height: 16px,
260+
@_icon-font-text-hide: false,
261+
@_icon-font-position: after,
262+
@_icon-font-display: block
263263
);
264264
cursor: pointer;
265265
position: relative;
@@ -274,8 +274,8 @@
274274
&.active {
275275
> .toggle {
276276
.lib-icon-font-symbol(
277-
@_icon-font-content: @icon-up,
278-
@_icon-font-position: after
277+
@_icon-font-content: @icon-up,
278+
@_icon-font-position: after
279279
);
280280
}
281281
}
@@ -304,6 +304,7 @@
304304

305305
.weee[data-label] {
306306
.lib-font-size(11);
307+
307308
.label {
308309
&:extend(.abs-no-display all);
309310
}
@@ -317,12 +318,12 @@
317318
.product.options {
318319
.tooltip.toggle {
319320
.lib-icon-font(
320-
@icon-down,
321-
@_icon-font-size: 28px,
322-
@_icon-font-line-height: 28px,
323-
@_icon-font-text-hide: true,
324-
@_icon-font-margin: -3px 0 0 7px,
325-
@_icon-font-position: after
321+
@icon-down,
322+
@_icon-font-size: 28px,
323+
@_icon-font-line-height: 28px,
324+
@_icon-font-text-hide: true,
325+
@_icon-font-margin: -3px 0 0 7px,
326+
@_icon-font-position: after
326327
);
327328

328329
.details {
@@ -357,19 +358,19 @@
357358
&.edit,
358359
&.delete {
359360
.lib-icon-font(
360-
@icon-settings,
361-
@_icon-font-size: 28px,
362-
@_icon-font-line-height: 28px,
363-
@_icon-font-text-hide: true,
364-
@_icon-font-color: @color-gray19,
365-
@_icon-font-color-hover: @color-gray19,
366-
@_icon-font-color-active: @color-gray19
361+
@icon-settings,
362+
@_icon-font-size: 28px,
363+
@_icon-font-line-height: 28px,
364+
@_icon-font-text-hide: true,
365+
@_icon-font-color: @color-gray19,
366+
@_icon-font-color-hover: @color-gray19,
367+
@_icon-font-color-active: @color-gray19
367368
);
368369
}
369370

370371
&.delete {
371372
.lib-icon-font-symbol(
372-
@_icon-font-content: @icon-trash
373+
@_icon-font-content: @icon-trash
373374
);
374375
}
375376
}
@@ -399,6 +400,7 @@
399400
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
400401
.minicart-wrapper {
401402
margin-left: 13px;
403+
402404
.block-minicart {
403405
right: -15px;
404406
width: 390px;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
}
186186

187187
.form-wishlist-search {
188-
.lib-css(margin-bottom, @indent__l*2);
188+
margin-bottom: @indent__l * 2;
189189
max-width: 500px;
190190

191191
.fieldset {
@@ -216,8 +216,9 @@
216216

217217
.block-wishlist-info-items {
218218
.block-title {
219-
.lib-css(margin-bottom, @indent__base);
220219
.lib-font-size(22);
220+
margin-bottom: @indent__base;
221+
221222
> strong {
222223
font-weight: @font-weight__light;
223224
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
// _____________________________________________
1616

1717
& when (@media-common = true) {
18-
1918
.rating-summary {
2019
.lib-rating-summary();
20+
2121
.rating-result {
2222
margin-left: -5px;
2323
}
@@ -165,10 +165,10 @@
165165

166166
.review-details {
167167
.customer-review-rating {
168-
.lib-css(margin-bottom, @indent__base);
168+
margin-bottom: @indent__base;
169169

170170
.item {
171-
.lib-css(margin-bottom, @indent__s);
171+
margin-bottom: @indent__s;
172172

173173
&:last-child {
174174
margin-bottom: 0;
@@ -178,12 +178,12 @@
178178

179179
.review-title {
180180
.lib-heading(h3);
181-
.lib-css(font-weight, @font-weight__semibold);
182-
.lib-css(margin-bottom, @indent__base);
181+
font-weight: @font-weight__semibold;
182+
margin-bottom: @indent__base;
183183
}
184184

185185
.review-content {
186-
.lib-css(margin-bottom, @indent__base);
186+
margin-bottom: @indent__base;
187187
}
188188
}
189189

@@ -271,7 +271,7 @@
271271

272272
&-field-rating {
273273
.control {
274-
margin-bottom: 1.2*@indent__xl;
274+
margin-bottom: 1.2 * @indent__xl;
275275
margin-top: @indent__s;
276276
}
277277
}

0 commit comments

Comments
 (0)