Skip to content

Commit 9936977

Browse files
zanileezanilee
committed
MAGETWO-40722: Rename lib mixins using "mixin-" prefix
- "mixin-" prefix is replaced to "lib-" prefix
1 parent 1e51a4b commit 9936977

File tree

207 files changed

+3378
-3338
lines changed

Some content is hidden

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

207 files changed

+3378
-3338
lines changed

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

+108-108
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,108 @@
1-
// /**
2-
// * Copyright © 2015 Magento. All rights reserved.
3-
// * See COPYING.txt for license details.
4-
// */
5-
6-
//
7-
// Page footer
8-
// _____________________________________________
9-
10-
@footer__background-color: @body__background-color;
11-
@footer__border-color: @color-light-gray;
12-
@footer__border-width: .1rem;
13-
@footer__color: @color-very-dark-gray1;
14-
@footer-version__color: @color-gray40;
15-
@footer-copyright__color: @color-gray40;
16-
17-
@footer-link__color: @color-light-phoenix;
18-
@footer-link__text-decoration: underline;
19-
20-
@footer-link__hover__color: @color-light-phoenix;
21-
@footer-link__hover__text-decoration: underline;
22-
23-
.page-footer {
24-
background-color: @footer__background-color;
25-
border-top: @footer__border-width solid @footer__border-color;
26-
color: @footer__color;
27-
margin-top: auto;
28-
padding: 2.6rem 2rem 6rem 3rem;
29-
a {
30-
.mixin-link(
31-
@_link-color: @footer-link__color,
32-
@_link-text-decoration: @footer-link__text-decoration,
33-
@_link-color-visited: false,
34-
@_link-text-decoration-visited: false,
35-
@_link-color-hover: @footer-link__color,
36-
@_link-text-decoration-hover: false,
37-
@_link-color-active: false,
38-
@_link-text-decoration-active: false
39-
);
40-
}
41-
.admin__control-select {
42-
max-width: 52rem;
43-
width: 100%;
44-
}
45-
}
46-
47-
.magento-version {
48-
margin-bottom: .5rem;
49-
strong {
50-
color: @footer-version__color;
51-
}
52-
}
53-
54-
// Copyright
55-
.copyright {
56-
margin-bottom: -.2rem;
57-
position: relative;
58-
.link-copyright {
59-
display: inline-block;
60-
margin-right: .5rem;
61-
text-decoration: none;
62-
vertical-align: top;
63-
&:hover {
64-
&:before {
65-
color: lighten(@color-light-phoenix, 10%);
66-
}
67-
}
68-
&:before {
69-
&:extend(.abs-icon all);
70-
.transition(color);
71-
color: @primary__color;
72-
content: @icon-logo__content;
73-
display: block;
74-
font-size: 2.5rem;
75-
position: relative;
76-
top: -.2rem;
77-
}
78-
&:active {
79-
&:before {
80-
.scale();
81-
}
82-
}
83-
}
84-
}
85-
86-
.footer-legal {
87-
padding-top: 1rem;
88-
text-align: right;
89-
}
90-
91-
// Locale switcher
92-
.locale-switcher {
93-
.label {
94-
display: block;
95-
margin-bottom: 1rem;
96-
}
97-
}
98-
99-
//
100-
// Mobile
101-
// _____________________________________________
102-
103-
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
104-
.footer-legal {
105-
padding-top: 3rem;
106-
text-align: left;
107-
}
108-
}
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Page footer
8+
// _____________________________________________
9+
10+
@footer__background-color: @body__background-color;
11+
@footer__border-color: @color-light-gray;
12+
@footer__border-width: .1rem;
13+
@footer__color: @color-very-dark-gray1;
14+
@footer-version__color: @color-gray40;
15+
@footer-copyright__color: @color-gray40;
16+
17+
@footer-link__color: @color-light-phoenix;
18+
@footer-link__text-decoration: underline;
19+
20+
@footer-link__hover__color: @color-light-phoenix;
21+
@footer-link__hover__text-decoration: underline;
22+
23+
.page-footer {
24+
background-color: @footer__background-color;
25+
border-top: @footer__border-width solid @footer__border-color;
26+
color: @footer__color;
27+
margin-top: auto;
28+
padding: 2.6rem 2rem 6rem 3rem;
29+
a {
30+
.lib-link(
31+
@_link-color: @footer-link__color,
32+
@_link-text-decoration: @footer-link__text-decoration,
33+
@_link-color-visited: false,
34+
@_link-text-decoration-visited: false,
35+
@_link-color-hover: @footer-link__color,
36+
@_link-text-decoration-hover: false,
37+
@_link-color-active: false,
38+
@_link-text-decoration-active: false
39+
);
40+
}
41+
.admin__control-select {
42+
max-width: 52rem;
43+
width: 100%;
44+
}
45+
}
46+
47+
.magento-version {
48+
margin-bottom: .5rem;
49+
strong {
50+
color: @footer-version__color;
51+
}
52+
}
53+
54+
// Copyright
55+
.copyright {
56+
margin-bottom: -.2rem;
57+
position: relative;
58+
.link-copyright {
59+
display: inline-block;
60+
margin-right: .5rem;
61+
text-decoration: none;
62+
vertical-align: top;
63+
&:hover {
64+
&:before {
65+
color: lighten(@color-light-phoenix, 10%);
66+
}
67+
}
68+
&:before {
69+
&:extend(.abs-icon all);
70+
.transition(color);
71+
color: @primary__color;
72+
content: @icon-logo__content;
73+
display: block;
74+
font-size: 2.5rem;
75+
position: relative;
76+
top: -.2rem;
77+
}
78+
&:active {
79+
&:before {
80+
.scale();
81+
}
82+
}
83+
}
84+
}
85+
86+
.footer-legal {
87+
padding-top: 1rem;
88+
text-align: right;
89+
}
90+
91+
// Locale switcher
92+
.locale-switcher {
93+
.label {
94+
display: block;
95+
margin-bottom: 1rem;
96+
}
97+
}
98+
99+
//
100+
// Mobile
101+
// _____________________________________________
102+
103+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
104+
.footer-legal {
105+
padding-top: 3rem;
106+
text-align: left;
107+
}
108+
}

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_user.less

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
}
9494
}
9595
.admin-user-name {
96-
.mixin-text-overflow-ellipsis();
96+
.lib-text-overflow-ellipsis();
9797
display: inline-block;
9898
max-width: @user-account-menu__min-width;
9999
overflow: hidden;
@@ -103,7 +103,7 @@
103103
}
104104

105105
.admin-user-account-text {
106-
.mixin-text-overflow-ellipsis();
106+
.lib-text-overflow-ellipsis();
107107
display: inline-block;
108108
max-width: @user-account-menu__min-width - @user-account__padding-left - @user-account__padding-right - 2rem;
109109
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
z-index: @page-actions__fixed__z-index;
4949
.page-actions-inner {
5050
&:before {
51-
.mixin-text-overflow-ellipsis();
51+
.lib-text-overflow-ellipsis();
5252
color: @page-title__color;
5353
content: attr(data-title);
5454
float: left;
@@ -72,7 +72,7 @@
7272
&.action-back {
7373
// ToDo UI: Should be changed to ._back
7474
float: left;
75-
.mixin-vendor-prefix-order(-1);
75+
.lib-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-
.mixin-vendor-prefix-order(2);
89+
.lib-vendor-prefix-order(2);
9090
}
9191
&.save {
9292
// ToDo UI: Should be changed to ._save
9393
&:not(.primary) {
94-
.mixin-vendor-prefix-order(1);
94+
.lib-vendor-prefix-order(1);
9595
}
9696
}
9797
&.delete {
9898
// ToDo UI: Should be changed to ._delete
99-
.mixin-vendor-prefix-order(-1);
99+
.lib-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-
.mixin-vendor-prefix-order(2);
106+
.lib-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-
.mixin-vendor-prefix-display(flex);
118+
.lib-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

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
z-index: 2;
283283
&:after,
284284
&:before {
285-
.mixin-arrow(
285+
.lib-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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
background-color: @page-main-actions__background-color;
2020
}
2121
.dropdown {
22-
.mixin-dropdown(
22+
.lib-dropdown(
2323
@_options-selector: ~".dropdown-menu",
2424
@_dropdown-list-border: 1px #ada89e solid,
2525
@_dropdown-list-pointer: false,
@@ -217,7 +217,7 @@
217217
font-size: 1.7rem;
218218
}
219219
span {
220-
.mixin-visually-hidden();
220+
.lib-visually-hidden();
221221
}
222222
}
223223
a {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
margin-bottom: 0;
170170
position: relative;
171171
&:before {
172-
.mixin-background-gradient(
172+
.lib-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

+3-3
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-
.mixin-vendor-prefix-display(flex);
29+
.lib-vendor-prefix-display(flex);
3030
background-color: @login-page__background-color;
3131
padding: 2rem 0 20rem;
3232
.page-wrapper {
33-
.mixin-vendor-prefix-flex-shrink(0);
34-
.mixin-vendor-prefix-flex-grow(0);
33+
.lib-vendor-prefix-flex-shrink(0);
34+
.lib-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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// */
55

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

1313
#configurable-attributes-container .actions-select {
14-
.mixin-dropdown(
14+
.lib-dropdown(
1515
@_dropdown-list-pointer: false
1616
);
1717

@@ -47,7 +47,7 @@
4747

4848
#product-variations-matrix {
4949
.actions-image-uploader {
50-
.mixin-dropdown-split(
50+
.lib-dropdown-split(
5151
@_dropdown-split-list-pointer: false
5252
);
5353

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
display: inline-block;
1414
position: relative;
1515
span {
16-
.mixin-font-size(11);
16+
.lib-font-size(11);
1717
background: @color-white;
1818
border: 1px solid @color-gray64;
1919
border-radius: 10px;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585

8686
// Progress line tunnel
8787
&:before {
88-
.mixin-background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
88+
.lib-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_ConfigurableProduct/web/css/source/module/steps/_attribute-values.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
padding: 0 @indent__s 0 0;
9090
vertical-align: middle;
9191

92-
.mixin-icon-font(
92+
.lib-icon-font(
9393
@icon-gripper__content,
9494
@_icon-font: @icons-admin__font-name,
9595
@_icon-font-size: 1.8rem,

0 commit comments

Comments
 (0)