Skip to content

Commit

Permalink
MAGETWO-40722: Rename lib mixins using "mixin-" prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
zanilee committed Aug 10, 2015
1 parent 35e5bab commit 7249291
Show file tree
Hide file tree
Showing 89 changed files with 2,506 additions and 2,660 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
&.action-back {
// ToDo UI: Should be changed to ._back
float: left;
.vendor-prefix-order(-1);
.mixin-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);
.vendor-prefix-order(2);
.mixin-vendor-prefix-order(2);
}
&.save {
// ToDo UI: Should be changed to ._save
&:not(.primary) {
.vendor-prefix-order(1);
.mixin-vendor-prefix-order(1);
}
}
&.delete {
// ToDo UI: Should be changed to ._delete
.vendor-prefix-order(-1);
.mixin-vendor-prefix-order(-1);
}
}
.actions-split {
&:extend(.abs-actions-split-xl all);
float: right;
margin-left: @_page-action__indent;
.vendor-prefix-order(2);
.mixin-vendor-prefix-order(2);
.dropdown-menu {
.item {
display: block;
Expand All @@ -115,7 +115,7 @@
.page-actions-buttons {
float: right;
justify-content: flex-end;
.vendor-prefix-display(flex);
.mixin-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 {
.arrow(
.mixin-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 @@ -217,7 +217,7 @@
font-size: 1.7rem;
}
span {
.visually-hidden();
.mixin-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 {
.background-gradient(
.mixin-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;
.vendor-prefix-display(flex);
.mixin-vendor-prefix-display(flex);
background-color: @login-page__background-color;
padding: 2rem 0 20rem;
.page-wrapper {
.vendor-prefix-flex-shrink(0);
.vendor-prefix-flex-grow(0);
.mixin-vendor-prefix-flex-shrink(0);
.mixin-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,7 +4,7 @@
// */

.product-actions {
.clearfix();
.mixin-clearfix();
.switcher {
float: right;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

// Progress line tunnel
&:before {
.background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
.mixin-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 @@ -166,7 +166,7 @@
.pager {
text-align: left;
padding-bottom: 10px;
.clearfix();
.mixin-clearfix();
[data-part=left] {
display: inline-block;
width: 45%;
Expand Down Expand Up @@ -208,7 +208,7 @@
text-align: center;
}
.actions-split {
.clearfix();
.mixin-clearfix();
display: inline-block;
position: relative;
z-index: 100;
Expand Down Expand Up @@ -257,7 +257,7 @@
}
}
> span {
.visually-hidden();
.mixin-visually-hidden();
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@

// Progress line tunnel
&:before {
.background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-color-start: @color-gray82, @_background-gradient-color-end: @color-gray83 );
.mixin-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 @@ -102,7 +102,7 @@
color: @btn-prime__color;
text-shadow: 1px 1px 0 rgba(0, 0, 0, .25);
&:hover {
.background-gradient(
.mixin-background-gradient(
@_background-gradient: true,
@_background-gradient-direction: horizontal,
@_background-gradient-color-start: @btn-prime__color-gradient-start,
Expand All @@ -111,7 +111,7 @@
color: @btn-prime__color;
}
&:active {
.background-gradient(
.mixin-background-gradient(
@_background-gradient: true,
@_background-gradient-direction: horizontal,
@_background-gradient-color-start: @btn-prime__color-gradient-end,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Clearfix

.abs-clearer {
.clearer();
.mixin-clearer();
}

.extend__clearer() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

.form-el-checkbox,
.form-el-radio {
.visually-hidden();
.mixin-visually-hidden();

// Disabled state

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
.check-result-message {
margin-left: .5em;
min-height: @btn__height__base;
.vendor-box-align(center);
.vendor-prefix-display(flex);
.mixin-vendor-box-align(center);
.mixin-vendor-prefix-display(flex);
}

.check-result-text {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// * See COPYING.txt for license details.
// */

.vendor-prefix-appearance (
.mixin-vendor-prefix-appearance (
@value: none
) {
-webkit-appearance: @value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.customize-your-store {
.customize-your-store-default {
.legend {
.visually-hidden();
.mixin-visually-hidden();
}
}
.advanced-modules-select,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

// Visually hidden
.abs-visually-hidden {
.visually-hidden();
.mixin-visually-hidden();
}

.extend__visually-hidden() {
Expand All @@ -62,7 +62,7 @@

// Revert visually hidden
.abs-visually-hidden-reset {
.visually-hidden-reset();
.mixin-visually-hidden-reset();
}

.extend__visually-hidden-reset() {
Expand All @@ -71,12 +71,12 @@

// Clearfixes
.abs-clearfix {
.clearfix();
.mixin-clearfix();
}

// Clearer - clearing container using only :after element
.abs-clearer {
.clearer();
.mixin-clearer();
}

.extend__clearer() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

#mix-grid() {
.row() {
.clearer();
.mixin-clearer();
margin-left: ~'-@{temp_gutter}';
}
.return_length(@_columns-min, @_total: @temp_columns, @mathSymbol: '-') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
right: .3rem;
}
> span {
.visually-hidden();
.mixin-visually-hidden();
}
}
.action-menu {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
line-height: 3rem;
top: 0;
span {
.visually-hidden();
.mixin-visually-hidden();
}
&:before {
color: #514943;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,24 +188,24 @@ option:empty {

// Control with additional prefix or suffix label
.admin__control-addon {
.vendor-prefix-display(inline-flex);
.vendor-prefix-flex-direction(row);
.mixin-vendor-prefix-display(inline-flex);
.mixin-vendor-prefix-flex-direction(row);
display: inline-flex;
flex-flow: row nowrap;
position: relative;
width: 100%;
z-index: 1;
> [class*='admin__addon-'],
> [class*='admin__control-'] {
.vendor-prefix-flex-basis(auto);
.vendor-prefix-flex-grow(0);
.vendor-prefix-flex-shrink(0);
.mixin-vendor-prefix-flex-basis(auto);
.mixin-vendor-prefix-flex-grow(0);
.mixin-vendor-prefix-flex-shrink(0);
position: relative;
z-index: 1;
}
[class*='admin__control-'] {
.css(appearence,none);
.vendor-prefix-flex-grow(1);
.mixin-vendor-prefix-flex-grow(1);
box-shadow: none;
background-color: transparent;
border-color: transparent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
&:nth-child(n+2) {
padding-left: 20px;
&:not(.admin__field-option) .admin__field-label {
.visually-hidden();
.mixin-visually-hidden();
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
right: -70px;
&:after,
&:before {
.arrow(
.mixin-arrow(
@_position: down,
@_size: 16px,
@_color: @field-tooltip-content__border-color
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
margin-left: auto;
padding-left: (@gutter / 2);
padding-right: (@gutter / 2);
.clearer();
.mixin-clearer();
}

// Creates a wrapper for a series of columns

.make-row(@gutter: @grid-gutter-width) {
margin-left: (@gutter / -2);
margin-right: (@gutter / -2);
.clearer();
.mixin-clearer();
}

//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4090,7 +4090,7 @@ input.no-display,
}

.rule-chooser .field-row {
.clearfix();
.mixin-clearfix();
display: block;
margin-bottom: 17px;
.input-text {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,5 @@
}

.add-clearer {
.clearer();
.mixin-clearer();
}
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,11 @@
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.catalog-product-view {
.column.main {
.vendor-prefix-display(flex);
.vendor-prefix-flex-direction(column);
.mixin-vendor-prefix-display(flex);
.mixin-vendor-prefix-flex-direction(column);
}
.product.media {
.vendor-prefix-order(-1);
.mixin-vendor-prefix-order(-1);
}
}
.product-info-main .box-tocart {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
position: static;
padding-right: 35px;
margin: 0;
.input-placeholder(@form-element-input-placeholder__color);
.mixin-input-placeholder(@form-element-input-placeholder__color);
}
.action.search {
position: absolute;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,17 @@
width: 60%;
}
.block-authentication {
.vendor-prefix-display(flex);
.vendor-prefix-flex-direction(row);
.mixin-vendor-prefix-display(flex);
.mixin-vendor-prefix-flex-direction(row);
border-top: 1px solid @color-gray-light5;
}
.block[class],
.form-login,
.fieldset,
.block-content {
.vendor-prefix-display(flex);
.vendor-prefix-flex-direction(column);
.vendor-prefix-flex-grow(1);
.mixin-vendor-prefix-display(flex);
.mixin-vendor-prefix-flex-direction(column);
.mixin-vendor-prefix-flex-grow(1);
}
.block[class] {
box-sizing: border-box;
Expand Down
Loading

0 comments on commit 7249291

Please sign in to comment.