Skip to content

Commit

Permalink
MAGETWO-40722: Rename lib mixins using "mixin-" prefix
Browse files Browse the repository at this point in the history
- "mixin-" prefix is replaced to "lib-" prefix
  • Loading branch information
zanilee committed Aug 12, 2015
1 parent 1e51a4b commit 9936977
Show file tree
Hide file tree
Showing 207 changed files with 3,378 additions and 3,338 deletions.
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
// /**
// * Copyright © 2015 Magento. All rights reserved.
// * See COPYING.txt for license details.
// */

//
// Page footer
// _____________________________________________

@footer__background-color: @body__background-color;
@footer__border-color: @color-light-gray;
@footer__border-width: .1rem;
@footer__color: @color-very-dark-gray1;
@footer-version__color: @color-gray40;
@footer-copyright__color: @color-gray40;

@footer-link__color: @color-light-phoenix;
@footer-link__text-decoration: underline;

@footer-link__hover__color: @color-light-phoenix;
@footer-link__hover__text-decoration: underline;

.page-footer {
background-color: @footer__background-color;
border-top: @footer__border-width solid @footer__border-color;
color: @footer__color;
margin-top: auto;
padding: 2.6rem 2rem 6rem 3rem;
a {
.mixin-link(
@_link-color: @footer-link__color,
@_link-text-decoration: @footer-link__text-decoration,
@_link-color-visited: false,
@_link-text-decoration-visited: false,
@_link-color-hover: @footer-link__color,
@_link-text-decoration-hover: false,
@_link-color-active: false,
@_link-text-decoration-active: false
);
}
.admin__control-select {
max-width: 52rem;
width: 100%;
}
}

.magento-version {
margin-bottom: .5rem;
strong {
color: @footer-version__color;
}
}

// Copyright
.copyright {
margin-bottom: -.2rem;
position: relative;
.link-copyright {
display: inline-block;
margin-right: .5rem;
text-decoration: none;
vertical-align: top;
&:hover {
&:before {
color: lighten(@color-light-phoenix, 10%);
}
}
&:before {
&:extend(.abs-icon all);
.transition(color);
color: @primary__color;
content: @icon-logo__content;
display: block;
font-size: 2.5rem;
position: relative;
top: -.2rem;
}
&:active {
&:before {
.scale();
}
}
}
}

.footer-legal {
padding-top: 1rem;
text-align: right;
}

// Locale switcher
.locale-switcher {
.label {
display: block;
margin-bottom: 1rem;
}
}

//
// Mobile
// _____________________________________________

.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.footer-legal {
padding-top: 3rem;
text-align: left;
}
}
// /**
// * Copyright © 2015 Magento. All rights reserved.
// * See COPYING.txt for license details.
// */

//
// Page footer
// _____________________________________________

@footer__background-color: @body__background-color;
@footer__border-color: @color-light-gray;
@footer__border-width: .1rem;
@footer__color: @color-very-dark-gray1;
@footer-version__color: @color-gray40;
@footer-copyright__color: @color-gray40;

@footer-link__color: @color-light-phoenix;
@footer-link__text-decoration: underline;

@footer-link__hover__color: @color-light-phoenix;
@footer-link__hover__text-decoration: underline;

.page-footer {
background-color: @footer__background-color;
border-top: @footer__border-width solid @footer__border-color;
color: @footer__color;
margin-top: auto;
padding: 2.6rem 2rem 6rem 3rem;
a {
.lib-link(
@_link-color: @footer-link__color,
@_link-text-decoration: @footer-link__text-decoration,
@_link-color-visited: false,
@_link-text-decoration-visited: false,
@_link-color-hover: @footer-link__color,
@_link-text-decoration-hover: false,
@_link-color-active: false,
@_link-text-decoration-active: false
);
}
.admin__control-select {
max-width: 52rem;
width: 100%;
}
}

.magento-version {
margin-bottom: .5rem;
strong {
color: @footer-version__color;
}
}

// Copyright
.copyright {
margin-bottom: -.2rem;
position: relative;
.link-copyright {
display: inline-block;
margin-right: .5rem;
text-decoration: none;
vertical-align: top;
&:hover {
&:before {
color: lighten(@color-light-phoenix, 10%);
}
}
&:before {
&:extend(.abs-icon all);
.transition(color);
color: @primary__color;
content: @icon-logo__content;
display: block;
font-size: 2.5rem;
position: relative;
top: -.2rem;
}
&:active {
&:before {
.scale();
}
}
}
}

.footer-legal {
padding-top: 1rem;
text-align: right;
}

// Locale switcher
.locale-switcher {
.label {
display: block;
margin-bottom: 1rem;
}
}

//
// Mobile
// _____________________________________________

.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.footer-legal {
padding-top: 3rem;
text-align: left;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
}
}
.admin-user-name {
.mixin-text-overflow-ellipsis();
.lib-text-overflow-ellipsis();
display: inline-block;
max-width: @user-account-menu__min-width;
overflow: hidden;
Expand All @@ -103,7 +103,7 @@
}

.admin-user-account-text {
.mixin-text-overflow-ellipsis();
.lib-text-overflow-ellipsis();
display: inline-block;
max-width: @user-account-menu__min-width - @user-account__padding-left - @user-account__padding-right - 2rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
z-index: @page-actions__fixed__z-index;
.page-actions-inner {
&:before {
.mixin-text-overflow-ellipsis();
.lib-text-overflow-ellipsis();
color: @page-title__color;
content: attr(data-title);
float: left;
Expand All @@ -72,7 +72,7 @@
&.action-back {
// ToDo UI: Should be changed to ._back
float: left;
.mixin-vendor-prefix-order(-1);
.lib-vendor-prefix-order(-1);
&:before {
&:extend(.abs-icon all);
content: @icon-back-arrow__content;
Expand All @@ -86,24 +86,24 @@
// ToDo UI: Should be changed to .action-primary
&:extend(.abs-action-primary all);
&:extend(.abs-action-l all);
.mixin-vendor-prefix-order(2);
.lib-vendor-prefix-order(2);
}
&.save {
// ToDo UI: Should be changed to ._save
&:not(.primary) {
.mixin-vendor-prefix-order(1);
.lib-vendor-prefix-order(1);
}
}
&.delete {
// ToDo UI: Should be changed to ._delete
.mixin-vendor-prefix-order(-1);
.lib-vendor-prefix-order(-1);
}
}
.actions-split {
&:extend(.abs-actions-split-xl all);
float: right;
margin-left: @_page-action__indent;
.mixin-vendor-prefix-order(2);
.lib-vendor-prefix-order(2);
.dropdown-menu {
.item {
display: block;
Expand All @@ -115,7 +115,7 @@
.page-actions-buttons {
float: right;
justify-content: flex-end;
.mixin-vendor-prefix-display(flex);
.lib-vendor-prefix-display(flex);
.customer-index-edit & {
background-color: transparent;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
z-index: 2;
&:after,
&:before {
.mixin-arrow(
.lib-arrow(
@_position: down,
@_size: 15px,
@_color: @admin__page-nav-tooltip__background
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
background-color: @page-main-actions__background-color;
}
.dropdown {
.mixin-dropdown(
.lib-dropdown(
@_options-selector: ~".dropdown-menu",
@_dropdown-list-border: 1px #ada89e solid,
@_dropdown-list-pointer: false,
Expand Down Expand Up @@ -217,7 +217,7 @@
font-size: 1.7rem;
}
span {
.mixin-visually-hidden();
.lib-visually-hidden();
}
}
a {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
margin-bottom: 0;
position: relative;
&:before {
.mixin-background-gradient(
.lib-background-gradient(
@_background-gradient: true,
@_background-gradient-direction: horizontal,
@_background-gradient-color-start: rgba(255,255,255,0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
// Login box
.page-layout-admin-login {
align-items: center;
.mixin-vendor-prefix-display(flex);
.lib-vendor-prefix-display(flex);
background-color: @login-page__background-color;
padding: 2rem 0 20rem;
.page-wrapper {
.mixin-vendor-prefix-flex-shrink(0);
.mixin-vendor-prefix-flex-grow(0);
.lib-vendor-prefix-flex-shrink(0);
.lib-vendor-prefix-flex-grow(0);
background-color: @login-box__background-color;
border: @login-box__border;
box-shadow: @login-box__shadow;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
// */

.product-actions {
.mixin-clearfix();
.lib-clearfix();
.switcher {
float: right;
}
}

#configurable-attributes-container .actions-select {
.mixin-dropdown(
.lib-dropdown(
@_dropdown-list-pointer: false
);

Expand Down Expand Up @@ -47,7 +47,7 @@

#product-variations-matrix {
.actions-image-uploader {
.mixin-dropdown-split(
.lib-dropdown-split(
@_dropdown-split-list-pointer: false
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
display: inline-block;
position: relative;
span {
.mixin-font-size(11);
.lib-font-size(11);
background: @color-white;
border: 1px solid @color-gray64;
border-radius: 10px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

// Progress line tunnel
&:before {
.mixin-background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
.lib-background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
border-bottom: 1px solid @nav-bar-bullet-wrap__border-bottom-color;
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
content: '';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
padding: 0 @indent__s 0 0;
vertical-align: middle;

.mixin-icon-font(
.lib-icon-font(
@icon-gripper__content,
@_icon-font: @icons-admin__font-name,
@_icon-font-size: 1.8rem,
Expand Down
Loading

0 comments on commit 9936977

Please sign in to comment.