Skip to content

Commit 31e972e

Browse files
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 5 additions & 5 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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;

0 commit comments

Comments
 (0)