Skip to content

Commit f6e0bc3

Browse files
committed
Merge remote-tracking branch '36101/restore-reference-directive-for-extends-file' into comm_voted
2 parents d2cd3ef + 45a9bec commit f6e0bc3

File tree

2 files changed

+38
-26
lines changed

2 files changed

+38
-26
lines changed

app/design/frontend/Magento/blank/web/css/source/_extends.less

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
// List default styles reset
1212
// ---------------------------------------------
1313

14+
/**
15+
* @codingStandardsIgnoreStart
16+
*/
1417
& when (@media-common = true) {
1518
.abs-reset-list {
1619
.lib-list-reset-styles();
@@ -177,13 +180,17 @@
177180
// Abstract block title
178181
// ---------------------------------------------
179182

183+
@abs-block-title: {
184+
margin-bottom: 15px;
185+
186+
> strong {
187+
.lib-heading(h3);
188+
}
189+
};
190+
180191
& when (@media-common = true) {
181192
.abs-block-title {
182-
margin-bottom: 15px;
183-
184-
> strong {
185-
.lib-heading(h3);
186-
}
193+
@abs-block-title();
187194
}
188195
}
189196

@@ -194,7 +201,7 @@
194201
& when (@media-common = true) {
195202
.abs-account-blocks {
196203
.block-title {
197-
&:extend(.abs-block-title all);
204+
@abs-block-title();
198205

199206
> .action {
200207
margin-left: 15px;
@@ -330,13 +337,35 @@
330337
}
331338
}
332339

340+
//
341+
// Button as a link
342+
// ---------------------------------------------
343+
344+
@abs-action-button-as-link: {
345+
.lib-button-as-link(@_margin: false);
346+
border-radius: 0;
347+
font-size: inherit;
348+
font-weight: @font-weight__regular;
349+
350+
&:active,
351+
&:not(:focus) {
352+
box-shadow: none;
353+
}
354+
};
355+
356+
& when (@media-common = true) {
357+
.abs-action-button-as-link {
358+
@abs-action-button-as-link();
359+
}
360+
}
361+
333362
//
334363
// Action with icon remove with text
335364
// ---------------------------------------------
336365

337366
& when (@media-common = true) {
338367
.abs-action-remove {
339-
&:extend(.abs-action-button-as-link all);
368+
@abs-action-button-as-link();
340369
left: @indent__s;
341370
margin-left: 70%;
342371
position: absolute;
@@ -677,24 +706,6 @@
677706
}
678707
}
679708

680-
//
681-
// Button as a link
682-
// ---------------------------------------------
683-
684-
& when (@media-common = true) {
685-
.abs-action-button-as-link {
686-
.lib-button-as-link(@_margin: false);
687-
border-radius: 0;
688-
font-size: inherit;
689-
font-weight: @font-weight__regular;
690-
691-
&:active,
692-
&:not(:focus) {
693-
box-shadow: none;
694-
}
695-
}
696-
}
697-
698709
//
699710
// Button revert secondary color
700711
// ---------------------------------------------
@@ -1446,3 +1457,4 @@
14461457
}
14471458
}
14481459
}
1460+
//@codingStandardsIgnoreEnd

app/design/frontend/Magento/blank/web/css/source/_sources.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// */
55

66
@import '_variables.less';
7-
@import '_extends.less';
7+
@import (reference) '_extends.less';
88
@import '_typography.less';
99
@import '_layout.less';
1010
@import '_tables.less';

0 commit comments

Comments
 (0)