ENGCOM-1207: Fix for not working LESS extends #14395

magento-engcom-team · magento-engcom-team · commit 66501845d081 · 2018-04-02T05:49:18.000-05:00
- Merge Pull Request magento/magento2#14395 from Igloczek/magento2:extends-fix - Merged commits: 1. f5e429d
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
@@ -8,7 +8,6 @@
 //  _____________________________________________
 
 @checkout-tooltip__hover__z-index: @tooltip__z-index;
-@checkout-tooltip-breakpoint__screen-m: @modal-popup-breakpoint-screen__m;
 
 @checkout-tooltip-icon-arrow__font-size: 10px;
 @checkout-tooltip-icon-arrow__left: -( @checkout-tooltip-content__padding + @checkout-tooltip-icon-arrow__font-size - @checkout-tooltip-content__border-width);
@@ -138,7 +137,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @checkout-tooltip-breakpoint__screen-m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .field-tooltip {
         .field-tooltip-content {
             &:extend(.abs-checkout-tooltip-content-position-top-mobile all);
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
@@ -262,7 +262,7 @@
         }
 
         .toolbar {
-            &:extend(.abs-add-clearfix-desktop all);
+            &:extend(.abs-add-clearfix-mobile all);
 
             .pages {
                 float: right;
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -1233,7 +1233,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .abs-checkout-tooltip-content-position-top-mobile {
         @abs-checkout-tooltip-content-position-top();
     }
diff --git a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less
@@ -16,7 +16,6 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;
@@ -149,7 +148,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-inner-wrap[class] {
@@ -180,7 +179,7 @@
 //  Desktop
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-footer {
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1681,7 +1681,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .abs-checkout-tooltip-content-position-top-mobile {
         @abs-checkout-tooltip-content-position-top();
     }
diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -16,7 +16,6 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;
@@ -148,7 +147,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-inner-wrap[class] {
@@ -179,7 +178,7 @@
 //  Desktop
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-footer {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`// _____________________________________________`
`9`	`9`
`10`	`10`	`@checkout-tooltip__hover__z-index: @tooltip__z-index;`
`11`		`-@checkout-tooltip-breakpoint__screen-m: @modal-popup-breakpoint-screen__m;`
`12`	`11`
`13`	`12`	`@checkout-tooltip-icon-arrow__font-size: 10px;`
`14`	`13`	`@checkout-tooltip-icon-arrow__left: -( @checkout-tooltip-content__padding + @checkout-tooltip-icon-arrow__font-size - @checkout-tooltip-content__border-width);`
`@@ -138,7 +137,7 @@`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`
`141`		`-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @checkout-tooltip-breakpoint__screen-m) {`
	`140`	`+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {`
`142`	`141`	`.field-tooltip {`
`143`	`142`	`.field-tooltip-content {`
`144`	`143`	`&:extend(.abs-checkout-tooltip-content-position-top-mobile all);`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`.toolbar {`
`265`		`- &:extend(.abs-add-clearfix-desktop all);`
	`265`	`+ &:extend(.abs-add-clearfix-mobile all);`
`266`	`266`
`267`	`267`	`.pages {`
`268`	`268`	`float: right;`
Original file line number	Diff line number	Diff line change
`@@ -1233,7 +1233,7 @@`
`1233`	`1233`	`}`
`1234`	`1234`	`}`
`1235`	`1235`
`1236`		`-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {`
	`1236`	`+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {`
`1237`	`1237`	`.abs-checkout-tooltip-content-position-top-mobile {`
`1238`	`1238`	`@abs-checkout-tooltip-content-position-top();`
`1239`	`1239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1681,7 +1681,7 @@`
`1681`	`1681`	`}`
`1682`	`1682`	`}`
`1683`	`1683`
`1684`		`-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {`
	`1684`	`+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {`
`1685`	`1685`	`.abs-checkout-tooltip-content-position-top-mobile {`
`1686`	`1686`	`@abs-checkout-tooltip-content-position-top();`
`1687`	`1687`	`}`