From 3ca077faf68cebd94122efd96da3512bfe844e15 Mon Sep 17 00:00:00 2001 From: Serhii Chernenko Date: Mon, 14 Feb 2022 16:41:49 +0200 Subject: [PATCH 1/2] reference directive restored for _extends.less. extends replaced to mixins in _extend.less --- .../blank/web/css/source/_extends.less | 58 +++++++++++-------- .../blank/web/css/source/_sources.less | 2 +- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index 32e18921a1c48..a3b38fe35789e 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -177,13 +177,17 @@ // Abstract block title // --------------------------------------------- +@abs-block-title: { + margin-bottom: 15px; + + > strong { + .lib-heading(h3); + } +}; + & when (@media-common = true) { .abs-block-title { - margin-bottom: 15px; - - > strong { - .lib-heading(h3); - } + @abs-block-title(); } } @@ -194,7 +198,7 @@ & when (@media-common = true) { .abs-account-blocks { .block-title { - &:extend(.abs-block-title all); + @abs-block-title(); > .action { margin-left: 15px; @@ -330,13 +334,35 @@ } } +// +// Button as a link +// --------------------------------------------- + +@abs-action-button-as-link: { + .lib-button-as-link(@_margin: false); + border-radius: 0; + font-size: inherit; + font-weight: @font-weight__regular; + + &:active, + &:not(:focus) { + box-shadow: none; + } +}; + +& when (@media-common = true) { + .abs-action-button-as-link { + @abs-action-button-as-link(); + } +} + // // Action with icon remove with text // --------------------------------------------- & when (@media-common = true) { .abs-action-remove { - &:extend(.abs-action-button-as-link all); + @abs-action-button-as-link(); left: @indent__s; margin-left: 70%; position: absolute; @@ -677,24 +703,6 @@ } } -// -// Button as a link -// --------------------------------------------- - -& when (@media-common = true) { - .abs-action-button-as-link { - .lib-button-as-link(@_margin: false); - border-radius: 0; - font-size: inherit; - font-weight: @font-weight__regular; - - &:active, - &:not(:focus) { - box-shadow: none; - } - } -} - // // Button revert secondary color // --------------------------------------------- diff --git a/app/design/frontend/Magento/blank/web/css/source/_sources.less b/app/design/frontend/Magento/blank/web/css/source/_sources.less index 0e8c4b356a927..af7eda617217a 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_sources.less +++ b/app/design/frontend/Magento/blank/web/css/source/_sources.less @@ -4,7 +4,7 @@ // */ @import '_variables.less'; -@import '_extends.less'; +@import (reference) '_extends.less'; @import '_typography.less'; @import '_layout.less'; @import '_tables.less'; From 45a9bec664b87a1a8b717401337346e7e17cc828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cengcom-Echo=E2=80=9D?= Date: Tue, 24 Jan 2023 17:34:59 +0530 Subject: [PATCH 2/2] Fixed static test failure --- .../frontend/Magento/blank/web/css/source/_extends.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index a3b38fe35789e..aa934282ad7b6 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -11,6 +11,9 @@ // List default styles reset // --------------------------------------------- +/** + * @codingStandardsIgnoreStart + */ & when (@media-common = true) { .abs-reset-list { .lib-list-reset-styles(); @@ -1454,3 +1457,4 @@ } } } +//@codingStandardsIgnoreEnd