Skip to content

Commit 7249291

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

File tree

89 files changed

+2506
-2660
lines changed

Some content is hidden

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

89 files changed

+2506
-2660
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
&.action-back {
7373
// ToDo UI: Should be changed to ._back
7474
float: left;
75-
.vendor-prefix-order(-1);
75+
.mixin-vendor-prefix-order(-1);
7676
&:before {
7777
&:extend(.abs-icon all);
7878
content: @icon-back-arrow__content;
@@ -86,24 +86,24 @@
8686
// ToDo UI: Should be changed to .action-primary
8787
&:extend(.abs-action-primary all);
8888
&:extend(.abs-action-l all);
89-
.vendor-prefix-order(2);
89+
.mixin-vendor-prefix-order(2);
9090
}
9191
&.save {
9292
// ToDo UI: Should be changed to ._save
9393
&:not(.primary) {
94-
.vendor-prefix-order(1);
94+
.mixin-vendor-prefix-order(1);
9595
}
9696
}
9797
&.delete {
9898
// ToDo UI: Should be changed to ._delete
99-
.vendor-prefix-order(-1);
99+
.mixin-vendor-prefix-order(-1);
100100
}
101101
}
102102
.actions-split {
103103
&:extend(.abs-actions-split-xl all);
104104
float: right;
105105
margin-left: @_page-action__indent;
106-
.vendor-prefix-order(2);
106+
.mixin-vendor-prefix-order(2);
107107
.dropdown-menu {
108108
.item {
109109
display: block;
@@ -115,7 +115,7 @@
115115
.page-actions-buttons {
116116
float: right;
117117
justify-content: flex-end;
118-
.vendor-prefix-display(flex);
118+
.mixin-vendor-prefix-display(flex);
119119
.customer-index-edit & {
120120
background-color: transparent;
121121
}

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
z-index: 2;
283283
&:after,
284284
&:before {
285-
.arrow(
285+
.mixin-arrow(
286286
@_position: down,
287287
@_size: 15px,
288288
@_color: @admin__page-nav-tooltip__background

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
font-size: 1.7rem;
218218
}
219219
span {
220-
.visually-hidden();
220+
.mixin-visually-hidden();
221221
}
222222
}
223223
a {

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_dashboard.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
margin-bottom: 0;
170170
position: relative;
171171
&:before {
172-
.background-gradient(
172+
.mixin-background-gradient(
173173
@_background-gradient: true,
174174
@_background-gradient-direction: horizontal,
175175
@_background-gradient-color-start: rgba(255,255,255,0),

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
// Login box
2727
.page-layout-admin-login {
2828
align-items: center;
29-
.vendor-prefix-display(flex);
29+
.mixin-vendor-prefix-display(flex);
3030
background-color: @login-page__background-color;
3131
padding: 2rem 0 20rem;
3232
.page-wrapper {
33-
.vendor-prefix-flex-shrink(0);
34-
.vendor-prefix-flex-grow(0);
33+
.mixin-vendor-prefix-flex-shrink(0);
34+
.mixin-vendor-prefix-flex-grow(0);
3535
background-color: @login-box__background-color;
3636
border: @login-box__border;
3737
box-shadow: @login-box__shadow;

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

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

66
.product-actions {
7-
.clearfix();
7+
.mixin-clearfix();
88
.switcher {
99
float: right;
1010
}

app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/navigation-bar/_navigation-bar.less

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

8686
// Progress line tunnel
8787
&:before {
88-
.background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
88+
.mixin-background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
8989
border-bottom: 1px solid @nav-bar-bullet-wrap__border-bottom-color;
9090
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
9191
content: '';

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
.pager {
167167
text-align: left;
168168
padding-bottom: 10px;
169-
.clearfix();
169+
.mixin-clearfix();
170170
[data-part=left] {
171171
display: inline-block;
172172
width: 45%;
@@ -208,7 +208,7 @@
208208
text-align: center;
209209
}
210210
.actions-split {
211-
.clearfix();
211+
.mixin-clearfix();
212212
display: inline-block;
213213
position: relative;
214214
z-index: 100;
@@ -257,7 +257,7 @@
257257
}
258258
}
259259
> span {
260-
.visually-hidden();
260+
.mixin-visually-hidden();
261261
}
262262
}
263263
}

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_navigation-bar.less

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

9393
// Progress line tunnel
9494
&:before {
95-
.background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
95+
.mixin-background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
9696
border-bottom: 1px solid @nav-bar-bullet-wrap__border-bottom-color;
9797
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
9898
content: '';

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
color: @btn-prime__color;
103103
text-shadow: 1px 1px 0 rgba(0, 0, 0, .25);
104104
&:hover {
105-
.background-gradient(
105+
.mixin-background-gradient(
106106
@_background-gradient: true,
107107
@_background-gradient-direction: horizontal,
108108
@_background-gradient-color-start: @btn-prime__color-gradient-start,
@@ -111,7 +111,7 @@
111111
color: @btn-prime__color;
112112
}
113113
&:active {
114-
.background-gradient(
114+
.mixin-background-gradient(
115115
@_background-gradient: true,
116116
@_background-gradient-direction: horizontal,
117117
@_background-gradient-color-start: @btn-prime__color-gradient-end,

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_extends.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Clearfix
77

88
.abs-clearer {
9-
.clearer();
9+
.mixin-clearer();
1010
}
1111

1212
.extend__clearer() {

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_checkbox-radio.less

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

2121
.form-el-checkbox,
2222
.form-el-radio {
23-
.visually-hidden();
23+
.mixin-visually-hidden();
2424

2525
// Disabled state
2626

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/forms/_validation.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
.check-result-message {
4343
margin-left: .5em;
4444
min-height: @btn__height__base;
45-
.vendor-box-align(center);
46-
.vendor-prefix-display(flex);
45+
.mixin-vendor-box-align(center);
46+
.mixin-vendor-prefix-display(flex);
4747
}
4848

4949
.check-result-text {

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/utilities/_vendor-prefixes.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
.vendor-prefix-appearance (
6+
.mixin-vendor-prefix-appearance (
77
@value: none
88
) {
99
-webkit-appearance: @value;

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_customize-your-store.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.customize-your-store {
77
.customize-your-store-default {
88
.legend {
9-
.visually-hidden();
9+
.mixin-visually-hidden();
1010
}
1111
}
1212
.advanced-modules-select,

app/design/adminhtml/Magento/backend/web/css/source/_extends.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
// Visually hidden
5555
.abs-visually-hidden {
56-
.visually-hidden();
56+
.mixin-visually-hidden();
5757
}
5858

5959
.extend__visually-hidden() {
@@ -62,7 +62,7 @@
6262

6363
// Revert visually hidden
6464
.abs-visually-hidden-reset {
65-
.visually-hidden-reset();
65+
.mixin-visually-hidden-reset();
6666
}
6767

6868
.extend__visually-hidden-reset() {
@@ -71,12 +71,12 @@
7171

7272
// Clearfixes
7373
.abs-clearfix {
74-
.clearfix();
74+
.mixin-clearfix();
7575
}
7676

7777
// Clearer - clearing container using only :after element
7878
.abs-clearer {
79-
.clearer();
79+
.mixin-clearer();
8080
}
8181

8282
.extend__clearer() {

app/design/adminhtml/Magento/backend/web/css/source/_grid.less

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

7373
#mix-grid() {
7474
.row() {
75-
.clearer();
75+
.mixin-clearer();
7676
margin-left: ~'-@{temp_gutter}';
7777
}
7878
.return_length(@_columns-min, @_total: @temp_columns, @mathSymbol: '-') {

app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
right: .3rem;
7171
}
7272
> span {
73-
.visually-hidden();
73+
.mixin-visually-hidden();
7474
}
7575
}
7676
.action-menu {

app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
line-height: 3rem;
101101
top: 0;
102102
span {
103-
.visually-hidden();
103+
.mixin-visually-hidden();
104104
}
105105
&:before {
106106
color: #514943;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,24 +188,24 @@ option:empty {
188188

189189
// Control with additional prefix or suffix label
190190
.admin__control-addon {
191-
.vendor-prefix-display(inline-flex);
192-
.vendor-prefix-flex-direction(row);
191+
.mixin-vendor-prefix-display(inline-flex);
192+
.mixin-vendor-prefix-flex-direction(row);
193193
display: inline-flex;
194194
flex-flow: row nowrap;
195195
position: relative;
196196
width: 100%;
197197
z-index: 1;
198198
> [class*='admin__addon-'],
199199
> [class*='admin__control-'] {
200-
.vendor-prefix-flex-basis(auto);
201-
.vendor-prefix-flex-grow(0);
202-
.vendor-prefix-flex-shrink(0);
200+
.mixin-vendor-prefix-flex-basis(auto);
201+
.mixin-vendor-prefix-flex-grow(0);
202+
.mixin-vendor-prefix-flex-shrink(0);
203203
position: relative;
204204
z-index: 1;
205205
}
206206
[class*='admin__control-'] {
207207
.css(appearence,none);
208-
.vendor-prefix-flex-grow(1);
208+
.mixin-vendor-prefix-flex-grow(1);
209209
box-shadow: none;
210210
background-color: transparent;
211211
border-color: transparent;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
&:nth-child(n+2) {
286286
padding-left: 20px;
287287
&:not(.admin__field-option) .admin__field-label {
288-
.visually-hidden();
288+
.mixin-visually-hidden();
289289
}
290290
}
291291
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
right: -70px;
5151
&:after,
5252
&:before {
53-
.arrow(
53+
.mixin-arrow(
5454
@_position: down,
5555
@_size: 16px,
5656
@_color: @field-tooltip-content__border-color

app/design/adminhtml/Magento/backend/web/css/source/utilities/_grid.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
margin-left: auto;
1919
padding-left: (@gutter / 2);
2020
padding-right: (@gutter / 2);
21-
.clearer();
21+
.mixin-clearer();
2222
}
2323

2424
// Creates a wrapper for a series of columns
2525

2626
.make-row(@gutter: @grid-gutter-width) {
2727
margin-left: (@gutter / -2);
2828
margin-right: (@gutter / -2);
29-
.clearer();
29+
.mixin-clearer();
3030
}
3131

3232
//

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4090,7 +4090,7 @@ input.no-display,
40904090
}
40914091

40924092
.rule-chooser .field-row {
4093-
.clearfix();
4093+
.mixin-clearfix();
40944094
display: block;
40954095
margin-bottom: 17px;
40964096
.input-text {

app/design/adminhtml/Magento/backend/web/mui/styles/abstract.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,5 @@
132132
}
133133

134134
.add-clearer {
135-
.clearer();
135+
.mixin-clearer();
136136
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,11 @@
437437
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
438438
.catalog-product-view {
439439
.column.main {
440-
.vendor-prefix-display(flex);
441-
.vendor-prefix-flex-direction(column);
440+
.mixin-vendor-prefix-display(flex);
441+
.mixin-vendor-prefix-flex-direction(column);
442442
}
443443
.product.media {
444-
.vendor-prefix-order(-1);
444+
.mixin-vendor-prefix-order(-1);
445445
}
446446
}
447447
.product-info-main .box-tocart {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
position: static;
198198
padding-right: 35px;
199199
margin: 0;
200-
.input-placeholder(@form-element-input-placeholder__color);
200+
.mixin-input-placeholder(@form-element-input-placeholder__color);
201201
}
202202
.action.search {
203203
position: absolute;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,17 @@
160160
width: 60%;
161161
}
162162
.block-authentication {
163-
.vendor-prefix-display(flex);
164-
.vendor-prefix-flex-direction(row);
163+
.mixin-vendor-prefix-display(flex);
164+
.mixin-vendor-prefix-flex-direction(row);
165165
border-top: 1px solid @color-gray-light5;
166166
}
167167
.block[class],
168168
.form-login,
169169
.fieldset,
170170
.block-content {
171-
.vendor-prefix-display(flex);
172-
.vendor-prefix-flex-direction(column);
173-
.vendor-prefix-flex-grow(1);
171+
.mixin-vendor-prefix-display(flex);
172+
.mixin-vendor-prefix-flex-direction(column);
173+
.mixin-vendor-prefix-flex-grow(1);
174174
}
175175
.block[class] {
176176
box-sizing: border-box;

0 commit comments

Comments
 (0)