Skip to content

Commit 35e5bab

Browse files
zanileezanilee
committed
MAGETWO-40722: Rename lib mixins using "mixin-" prefix
1 parent b145248 commit 35e5bab

File tree

27 files changed

+335
-339
lines changed

27 files changed

+335
-339
lines changed

‎app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4788,7 +4788,6 @@ input.no-display,
47884788
}
47894789
}
47904790

4791-
47924791
//
47934792
// Products
47944793
// --------------------------------------

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
}
130130
}
131131
.authentication-wrapper {
132-
.column-width(@checkout-sidebar__columns);
132+
.mixin-column-width(@checkout-sidebar__columns);
133133
text-align: right;
134134
}
135135
.block-authentication {

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
7777
.opc-wrapper {
7878
&:extend(.abs-add-box-sizing-desktop-m all);
79-
.layout-column(2, 1, @checkout-wrapper__columns);
79+
.mixin-layout-column(2, 1, @checkout-wrapper__columns);
8080
padding-right: @indent__l;
8181
}
8282
}

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
1919
.opc-sidebar {
2020
.css(margin, @checkout-sidebar__margin__xl 0 @checkout-sidebar__margin);
21-
.layout-column(2, 2, @checkout-sidebar__columns);
21+
.mixin-layout-column(2, 2, @checkout-sidebar__columns);
2222
}
2323
}

‎app/design/frontend/Magento/blank/web/css/source/_layout.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
& when (@media-common = true) {
1414

1515
.columns {
16-
#layout-columns();
16+
#mixin-layout-columns();
1717
.column.main {
1818
&:extend(.abs-add-box-sizing all);
1919
.vendor-prefix-flex-grow(1);
@@ -100,13 +100,13 @@
100100
}
101101

102102
.column.main {
103-
#layout-columns > .main();
103+
#mixin-layout-columns > .main();
104104
&:extend(.abs-add-box-sizing-desktop all);
105105
min-height: 300px;
106106
}
107107

108108
.sidebar-main {
109-
#layout-columns > .left();
109+
#mixin-layout-columns > .left();
110110
padding-right: @layout-column-main__sidebar-offset;
111111
&:extend(.abs-add-box-sizing-desktop all);
112112
}
@@ -117,7 +117,7 @@
117117
}
118118

119119
.sidebar-additional {
120-
#layout-columns > .right();
120+
#mixin-layout-columns > .right();
121121
padding-left: @layout-column__additional-sidebar-offset;
122122
clear: right;
123123
&:extend(.abs-add-box-sizing-desktop all);

‎app/design/frontend/Magento/blank/web/css/source/_popups.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
.css(bottom, @popup-button-close__position-bottom);
2525
.css(left, @popup-button-close__position-left);
2626
z-index: 1001;
27-
._popup-button-close-icon(
27+
._mixin-popup-button-close-icon(
2828
@popup-button-close__icon,
2929
@popup-icon-font__content,
3030
@popup-icon-font,
@@ -38,7 +38,7 @@
3838
@popup-icon-font__position,
3939
@popup-icon-font__text-hide
4040
);
41-
._popup-button-close-reset(
41+
._mixin-popup-button-close-reset(
4242
@popup-button-close__reset
4343
);
4444
}

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@
520520

521521
// Summary block
522522
&-summary {
523-
.layout-column(2, 2, @layout-column-checkout__width-left);
523+
.mixin-layout-column(2, 2, @layout-column-checkout__width-left);
524524
padding: 1px @indent__base @indent__m;
525525
position: relative;
526526
> .title {
@@ -594,7 +594,7 @@
594594
// Discount
595595
&-discount {
596596
border: 0;
597-
.layout-column(2, 1, @layout-column-checkout__width-main);
597+
.mixin-layout-column(2, 1, @layout-column-checkout__width-main);
598598
&:extend(.abs-add-box-sizing-desktop all);
599599
padding-right: 4%;
600600
.block {
@@ -633,7 +633,7 @@
633633

634634
// Cross sell
635635
.block.crosssell {
636-
.layout-column(2, 1, @layout-column-checkout__width-main);
636+
.mixin-layout-column(2, 1, @layout-column-checkout__width-main);
637637
&:extend(.abs-add-box-sizing-desktop all);
638638
padding: 0 4% 0 0;
639639
.products-grid .product-item {

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
8585
.opc-wrapper {
8686
&:extend(.abs-add-box-sizing-desktop-m all);
87-
.layout-column(2, 1, @checkout-wrapper__columns);
87+
.mixin-layout-column(2, 1, @checkout-wrapper__columns);
8888
padding-right: @indent__l;
8989
}
9090
}

‎app/design/frontend/Magento/luma/web/css/source/_extends.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@
13751375

13761376
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
13771377
.abs-shopping-cart-items-desktop {
1378-
.layout-column(2, 1, @layout-column-checkout__width-main);
1378+
.mixin-layout-column(2, 1, @layout-column-checkout__width-main);
13791379
&:extend(.abs-add-box-sizing-desktop all);
13801380
padding-right: 4%;
13811381
position: relative;

‎app/design/frontend/Magento/luma/web/css/source/_popups.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
.css(bottom, @popup-button-close__position-bottom);
2525
.css(left, @popup-button-close__position-left);
2626
z-index: 1001;
27-
._popup-button-close-icon(
27+
._mixin-popup-button-close-icon(
2828
@popup-button-close__icon,
2929
@popup-icon-font__content,
3030
@popup-icon-font,
@@ -38,7 +38,7 @@
3838
@popup-icon-font__position,
3939
@popup-icon-font__text-hide
4040
);
41-
._popup-button-close-reset(
41+
._mixin-popup-button-close-reset(
4242
@popup-button-close__reset
4343
);
4444
}

‎lib/web/css/docs/source/layout.less

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,17 @@ footer.footer {
169169
//
170170
// Default properties for page columns are generated using alias mixins:
171171
//
172-
// <code>#layout-columns</code> - sets columns container
172+
// <code>#mixin-layout-columns</code> - sets columns container
173173
//
174-
// <code>#layout-columns > .main()</code> - alias for main column
174+
// <code>#mixin-layout-columns > .main()</code> - alias for main column
175175
//
176-
// <code>#layout-columns > .left()</code> - alias for left column
176+
// <code>#mixin-layout-columns > .left()</code> - alias for left column
177177
//
178-
// <code>#layout-columns > .right()</code> - alias for right column
178+
// <code>#mixin-layout-columns > .right()</code> - alias for right column
179179
//
180-
// <code>#layout-columns > .reset()</code> - column width and order reset may be used in RWD
180+
// <code>#mixin-layout-columns > .reset()</code> - column width and order reset may be used in RWD
181181
//
182-
// These aliases use default class names for layouts predefined in vars (i.e. <code>@layout-class-3columns: layout-3</code>) and general column mixin *[<code>.layout-column()</code>](#layout-column)*
182+
// These aliases use default class names for layouts predefined in vars (i.e. <code>@layout-class-3columns: layout-3</code>) and general column mixin *[<code>.mixin-layout-column()</code>](#layout-column)*
183183
//
184184
// ## Three columns page layout
185185
//
@@ -241,7 +241,7 @@ footer.footer {
241241
// ```
242242

243243
.columns {
244-
#layout-columns();
244+
#mixin-layout-columns();
245245
> .column {
246246
&:extend(.add-box-sizing all);
247247
.css(padding-bottom, @indent__xl);
@@ -250,15 +250,15 @@ footer.footer {
250250

251251
@media (min-width: 600px) {
252252
.column.main {
253-
#layout-columns > .main();
253+
#mixin-layout-columns > .main();
254254
}
255255

256256
.column.left {
257-
#layout-columns > .left();
257+
#mixin-layout-columns > .left();
258258
}
259259

260260
.column.right {
261-
#layout-columns > .right();
261+
#mixin-layout-columns > .right();
262262
}
263263
}
264264

@@ -285,11 +285,11 @@ footer.footer {
285285
// To move main column to the left, change 2nd argument <code>@_order</code> for main and left columns:
286286
//
287287
// ```less
288-
// .column.main {
289-
// .layout-column(3, 1, 60%);
288+
// .mixin-column.main {
289+
// .mixin-layout-column(3, 1, 60%);
290290
// }
291-
// .column.left {
292-
// .layout-column(3, 2, 20%);
291+
// .mixin-column.left {
292+
// .mixin-layout-column(3, 2, 20%);
293293
// }
294294
// ```
295295
//
@@ -309,25 +309,25 @@ footer.footer {
309309

310310
.layout-example-3 {
311311
.column.main {
312-
.layout-column(3, 2, 60%);
312+
.mixin-layout-column(3, 2, 60%);
313313
}
314314
.column.left {
315-
.layout-column(3, 1, 20%);
315+
.mixin-layout-column(3, 1, 20%);
316316
}
317317
.column.right {
318-
.layout-column(3, 3, 20%);
318+
.mixin-layout-column(3, 3, 20%);
319319
}
320320
}
321321

322322
.layout-example-3-1 {
323323
.column.main {
324-
.layout-column(3, 1, 60%);
324+
.mixin-layout-column(3, 1, 60%);
325325
}
326326
.column.left {
327-
.layout-column(3, 2, 20%);
327+
.mixin-layout-column(3, 2, 20%);
328328
}
329329
.column.right {
330-
.layout-column(3, 3, 20%);
330+
.mixin-layout-column(3, 3, 20%);
331331
}
332332
}
333333

@@ -360,7 +360,7 @@ footer.footer {
360360

361361
// # Layout width
362362
//
363-
// The <code>.layout-width()</code> mixin is used to set default page width of the element the mixin is applyed to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
363+
// The <code>.mixin-layout-width()</code> mixin is used to set default page width of the element the mixin is applyed to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
364364

365365
// # Layout width variables
366366
// <pre>

‎lib/web/css/source/lib/_actions-toolbar.less

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
.clearfix();
2323
.css(margin, @_actions-toolbar-margin);
2424
.css(padding, @_actions-toolbar-padding);
25-
._actions-toolbar-align(@_actions-toolbar-actions-position);
26-
._actions-toolbar-floats(@_actions-toolbar-actions-position, @_actions-toolbar-actions-reverse);
25+
._mixin-actions-toolbar-align(@_actions-toolbar-actions-position);
26+
._mixin-actions-toolbar-floats(@_actions-toolbar-actions-position, @_actions-toolbar-actions-reverse);
2727
.primary,
2828
.secondary {
2929
display: inline-block;
@@ -69,11 +69,11 @@
6969
// Internal use mixins
7070
// ---------------------------------------------
7171

72-
._actions-toolbar-align(@_actions-toolbar-actions-position) when not (@_actions-toolbar-actions-position = justify) {
72+
._mixin-actions-toolbar-align(@_actions-toolbar-actions-position) when not (@_actions-toolbar-actions-position = justify) {
7373
.css(text-align, @_actions-toolbar-actions-position);
7474
}
7575

76-
._actions-toolbar-floats(
76+
._mixin-actions-toolbar-floats(
7777
@_actions-toolbar-actions-position,
7878
@_actions-toolbar-actions-reverse
7979
) when (@_actions-toolbar-actions-position = justify) and (@_actions-toolbar-actions-reverse = false) {
@@ -85,7 +85,7 @@
8585
}
8686
}
8787

88-
._actions-toolbar-floats(
88+
._mixin-actions-toolbar-floats(
8989
@_actions-toolbar-actions-position,
9090
@_actions-toolbar-actions-reverse
9191
) when (@_actions-toolbar-actions-position = justify) and (@_actions-toolbar-actions-reverse = true) {
@@ -97,7 +97,7 @@
9797
}
9898
}
9999

100-
._actions-toolbar-floats(
100+
._mixin-actions-toolbar-floats(
101101
@_actions-toolbar-actions-position,
102102
@_actions-toolbar-actions-reverse
103103
) when (@_actions-toolbar-actions-position = left) and (@_actions-toolbar-actions-reverse = false) {
@@ -106,7 +106,7 @@
106106
}
107107
}
108108

109-
._actions-toolbar-floats(
109+
._mixin-actions-toolbar-floats(
110110
@_actions-toolbar-actions-position,
111111
@_actions-toolbar-actions-reverse
112112
) when (@_actions-toolbar-actions-position = left) and (@_actions-toolbar-actions-reverse = true) {
@@ -115,7 +115,7 @@
115115
}
116116
}
117117

118-
._actions-toolbar-floats(
118+
._mixin-actions-toolbar-floats(
119119
@_actions-toolbar-actions-position,
120120
@_actions-toolbar-actions-reverse
121121
) when (@_actions-toolbar-actions-position = right) and (@_actions-toolbar-actions-reverse = false) {
@@ -124,7 +124,7 @@
124124
}
125125
}
126126

127-
._actions-toolbar-floats(
127+
._mixin-actions-toolbar-floats(
128128
@_actions-toolbar-actions-position,
129129
@_actions-toolbar-actions-reverse
130130
) when (@_actions-toolbar-actions-position = right) and (@_actions-toolbar-actions-reverse = true) {
@@ -133,7 +133,7 @@
133133
}
134134
}
135135

136-
._actions-toolbar-floats(
136+
._mixin-actions-toolbar-floats(
137137
@_actions-toolbar-actions-position,
138138
@_actions-toolbar-actions-reverse
139139
) when (@_actions-toolbar-actions-position = center) {

‎lib/web/css/source/lib/_buttons.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
.mixin-line-height(@_button-line-height);
7777
box-sizing: border-box;
7878
vertical-align: middle;
79-
._button-icon (
79+
._mixin-button-icon (
8080
@_button-icon-use: @_button-icon-use,
8181
@_icon-font-content: @_button-font-content,
8282
@_icon-font: @_button-icon-font,
@@ -366,7 +366,7 @@
366366
// Inner buttons mixins
367367
// ---------------------------------------------
368368

369-
._button-icon (
369+
._mixin-button-icon (
370370
@_button-icon-use: @button-icon__use,
371371
@_icon-font-content: @button-icon__content,
372372
@_icon-font: @button-icon__font,

0 commit comments

Comments
 (0)