Skip to content

Commit f19ad00

Browse files
zanileezanilee
committed
MAGETWO-40722: Rename lib mixins using "mixin-" prefix
1 parent 7249291 commit f19ad00

File tree

119 files changed

+1462
-1462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1462
-1462
lines changed

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
padding: 0;
5757
border: 1px solid @admin__color2;
5858
@_shadow: 0 0 4px rgba(50, 50, 50, .35);
59-
.css(box-shadow, @_shadow);
59+
.mixin-css(box-shadow, @_shadow);
6060
margin: 0 0 40px;
6161
background: #f7f7f7;
6262
}

‎app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
// Select styles
5959
.admin__control-select {
6060
&:extend(.abs-form-control-pattern all);
61-
.css(appearance, none, 1);
61+
.mixin-css(appearance, none, 1);
6262

6363
background-repeat: no-repeat;
6464
background-image+: url('../images/arrows-bg.svg');
@@ -204,7 +204,7 @@ option:empty {
204204
z-index: 1;
205205
}
206206
[class*='admin__control-'] {
207-
.css(appearence,none);
207+
.mixin-css(appearence,none);
208208
.mixin-vendor-prefix-flex-grow(1);
209209
box-shadow: none;
210210
background-color: transparent;

‎app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272

7373
.abs-admin__field-tooltip-content {
7474
@_shadow: 0 2px 8px 0 rgba(0, 0, 0, .3);
75-
.css(box-shadow, @_shadow);
75+
76+
.mixin-css(box-shadow, @_shadow);
7677
background: @field-tooltip-content__background-color;
7778
border-radius: 1px;
7879
border: 1px solid @field-tooltip-content__border-color;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ input.no-display,
803803

804804
select {
805805
&:not([multiple]) {
806-
.css(appearance, none, 1);
806+
.mixin-css(appearance, none, 1);
807807

808808
display: inline-block;
809809
line-height: normal;

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
}
5353

5454
.block-bundle-summary {
55-
padding: @indent__s @indent__base;
56-
.css(background, @secondary__color);
5755
&:extend(.abs-add-box-sizing all);
56+
.mixin-css(background, @secondary__color);
57+
padding: @indent__s @indent__base;
5858

5959
> .title > strong {
6060
.mixin-heading(h2);
@@ -97,15 +97,15 @@
9797
.nested {
9898
.field.qty {
9999
.label {
100-
.css(font-weight, @form-field-label__font-weight);
101-
.css(margin, 0 0 @indent__xs);
100+
.mixin-css(font-weight, @form-field-label__font-weight);
101+
.mixin-css(margin, 0 0 @indent__xs);
102102
display: inline-block;
103103
}
104-
.css(margin-top, @form-field__vertical-indent);
104+
.mixin-css(margin-top, @form-field__vertical-indent);
105105
}
106106
}
107107
p.required {
108-
.css(color, @form-field-label-asterisk__color);
108+
.mixin-css(color, @form-field-label-asterisk__color);
109109
}
110110
}
111111

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@
132132
max-width: 100%;
133133
}
134134
.notice {
135-
margin: @indent__s 0;
136-
.css(color, @text__color__muted);
135+
.mixin-css(color, @text__color__muted);
137136
.mixin-font-size(@font-size__s);
137+
margin: @indent__s 0;
138138
}
139139
.product.thumbs {
140140
margin: @indent__base 0 @indent__l;
@@ -184,7 +184,7 @@
184184
&.sku {
185185
display: inline-block;
186186
vertical-align: top;
187-
.css(color, @text__color__muted);
187+
.mixin-css(color, @text__color__muted);
188188
> .value {
189189
display: inline-block;
190190
vertical-align: top;
@@ -212,11 +212,11 @@
212212
.product-options-wrapper {
213213
.fieldset-product-options-inner {
214214
.legend {
215+
.mixin-css(font-weight, @font-weight__bold);
216+
.mixin-css(margin, 0 0 @indent__xs);
217+
.mixin-font-size(14px);
215218
border: none;
216-
.css(font-weight, @font-weight__bold);
217-
.css(margin, 0 0 @indent__xs);
218219
display: inline-block;
219-
.mixin-font-size(14px);
220220
float: none;
221221
padding: 0;
222222
}
@@ -232,7 +232,7 @@
232232
@_line-height: @form-field-label-asterisk__line-height,
233233
@_font-style: @form-field-label-asterisk__font-style
234234
);
235-
.css(margin, @form-field-label-asterisk__margin);
235+
.mixin-css(margin, @form-field-label-asterisk__margin);
236236
}
237237
}
238238
}
@@ -310,9 +310,9 @@
310310

311311
.prices-tier {
312312
&:extend(.abs-reset-list all);
313-
.css(background, @sidebar__background-color);
314-
padding: @indent__s (.75 * @indent__base);
313+
.mixin-css(background, @sidebar__background-color);
315314
margin: @indent__s 0;
315+
padding: @indent__s (.75 * @indent__base);
316316
.price-tier_price {
317317
display: inline-block;
318318
}
@@ -374,7 +374,7 @@
374374
margin-right: 8px;
375375
}
376376
.counter {
377-
.css(color, @primary__color__lighter);
377+
.mixin-css(color, @primary__color__lighter);
378378
.mixin-font-size(12);
379379
white-space: nowrap;
380380
}
@@ -694,12 +694,12 @@
694694
}
695695

696696
.comparison.headings {
697+
.mixin-css(background, @page__background-color);
698+
left: 0;
697699
position: absolute;
698-
z-index: 2;
699700
top: 0;
700-
left: 0;
701701
width: auto;
702-
.css(background, @page__background-color);
702+
z-index: 2;
703703
}
704704

705705
.block-compare {

‎app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
.minimal-price-link {
137137
margin-top: 5px;
138138
.price-label {
139-
.css(color, @link__color);
139+
.mixin-css(color, @link__color);
140140
.mixin-font-size(14);
141141
}
142142
.price {

‎app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less

+7-7
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,23 @@
125125
&:extend(.abs-visually-hidden-desktop-s all);
126126
}
127127
&-mode {
128-
float: left;
128+
.mixin-css(color, @text__color__muted);
129129
border: 1px solid @border-color__base;
130+
border-right: 0;
131+
float: left;
130132
font-weight: @font-weight__regular;
131-
.css(color, @text__color__muted);
132-
text-align: center;
133-
padding: 7px 10px;
134133
line-height: 1;
135-
border-right: 0;
134+
padding: 7px 10px;
135+
text-align: center;
136136
&:not(.active):hover {
137137
background: darken(@toolbar-element-background, 7%);
138-
.css(color, @text__color__muted);
138+
.mixin-css(color, @text__color__muted);
139139
}
140140
&:last-child {
141141
border-right: 1px solid @border-color__base;
142142
}
143143
&.active {
144-
.css(color, @primary__color__light);
144+
.mixin-css(color, @primary__color__light);
145145
}
146146
.mixin-icon-font(
147147
@icon-grid,

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@
7676
.mixin-list-reset-styles();
7777
li {
7878
&:not(:empty) {
79-
.css(background, @autocomplete-background);
80-
.css(border, @autocomplete-border);
79+
.mixin-css(background, @autocomplete-background);
80+
.mixin-css(border, @autocomplete-border);
8181
border-top: 0;
8282
}
83-
.css(border-top, @autocomplete-item-border);
83+
.mixin-css(border-top, @autocomplete-item-border);
8484
cursor: pointer;
85-
padding: @indent__xs @indent__xl @indent__xs @indent__s;
8685
margin: 0;
86+
padding: @indent__xs @indent__xl @indent__xs @indent__s;
8787
position: relative;
8888
text-align: left;
8989
white-space: normal;
@@ -92,10 +92,10 @@
9292
}
9393
&:hover,
9494
&.selected {
95-
.css(background, @autocomplete-item-hover);
95+
.mixin-css(background, @autocomplete-item-hover);
9696
}
9797
.amount {
98-
.css(color, @autocomplete-item-amount-color);
98+
.mixin-css(color, @autocomplete-item-amount-color);
9999
position: absolute;
100100
right: 7px;
101101
top: @indent__xs;
@@ -213,7 +213,7 @@
213213
.mixin-button-reset();
214214
&:focus {
215215
&:before {
216-
.css(color, @color-gray20);
216+
.mixin-css(color, @color-gray20);
217217
}
218218
}
219219
padding: @indent__xs 0;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// Summary block
1818
&-summary {
1919
&:extend(.abs-add-box-sizing all);
20-
.css(background, @sidebar__background-color);
20+
.mixin-css(background, @sidebar__background-color);
2121
margin-bottom: @indent__m;
2222
padding: 1px 15px @indent__m;
2323
> .title {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
);
108108
float: right;
109109
.block-minicart {
110-
.css(padding, 25px @minicart__padding-horizontal);
110+
.mixin-css(padding, 25px @minicart__padding-horizontal);
111111
right: 0;
112112
width: 320px;
113113
.block-title {
@@ -152,8 +152,8 @@
152152
.counter.qty {
153153
border-radius: 2px;
154154
clip: none;
155-
.css(color, @page__background-color);
156-
.css(background, @active__color);
155+
.mixin-css(color, @page__background-color);
156+
.mixin-css(background, @active__color);
157157
display: inline-block;
158158
height: 24px;
159159
line-height: 24px;
@@ -180,8 +180,8 @@
180180
.minicart-items-wrapper {
181181
border-left: 0;
182182
border-right: 0;
183-
.css(margin, 0 -@minicart__padding-horizontal);
184-
.css(border, 1px solid @minicart__border-color);
183+
.mixin-css(margin, 0 -@minicart__padding-horizontal);
184+
.mixin-css(border, 1px solid @minicart__border-color);
185185
overflow-x: auto;
186186
padding: 15px;
187187
}
@@ -191,7 +191,7 @@
191191
.product-item {
192192
padding: @indent__base 0;
193193
&:not(:first-child) {
194-
.css(border-top, 1px solid @minicart__border-color);
194+
.mixin-css(border-top, 1px solid @minicart__border-color);
195195
}
196196
&:first-child {
197197
padding-top: 0;
@@ -247,7 +247,7 @@
247247
font-weight: @font-weight__regular;
248248
margin: 0 0 @indent__s;
249249
a {
250-
.css(color, @link__color);
250+
.mixin-css(color, @link__color);
251251
}
252252
}
253253
.product-item-details {

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
padding-top: @indent__xl;
8282
position: relative;
8383
&::before {
84-
.css(height, @block-auth__or-label__size);
85-
.css(line-height, @block-auth__or-label__size - 2px);
86-
.css(margin, -(@block-auth__or-label__size/2 + 1px) 0 0 -(@block-auth__or-label__size / 2));
87-
.css(min-width, @block-auth__or-label__size);
84+
.mixin-css(height, @block-auth__or-label__size);
85+
.mixin-css(line-height, @block-auth__or-label__size - 2px);
86+
.mixin-css(margin, -(@block-auth__or-label__size/2 + 1px) 0 0 -(@block-auth__or-label__size / 2));
87+
.mixin-css(min-width, @block-auth__or-label__size);
8888
background: @color-white;
8989
border-radius: 50%;
9090
border: 1px solid @color-gray-light5;
@@ -111,8 +111,8 @@
111111

112112
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
113113
.authentication-dropdown {
114-
.css(background-color, @block-auth__dropdown__background-color);
115-
.css(border, @block-auth__border);
114+
.mixin-css(background-color, @block-auth__dropdown__background-color);
115+
.mixin-css(border, @block-auth__border);
116116
position: absolute;
117117
text-align: left;
118118
top: 100%;
@@ -122,7 +122,7 @@
122122
visibility: hidden;
123123
width: 100%;
124124
&._show {
125-
.css(z-index, @dropdown-list__z-index);
125+
.mixin-css(z-index, @dropdown-list__z-index);
126126
transform: scale(1,1);
127127
transition: transform linear .1s, visibility 0s linear 0s;
128128
visibility: visible;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
.checkout-container {
2727
&:extend(.abs-add-clearfix all);
28-
.css(margin, 0 0 @checkout-wrapper__margin);
28+
.mixin-css(margin, 0 0 @checkout-wrapper__margin);
2929
}
3030

3131
.opc-wrapper {
32-
.css(margin, 0 0 @checkout-wrapper__margin);
32+
.mixin-css(margin, 0 0 @checkout-wrapper__margin);
3333

3434
.opc {
3535
&:extend(.abs-reset-list all);
@@ -62,7 +62,7 @@
6262
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
6363
.opc-wrapper {
6464
.step-title {
65-
.css(font-size, @checkout-step-title-mobile__font-size);
65+
.mixin-css(font-size, @checkout-step-title-mobile__font-size);
6666
border-bottom: 0;
6767
padding-bottom: 0;
6868
}

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
.opc-estimated-wrapper {
1717
&:extend(.abs-add-clearfix all);
1818
&:extend(.abs-no-display-desktop all);
19-
.css(border-bottom, @border-width__base solid @color-gray80);
19+
.mixin-css(border-bottom, @border-width__base solid @color-gray80);
2020
margin: 0 0 15px;
2121
padding: 18px 15px;
2222

2323
.estimated-block {
24-
.css(font-size, @checkout-step-title-mobile__font-size);
25-
.css(font-weight, @font-weight__bold);
24+
.mixin-css(font-size, @checkout-step-title-mobile__font-size);
25+
.mixin-css(font-weight, @font-weight__bold);
2626
float: left;
2727

2828
.estimated-label {
@@ -35,7 +35,7 @@
3535
.action {
3636
&.showcart {
3737
&:before {
38-
.css(color, @primary__color);
38+
.mixin-css(color, @primary__color);
3939
}
4040
}
4141
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
input,
2626
select,
2727
textarea {
28-
.css(border-color, @checkout-field-validation__border-color);
28+
.mixin-css(border-color, @checkout-field-validation__border-color);
2929
}
3030
}
3131
}

0 commit comments

Comments
 (0)