Skip to content

Commit

Permalink
Merge remote-tracking branch 'hostep/fixed-less-math-calculates-after…
Browse files Browse the repository at this point in the history
…-upgrade-of-less-js-to-v4' into AC-10850
  • Loading branch information
glo17680 committed Jan 18, 2024
2 parents 03621bb + 21f53f3 commit 31e972e
Show file tree
Hide file tree
Showing 53 changed files with 173 additions and 129 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// ---------------------------------------------

@page-header__indent-horizontal: @content__indent;
@page-header__indent-vertical: @content__indent / 2;
@page-header__indent-vertical: (@content__indent / 2);

//

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
display: block;
height: @menu-line-before__height;
left: 0;
margin-left: (100% - @_menu-separator__width) / 2;
margin-left: ((100% - @_menu-separator__width) / 2);
position: absolute;
top: 0;
width: @_menu-separator__width;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
//

.page-header-hgroup {
padding-right: @content__indent / 2;
padding-right: (@content__indent / 2);
}

//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
@notifications__color: @color-gray20;

@notifications-action__color: @text__color;
@notifications-action__padding-bottom: (@page-header-action__height - @notifications-action-icon__size) / 2 - .05rem;
@notifications-action__padding-bottom: ((@page-header-action__height - @notifications-action-icon__size) / 2 - .05rem);
@notifications-action__padding-side: 2rem;
@notifications-action__padding-top: (@page-header-action__height - @notifications-action-icon__size) / 2 + .05rem;
@notifications-action__padding-top: ((@page-header-action__height - @notifications-action-icon__size) / 2 + .05rem);
@notifications-action__hover__color: darken(@action-dropdown__color, 20%);
@notifications-action-icon__size: 1.9rem;
@notifications-action-menu__z-index: @header__z-index;
Expand Down Expand Up @@ -177,7 +177,7 @@
.notifications-close {
&:extend(.abs-action-reset all);
line-height: 1;
padding: @notifications-action__padding-side / 2;
padding: (@notifications-action__padding-side / 2);
position: absolute;
right: 0;
top: .6rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
@dashboard-secondary-table-col-name__width-px: 135px;
@dashboard-secondary-table-col-value__width-px: 50px;

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

//
// Tables
Expand Down Expand Up @@ -60,9 +60,9 @@
@dashboard-table-col-name__width-px: 308px;
@dashboard-table-col-value__width-px: 84px;

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

th,
td {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
content: '';
height: .8rem;
left: @nav-bar-step__width / 2;
left: (@nav-bar-step__width / 2);
position: absolute;
right: @nav-bar-step__width / 2;
right: (@nav-bar-step__width / 2);
top: @nav-bar-point__size;
}

Expand Down Expand Up @@ -204,7 +204,7 @@
position: absolute;
right: auto;
text-align: center;
top: @nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05;
top: (@nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05);
width: @nav-bar-point__size;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@steps-wizard-attribute-entity-action-save__content: @icon-arrow-right__content;
@steps-wizard-attribute-entity-action-save__hover__content: @color-very-dark-gray-black2;

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

//
// Common
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.partner {
margin-bottom: @indent__xl;
padding: 0 @indent__m;
width: 100% / 3;
width: (100% / 3);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// /**
// /**
// * Copyright © Magento, Inc. All rights reserved.
// * See COPYING.txt for license details.
// */
Expand Down Expand Up @@ -28,7 +28,7 @@

&:before {
left: 0;
margin-top: -@video-gallery-icon__size / 2;
margin-top: (-@video-gallery-icon__size / 2);
opacity: .5;
position: absolute;
right: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
background: linear-gradient(to top, rgba(255,255,255,1) 30%, rgba(255,255,255,0) 100%);
content: '';
height: @scheduled-changes-mark-overlay__height;
left: -@scheduled-changes-mark-overlay__width / 2;
left: (-@scheduled-changes-mark-overlay__width / 2);
position: absolute;
top: -@scheduled-changes-mark-overlay__height;
width: @scheduled-changes-mark-overlay__width;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
& when (@media-common = true) {
.masonry-image {
&-grid {
margin: @admin__masonry_grid_image__space/2 -(@admin__masonry_grid_image__space/2);
margin: (@admin__masonry_grid_image__space/2) -(@admin__masonry_grid_image__space/2);
overflow: hidden;
position: relative;

Expand All @@ -25,7 +25,7 @@
&-column {
background-color: @admin__masonry_grid_background_color;
float: left;
margin: @admin__masonry_grid_image__space/2;
margin: (@admin__masonry_grid_image__space/2);
overflow: hidden;

.masonry-image-block {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
.action-dropdown-menu-item-edit {
display: none;
padding-bottom: @action-dropdown-menu-item__padding-vertical;
padding-left: @action-dropdown-menu-item__padding-left / 2;
padding-left: (@action-dropdown-menu-item__padding-left / 2);
padding-top: @action-dropdown-menu-item__padding-vertical;

.action-dropdown-menu-item-actions {
Expand All @@ -90,7 +90,7 @@

// Menu actions
.action-dropdown-menu-action {
padding-left: @action-dropdown-menu-item__padding-left / 2;
padding-left: (@action-dropdown-menu-item__padding-left / 2);
padding-top: @action-dropdown-menu-item__padding-vertical;

+ .action-dropdown-menu-item-last {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@
display: inline-block;
margin-bottom: 2em;
margin-left: 0;
padding-left: @data-grid-filters-fieldset__inner-side / 2;
padding-right: @data-grid-filters-fieldset__inner-side / 2;
padding-left: (@data-grid-filters-fieldset__inner-side / 2);
padding-right: (@data-grid-filters-fieldset__inner-side / 2);
vertical-align: top;
width: ~'calc(100% / @{data-grid-filters-fieldset__columns} - 4px)';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
content: '';
height: 1rem;
left: @nav-bar-step__width / 2;
left: (@nav-bar-step__width / 2);
position: absolute;
right: @nav-bar-step__width / 2;
right: (@nav-bar-step__width / 2);
top: @nav-bar-point__size;
}

Expand Down Expand Up @@ -215,7 +215,7 @@
position: absolute;
right: auto;
text-align: center;
top: @nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05;
top: (@nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05);
width: @nav-bar-point__size + @nav-bar-point__border-width * 2;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
}

&.right {
margin-left: @tooltip-arrow__size / 2;
margin-left: (@tooltip-arrow__size / 2);
padding: 0 @tooltip-arrow__size;
}

&.bottom {
margin-top: @tooltip-arrow__size / 2;
margin-top: (@tooltip-arrow__size / 2);
padding: @tooltip-arrow__size 0;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@btn-secondary__disabled__background-color: lighten(@btn-secondary__background-color, 0%);
@btn-secondary__active__background-color: lighten(@btn-secondary__background-color, 2%);

@triangle__base__size: @btn__height__base / 2;
@triangle__base__size: (@btn__height__base / 2);

// Expand button
@color-btn-expand: @base__color;
Expand Down Expand Up @@ -174,7 +174,7 @@
position: relative;

.btn {
text-indent: @triangle__base__size / 2;
text-indent: (@triangle__base__size / 2);

&:after {
border-color: transparent transparent transparent @btn__base__background-color;
Expand Down Expand Up @@ -238,7 +238,7 @@
padding-left: @triangle__base__size - .1;

.btn {
text-indent: -@triangle__base__size / 2;
text-indent: (-@triangle__base__size / 2);

&:after {
border-color: transparent @btn__base__background-color transparent transparent;
Expand Down Expand Up @@ -312,7 +312,7 @@
&.expanded {
&:after {
border-color: transparent transparent @color-btn-expand transparent;
border-width: 0 @width-triangle-btn-expand / 2 @height-triangle-btn-expand @width-triangle-btn-expand / 2;
border-width: 0 (@width-triangle-btn-expand / 2) @height-triangle-btn-expand (@width-triangle-btn-expand / 2);
}

&:hover {
Expand All @@ -335,7 +335,7 @@
&:after {
border-color: @color-btn-expand transparent transparent transparent;
border-style: solid;
border-width: @height-triangle-btn-expand @width-triangle-btn-expand / 2 0 @width-triangle-btn-expand / 2;
border-width: @height-triangle-btn-expand (@width-triangle-btn-expand / 2) 0 (@width-triangle-btn-expand / 2);
content: '';
height: 0;
left: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
&:before {
border-color: @form-el__color transparent transparent transparent;
border-style: solid;
border-width: @select-check__height @select-check__width / 2 0 @select-check__width / 2;
border-width: @select-check__height (@select-check__width / 2) 0 (@select-check__width / 2);
content: '';
height: 0;
margin-right: -(@select-check__width / 2);
margin-top: -(@select-check__height / 2);
position: absolute;
right: @select-check__size / 2;
right: (@select-check__size / 2);
top: 50%;
width: 0;
z-index: -1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
padding-left: @button-triangle__base__size - .1;

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

&:before,
&:after {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
margin-left: -(@content__indent / 2);
margin-right: -(@content__indent / 2);
> [class*='col-'] {
padding-left: @content__indent / 2;
padding-right: @content__indent / 2;
padding-left: (@content__indent / 2);
padding-right: (@content__indent / 2);
}
}

Expand All @@ -81,7 +81,7 @@
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
white-space: normal;

&:after {
bottom: @action__height / 2 - @button-marker-triangle__height / 2 - .1rem;
bottom: (@action__height / 2 - @button-marker-triangle__height / 2 - .1rem);
top: auto;
}

Expand Down Expand Up @@ -353,7 +353,7 @@
padding-left: @action-multiselect-tree-menu-item__margin-left - @action-multiselect-menu-item__padding;

&:before {
left: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size + @action-multiselect-tree-arrow__size/2;
left: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size + @action-multiselect-tree-arrow__size/2);
}
}
}
Expand All @@ -363,7 +363,7 @@

&:last-child {
&:before {
height: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
height: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2);
}
}

Expand All @@ -378,7 +378,7 @@
&:after {
border-top: @action-multiselect-tree-lines;
height: 1px;
top: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
top: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2);
width: @action-multiselect-tree-menu-item__margin-left;
}

Expand Down Expand Up @@ -419,7 +419,7 @@

&:first-child {
&:before {
top: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
top: (@action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
padding-right: @_dropdown__padding-right;

&:after {
border-width: @_triangle__height @_triangle__width / 2 0 @_triangle__width / 2;
border-width: @_triangle__height (@_triangle__width / 2) 0 (@_triangle__width / 2);
margin-top: -((@_triangle__width / 2) / 2);
right: @_triangle__right;
}
Expand Down

0 comments on commit 31e972e

Please sign in to comment.