Skip to content

Commit 31e972e

Browse files
glo17680glo17680
committed
Merge remote-tracking branch 'hostep/fixed-less-math-calculates-after-upgrade-of-less-js-to-v4' into AC-10850
2 parents 03621bb + 21f53f3 commit 31e972e

File tree

53 files changed

+173
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+173
-129
lines changed

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_header.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// ---------------------------------------------
1919

2020
@page-header__indent-horizontal: @content__indent;
21-
@page-header__indent-vertical: @content__indent / 2;
21+
@page-header__indent-vertical: (@content__indent / 2);
2222

2323
//
2424

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
display: block;
182182
height: @menu-line-before__height;
183183
left: 0;
184-
margin-left: (100% - @_menu-separator__width) / 2;
184+
margin-left: ((100% - @_menu-separator__width) / 2);
185185
position: absolute;
186186
top: 0;
187187
width: @_menu-separator__width;

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
//
2828

2929
.page-header-hgroup {
30-
padding-right: @content__indent / 2;
30+
padding-right: (@content__indent / 2);
3131
}
3232

3333
//

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
@notifications__color: @color-gray20;
1616

1717
@notifications-action__color: @text__color;
18-
@notifications-action__padding-bottom: (@page-header-action__height - @notifications-action-icon__size) / 2 - .05rem;
18+
@notifications-action__padding-bottom: ((@page-header-action__height - @notifications-action-icon__size) / 2 - .05rem);
1919
@notifications-action__padding-side: 2rem;
20-
@notifications-action__padding-top: (@page-header-action__height - @notifications-action-icon__size) / 2 + .05rem;
20+
@notifications-action__padding-top: ((@page-header-action__height - @notifications-action-icon__size) / 2 + .05rem);
2121
@notifications-action__hover__color: darken(@action-dropdown__color, 20%);
2222
@notifications-action-icon__size: 1.9rem;
2323
@notifications-action-menu__z-index: @header__z-index;
@@ -177,7 +177,7 @@
177177
.notifications-close {
178178
&:extend(.abs-action-reset all);
179179
line-height: 1;
180-
padding: @notifications-action__padding-side / 2;
180+
padding: (@notifications-action__padding-side / 2);
181181
position: absolute;
182182
right: 0;
183183
top: .6rem;

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
@search-global-input__font-size: @font-size__base;
1919
@search-global-input__height: @page-header-action__height;
20-
@search-global-input__padding-bottom: (@search-global-input__height - @search-global-icon__height) / 2 - .1rem;
21-
@search-global-input__padding-top: (@search-global-input__height - @search-global-icon__height) / 2 + .1rem;
20+
@search-global-input__padding-bottom: ((@search-global-input__height - @search-global-icon__height) / 2 - .1rem);
21+
@search-global-input__padding-top: ((@search-global-input__height - @search-global-icon__height) / 2 + .1rem);
2222
@search-global-input__padding-side: @font-size__base;
2323
@search-global-input__width: @search-global-icon__width + @search-global-input__padding-side * 2;
2424

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
@dashboard-secondary-table-col-name__width-px: 135px;
2222
@dashboard-secondary-table-col-value__width-px: 50px;
2323

24-
@dashboard-secondary-table-col-name__width-pct: @dashboard-secondary-table-col-name__width-px * 100% / @dashboard-secondary-table__width-px; // 57.44680851%
25-
@dashboard-secondary-table-col-value__width-pct: @dashboard-secondary-table-col-value__width-px * 100% / @dashboard-secondary-table__width-px; // 21.27659574%
24+
@dashboard-secondary-table-col-name__width-pct: (@dashboard-secondary-table-col-name__width-px * 100% / @dashboard-secondary-table__width-px); // 57.44680851%
25+
@dashboard-secondary-table-col-value__width-pct: (@dashboard-secondary-table-col-value__width-px * 100% / @dashboard-secondary-table__width-px); // 21.27659574%
2626

2727
//
2828
// Tables
@@ -60,9 +60,9 @@
6060
@dashboard-table-col-name__width-px: 308px;
6161
@dashboard-table-col-value__width-px: 84px;
6262

63-
@dashboard-table-col-product__width-pct: @dashboard-table-col-product__width-px * 100% / @dashboard-table__width-px; // 70%
64-
@dashboard-table-col-name__width-pct: @dashboard-table-col-name__width-px * 100% / @dashboard-table__width-px; // 55%
65-
@dashboard-table-col-value__width-pct: @dashboard-table-col-value__width-px * 100% / @dashboard-table__width-px; // 15%
63+
@dashboard-table-col-product__width-pct: (@dashboard-table-col-product__width-px * 100% / @dashboard-table__width-px); // 70%
64+
@dashboard-table-col-name__width-pct: (@dashboard-table-col-name__width-px * 100% / @dashboard-table__width-px); // 55%
65+
@dashboard-table-col-value__width-pct: (@dashboard-table-col-value__width-px * 100% / @dashboard-table__width-px); // 15%
6666

6767
th,
6868
td {

‎app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/navigation-bar/_navigation-bar.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
9191
content: '';
9292
height: .8rem;
93-
left: @nav-bar-step__width / 2;
93+
left: (@nav-bar-step__width / 2);
9494
position: absolute;
95-
right: @nav-bar-step__width / 2;
95+
right: (@nav-bar-step__width / 2);
9696
top: @nav-bar-point__size;
9797
}
9898

@@ -204,7 +204,7 @@
204204
position: absolute;
205205
right: auto;
206206
text-align: center;
207-
top: @nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05;
207+
top: (@nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05);
208208
width: @nav-bar-point__size;
209209
}
210210

‎app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_attribute-values.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@steps-wizard-attribute-entity-action-save__content: @icon-arrow-right__content;
1919
@steps-wizard-attribute-entity-action-save__hover__content: @color-very-dark-gray-black2;
2020

21-
@steps-wizard-attribute-option-width: 100%/3;
21+
@steps-wizard-attribute-option-width: (100%/3);
2222

2323
//
2424
// Common

‎app/design/adminhtml/Magento/backend/Magento_Marketplace/web/css/source/_module.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
.partner {
2121
margin-bottom: @indent__xl;
2222
padding: 0 @indent__m;
23-
width: 100% / 3;
23+
width: (100% / 3);
2424
}
2525
}
2626

‎app/design/adminhtml/Magento/backend/Magento_ProductVideo/web/css/source/_module.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// /**
1+
// /**
22
// * Copyright © Magento, Inc. All rights reserved.
33
// * See COPYING.txt for license details.
44
// */
@@ -28,7 +28,7 @@
2828

2929
&:before {
3030
left: 0;
31-
margin-top: -@video-gallery-icon__size / 2;
31+
margin-top: (-@video-gallery-icon__size / 2);
3232
opacity: .5;
3333
position: absolute;
3434
right: 0;

‎app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_scheduled-changes.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
background: linear-gradient(to top, rgba(255,255,255,1) 30%, rgba(255,255,255,0) 100%);
9494
content: '';
9595
height: @scheduled-changes-mark-overlay__height;
96-
left: -@scheduled-changes-mark-overlay__width / 2;
96+
left: (-@scheduled-changes-mark-overlay__width / 2);
9797
position: absolute;
9898
top: -@scheduled-changes-mark-overlay__height;
9999
width: @scheduled-changes-mark-overlay__width;

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_masonry-grid.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
& when (@media-common = true) {
1111
.masonry-image {
1212
&-grid {
13-
margin: @admin__masonry_grid_image__space/2 -(@admin__masonry_grid_image__space/2);
13+
margin: (@admin__masonry_grid_image__space/2) -(@admin__masonry_grid_image__space/2);
1414
overflow: hidden;
1515
position: relative;
1616

@@ -25,7 +25,7 @@
2525
&-column {
2626
background-color: @admin__masonry_grid_background_color;
2727
float: left;
28-
margin: @admin__masonry_grid_image__space/2;
28+
margin: (@admin__masonry_grid_image__space/2);
2929
overflow: hidden;
3030

3131
.masonry-image-block {

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-action-bookmarks.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
.action-dropdown-menu-item-edit {
8080
display: none;
8181
padding-bottom: @action-dropdown-menu-item__padding-vertical;
82-
padding-left: @action-dropdown-menu-item__padding-left / 2;
82+
padding-left: (@action-dropdown-menu-item__padding-left / 2);
8383
padding-top: @action-dropdown-menu-item__padding-vertical;
8484

8585
.action-dropdown-menu-item-actions {
@@ -90,7 +90,7 @@
9090

9191
// Menu actions
9292
.action-dropdown-menu-action {
93-
padding-left: @action-dropdown-menu-item__padding-left / 2;
93+
padding-left: (@action-dropdown-menu-item__padding-left / 2);
9494
padding-top: @action-dropdown-menu-item__padding-vertical;
9595

9696
+ .action-dropdown-menu-item-last {

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@
219219
display: inline-block;
220220
margin-bottom: 2em;
221221
margin-left: 0;
222-
padding-left: @data-grid-filters-fieldset__inner-side / 2;
223-
padding-right: @data-grid-filters-fieldset__inner-side / 2;
222+
padding-left: (@data-grid-filters-fieldset__inner-side / 2);
223+
padding-right: (@data-grid-filters-fieldset__inner-side / 2);
224224
vertical-align: top;
225225
width: ~'calc(100% / @{data-grid-filters-fieldset__columns} - 4px)';
226226

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_navigation-bar.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@
100100
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
101101
content: '';
102102
height: 1rem;
103-
left: @nav-bar-step__width / 2;
103+
left: (@nav-bar-step__width / 2);
104104
position: absolute;
105-
right: @nav-bar-step__width / 2;
105+
right: (@nav-bar-step__width / 2);
106106
top: @nav-bar-point__size;
107107
}
108108

@@ -215,7 +215,7 @@
215215
position: absolute;
216216
right: auto;
217217
text-align: center;
218-
top: @nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05;
218+
top: (@nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05);
219219
width: @nav-bar-point__size + @nav-bar-point__border-width * 2;
220220
}
221221

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
}
4747

4848
&.right {
49-
margin-left: @tooltip-arrow__size / 2;
49+
margin-left: (@tooltip-arrow__size / 2);
5050
padding: 0 @tooltip-arrow__size;
5151
}
5252

5353
&.bottom {
54-
margin-top: @tooltip-arrow__size / 2;
54+
margin-top: (@tooltip-arrow__size / 2);
5555
padding: @tooltip-arrow__size 0;
5656
}
5757

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@btn-secondary__disabled__background-color: lighten(@btn-secondary__background-color, 0%);
2828
@btn-secondary__active__background-color: lighten(@btn-secondary__background-color, 2%);
2929

30-
@triangle__base__size: @btn__height__base / 2;
30+
@triangle__base__size: (@btn__height__base / 2);
3131

3232
// Expand button
3333
@color-btn-expand: @base__color;
@@ -174,7 +174,7 @@
174174
position: relative;
175175

176176
.btn {
177-
text-indent: @triangle__base__size / 2;
177+
text-indent: (@triangle__base__size / 2);
178178

179179
&:after {
180180
border-color: transparent transparent transparent @btn__base__background-color;
@@ -238,7 +238,7 @@
238238
padding-left: @triangle__base__size - .1;
239239

240240
.btn {
241-
text-indent: -@triangle__base__size / 2;
241+
text-indent: (-@triangle__base__size / 2);
242242

243243
&:after {
244244
border-color: transparent @btn__base__background-color transparent transparent;
@@ -312,7 +312,7 @@
312312
&.expanded {
313313
&:after {
314314
border-color: transparent transparent @color-btn-expand transparent;
315-
border-width: 0 @width-triangle-btn-expand / 2 @height-triangle-btn-expand @width-triangle-btn-expand / 2;
315+
border-width: 0 (@width-triangle-btn-expand / 2) @height-triangle-btn-expand (@width-triangle-btn-expand / 2);
316316
}
317317

318318
&:hover {
@@ -335,7 +335,7 @@
335335
&:after {
336336
border-color: @color-btn-expand transparent transparent transparent;
337337
border-style: solid;
338-
border-width: @height-triangle-btn-expand @width-triangle-btn-expand / 2 0 @width-triangle-btn-expand / 2;
338+
border-width: @height-triangle-btn-expand (@width-triangle-btn-expand / 2) 0 (@width-triangle-btn-expand / 2);
339339
content: '';
340340
height: 0;
341341
left: 100%;

‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_selects.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
&:before {
5353
border-color: @form-el__color transparent transparent transparent;
5454
border-style: solid;
55-
border-width: @select-check__height @select-check__width / 2 0 @select-check__width / 2;
55+
border-width: @select-check__height (@select-check__width / 2) 0 (@select-check__width / 2);
5656
content: '';
5757
height: 0;
5858
margin-right: -(@select-check__width / 2);
5959
margin-top: -(@select-check__height / 2);
6060
position: absolute;
61-
right: @select-check__size / 2;
61+
right: (@select-check__size / 2);
6262
top: 50%;
6363
width: 0;
6464
z-index: -1;

‎app/design/adminhtml/Magento/backend/web/css/source/_actions.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
padding-left: @button-triangle__base__size - .1;
196196

197197
.action-default {
198-
text-indent: -(@button-triangle__base__size) / 2;
198+
text-indent: (-@button-triangle__base__size / 2);
199199

200200
&:before,
201201
&:after {

‎app/design/adminhtml/Magento/backend/web/css/source/_grid.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
margin-left: -(@content__indent / 2);
6666
margin-right: -(@content__indent / 2);
6767
> [class*='col-'] {
68-
padding-left: @content__indent / 2;
69-
padding-right: @content__indent / 2;
68+
padding-left: (@content__indent / 2);
69+
padding-right: (@content__indent / 2);
7070
}
7171
}
7272

@@ -81,7 +81,7 @@
8181
}
8282

8383
.return_length(@_columns-min, @_total: @temp_columns, @mathSymbol: '-') {
84-
@_part: @_columns-min/@_total;
84+
@_part: (@_columns-min/@_total);
8585
@_length: ~'calc( (100%) * @{_part} @{mathSymbol} @{temp_gutter} )';
8686
}
8787

‎app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less

+5-5
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
white-space: normal;
8989

9090
&:after {
91-
bottom: @action__height / 2 - @button-marker-triangle__height / 2 - .1rem;
91+
bottom: (@action__height / 2 - @button-marker-triangle__height / 2 - .1rem);
9292
top: auto;
9393
}
9494

@@ -353,7 +353,7 @@
353353
padding-left: @action-multiselect-tree-menu-item__margin-left - @action-multiselect-menu-item__padding;
354354

355355
&:before {
356-
left: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size + @action-multiselect-tree-arrow__size/2;
356+
left: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size + @action-multiselect-tree-arrow__size/2);
357357
}
358358
}
359359
}
@@ -363,7 +363,7 @@
363363

364364
&:last-child {
365365
&:before {
366-
height: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
366+
height: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2);
367367
}
368368
}
369369

@@ -378,7 +378,7 @@
378378
&:after {
379379
border-top: @action-multiselect-tree-lines;
380380
height: 1px;
381-
top: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
381+
top: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2);
382382
width: @action-multiselect-tree-menu-item__margin-left;
383383
}
384384

@@ -419,7 +419,7 @@
419419

420420
&:first-child {
421421
&:before {
422-
top: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
422+
top: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2);
423423
}
424424
}
425425

‎app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-split.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
padding-right: @_dropdown__padding-right;
3030

3131
&:after {
32-
border-width: @_triangle__height @_triangle__width / 2 0 @_triangle__width / 2;
32+
border-width: @_triangle__height (@_triangle__width / 2) 0 (@_triangle__width / 2);
3333
margin-top: -((@_triangle__width / 2) / 2);
3434
right: @_triangle__right;
3535
}

0 commit comments

Comments
 (0)