diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less index efc747e4d714a..72e9088f7cd34 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less @@ -33,6 +33,10 @@ // +.modals-overlay { + &:extend(.abs-modal-overlay all); +} + .modal-popup, .modal-slide { .action-close { diff --git a/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less index 1db5dceea80aa..5fe3df4b0ccbe 100644 --- a/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less @@ -53,12 +53,6 @@ } .block-content { - &:extend(.abs-add-clearfix-desktop all); - - .box { - &:extend(.abs-blocks-2columns all); - } - .actions-toolbar { clear: both; .lib-actions-toolbar( @@ -167,4 +161,16 @@ &:extend(.abs-add-clearfix-desktop all); } } + + .column { + .block-addbysku { + .block-content { + &:extend(.abs-add-clearfix-desktop all); + + .box { + &:extend(.abs-blocks-2columns all); + } + } + } + } } diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less index 85c65bd0ff2d7..3caa80b7a28b6 100644 --- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less +++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less @@ -15,7 +15,6 @@ .opc-estimated-wrapper { &:extend(.abs-add-clearfix all); - &:extend(.abs-no-display-desktop all); .lib-css(border-bottom, @border-width__base solid @color-gray80); margin: 0 0 15px; padding: 18px 15px; @@ -37,7 +36,7 @@ &:before { .lib-css(color, @button__color); } - + &:hover:before { .lib-css(color, @button__hover__color); } @@ -53,6 +52,6 @@ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .opc-estimated-wrapper { - display: none; + &:extend(.abs-no-display-desktop all); } } diff --git a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less index 70af2cbf611cc..6dfe5ef987aa5 100644 --- a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less @@ -18,7 +18,6 @@ & when (@media-common = true) { .gift-message { .field { - &:extend(.abs-clearfix all); margin-bottom: @indent__base; .label { diff --git a/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less index 03a474012cb0c..6c68806efbbd7 100644 --- a/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less @@ -72,10 +72,6 @@ .form-giftregistry-search { margin-bottom: @indent__l*2; - .legend { - &:extend(.abs-account-title all); - } - .fields-specific-options { .field { &:nth-last-of-type(1) { diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less index c572c983d80d9..d32d84a2c7ce1 100644 --- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less @@ -180,10 +180,6 @@ } .block-wishlist-search-form { - .block-title { - &:extend(.abs-account-title all); - } - .form-wishlist-search { margin-bottom: @indent__l * 2; max-width: 500px; @@ -218,7 +214,7 @@ .block-title { .lib-font-size(22); margin-bottom: @indent__base; - + > strong { font-weight: @font-weight__light; } diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less index 46f9661d8281d..f4fc9600778dd 100644 --- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less @@ -189,7 +189,6 @@ .block-title, .block-content .title { - &:extend(.abs-account-title all); border-bottom: @border-width__base solid @border-color__base; padding-bottom: @indent__s; diff --git a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less index 69ec01d71e104..6fa9597b4528f 100644 --- a/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less +++ b/app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less @@ -17,7 +17,7 @@ & when (@media-common = true) { .rating-summary { .lib-rating-summary(); - + .rating-result { margin-left: -5px; } @@ -299,7 +299,6 @@ display: table; margin-bottom: @indent__s; max-width: 100%; - &:extend(.abs-rating-summary all); } &-author { diff --git a/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less index 8538a481903c7..4f2cf789d3a0e 100644 --- a/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less @@ -48,12 +48,6 @@ } .block-content { - &:extend(.abs-add-clearfix-desktop all); - - .box { - &:extend(.abs-blocks-2columns all); - } - .actions-toolbar { clear: both; .lib-actions-toolbar( @@ -188,4 +182,16 @@ &:extend(.abs-add-clearfix-desktop all); } } + + .column { + .block-addbysku { + .block-content { + &:extend(.abs-add-clearfix-desktop all); + + .box { + &:extend(.abs-blocks-2columns all); + } + } + } + } } diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less index 31859a46d3efe..2176fcd241916 100644 --- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less @@ -18,7 +18,7 @@ // _____________________________________________ & when (@media-common = true) { - + .search { .fieldset { .control { @@ -31,7 +31,7 @@ } } } - + .block-search { margin-bottom: 0; @@ -136,8 +136,6 @@ } .form.search.advanced { - &:extend(.abs-forms-general-desktop all); - .fields.range { .field { &:first-child { @@ -275,4 +273,8 @@ .search-autocomplete { margin-top: 0; } + + .form.search.advanced { + &:extend(.abs-forms-general-desktop all); + } } diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less index 530c700cbc395..e89ad3aaf137f 100644 --- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less +++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less @@ -14,7 +14,6 @@ // --------------------------------------------- .opc-estimated-wrapper { - &:extend(.abs-no-display-desktop all); &:extend(.abs-add-clearfix all); .lib-css(background, @checkout-step-content-mobile__background); .lib-css(border-bottom, @checkout-step-title__border); @@ -54,6 +53,6 @@ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .opc-estimated-wrapper { - display: none; + &:extend(.abs-no-display-desktop all); } } diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less index 7b06186ef9ad3..fbd9701d44be9 100644 --- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less +++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less @@ -129,7 +129,6 @@ .file-uploader-preview { .action-remove { - &:extend(.abs-action-reset all); .lib-icon-font ( @icon-delete__content, @_icon-font: @icons__font-name, diff --git a/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less index 7d911220d9dca..40b8cb8740810 100644 --- a/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less @@ -92,7 +92,6 @@ } .field.choice { - &:extend(.clearer all); border-bottom: 1px solid @color-gray92; box-sizing: border-box; margin-bottom: @indent__s; @@ -178,10 +177,6 @@ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .page-product-downloadable { - .product-add-form { - &:extend(.clearer all); - } - .product-options-wrapper { float: left; width: 55%; diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less index ff377a4b88acc..7d0b0c511aa0e 100644 --- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less @@ -27,7 +27,6 @@ & when (@media-common = true) { .gift-message { .field { - &:extend(.abs-clearfix all); margin-bottom: @indent__base; .label { diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less index cc6aba6f3566e..1b216bb988f4e 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less @@ -307,7 +307,6 @@ margin-right: 30px; &.print { - &:extend(.abs-action-print all); display: none; margin: 0; } @@ -585,6 +584,7 @@ .order-actions-toolbar { .action.print { + &:extend(.abs-action-print all); display: block; float: right; } @@ -705,7 +705,7 @@ } } -.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { +.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { .order-links { .item { margin: 0 @tab-control__margin-right 0 0; diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less index 396930cce6d86..58c9c0674b6ad 100644 --- a/lib/web/css/source/components/_modals.less +++ b/lib/web/css/source/components/_modals.less @@ -150,7 +150,6 @@ // Modals overlay .modals-overlay { - &:extend(.abs-modal-overlay all); .lib-css(z-index, @overlay__z-index); }