Skip to content

Magento UI - Cleanup of undefined mixins parameters and usage of "leaking" variables scope #11371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
okorshenko merged 2 commits into from
Oct 25, 2017
Merged

Magento UI - Cleanup of undefined mixins parameters and usage of "leaking" variables scope #11371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ef8a5
Magento UI - Cleanup of undefined mixins parameters and leaked var scope
Igloczek Oct 11, 2017
4d2c4a3
Mixin moved and simplified to avoid usage of weird LESS global scoping
Igloczek Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/web/css/source/lib/_icons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@
.lib-icon-text-hide();
}

._lib-icon-image-url(@_path) when not (@_path = false) {
.lib-css(background-image, url(@_path));
}

._lib-icon-image(
@_icon-image,
@_icon-image-width,
Expand All @@ -294,9 +298,7 @@
@_icon-image-position-x,
@_icon-image-position-y
) {
.lib-url-check(@_icon-image);

.lib-css(background-image, @lib-url-check-output); // @lib-url-check-output is a returned variable of .lib-url-check() mixin
._lib-icon-image-url(@_icon-image);
.lib-css(background-position-x, @_icon-image-position-x);
.lib-css(background-position-y, @_icon-image-position-y);
.lib-css(line-height, @_icon-image-height);
Expand Down
107 changes: 61 additions & 46 deletions lib/web/css/source/lib/_pages.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,20 +119,26 @@
._lib-pager-label-display( // To hide or to display label
@_pager-label-display: @_pager-label-display,
@_pager-font-size: @_pager-font-size,
@_pager-font-weight: @_pager-font-weight,
@_pager-line-height: @_pager-line-height
);

.items {
._lib-pager-inline-block-spaces-container();
._lib-pager-inline-block-spaces-container(
@_pager-reset-spaces,
@_pager-item-display
);
.lib-list-reset-styles();
.lib-css(display, @_pager-item-display);
.lib-css(font-weight, @_pager-font-weight);
}

.item {
._lib-pager-inline-block-spaces-item(
@_pager-font-size: @_pager-font-size,
@_pager-line-height: @_pager-line-height
@_pager-reset-spaces,
@_pager-item-display,
@_pager-font-size,
@_pager-line-height
);
.lib-css(margin, @_pager-item-margin);
.lib-css(display, @_pager-item-display);
Expand Down Expand Up @@ -204,8 +210,10 @@
);
.lib-css(border, @_pager-current-border);
._lib-pager-inline-block-spaces-item(
@_pager-font-size: @_pager-font-size,
@_pager-line-height: @_pager-line-height
@_pager-reset-spaces,
@_pager-item-display,
@_pager-font-size,
@_pager-line-height
);
.lib-css(color, @_pager-current-color);
.lib-css(display, @_pager-item-display);
Expand Down Expand Up @@ -266,12 +274,13 @@

&.next {
._lib-pager-icon (
@_pager-icon-use: @_pager-icon-use,
@_icon-font-content: @_pager-icon-next-content,
@_pager-icon-use: @_pager-icon-use,
@_icon-font: @_pager-icon-font,
@_icon-font-size: @_pager-icon-font-size,
@_icon-font-line-height: @_pager-icon-font-line-height,
@_icon-font-color: @_pager-action-color,
@_icon-font-color-visited: @_pager-action-color-visited,
@_icon-font-color-hover: @_pager-action-color-hover,
@_icon-font-color-active: @_pager-action-color-active,
@_icon-font-margin: @_pager-icon-font-margin,
Expand All @@ -283,12 +292,13 @@

&.previous {
._lib-pager-icon (
@_pager-icon-use: @_pager-icon-use,
@_icon-font-content: @_pager-icon-previous-content,
@_pager-icon-use: @_pager-icon-use,
@_icon-font: @_pager-icon-font,
@_icon-font-size: @_pager-icon-font-size,
@_icon-font-line-height: @_pager-icon-font-line-height,
@_icon-font-color: @_pager-action-color,
@_icon-font-color-visited: @_pager-action-color-visited,
@_icon-font-color-hover: @_pager-action-color-hover,
@_icon-font-color-active: @_pager-action-color-active,
@_icon-font-margin: @_pager-icon-font-margin,
Expand All @@ -301,14 +311,19 @@
}

// Delete spaces between elements when pager items have display: inline-block
._lib-pager-inline-block-spaces-container() when (@_pager-reset-spaces = true) and (@_pager-item-display = inline-block) {
._lib-pager-inline-block-spaces-container(
@_pager-reset-spaces,
@_pager-item-display
) when (@_pager-reset-spaces = true) and (@_pager-item-display = inline-block) {
.lib-inline-block-space-container();
white-space: nowrap;
}

._lib-pager-inline-block-spaces-item(
@_pager-font-size: @_pager-font-size,
@_pager-line-height: @_pager-line-height
@_pager-reset-spaces,
@_pager-item-display,
@_pager-font-size,
@_pager-line-height
) when (@_pager-reset-spaces = true) and (@_pager-item-display = inline-block) {
.lib-inline-block-space-item(
@_font-size: @_pager-font-size,
Expand All @@ -318,10 +333,10 @@

// Display or hide "page" label
._lib-pager-label-display(
@_pager-label-display: @_pager-label-display,
@_pager-font-size: @_pager-font-size,
@_pager-font-weight: @_pager-font-weight,
@_pager-line-height: @_pager-line-height
@_pager-label-display,
@_pager-font-size,
@_pager-font-weight,
@_pager-line-height
) when not (@_pager-label-display = none){
> .label {
.lib-css(display, @_pager-label-display);
Expand All @@ -338,41 +353,41 @@
}

._lib-pager-label-display(
@_pager-label-display: @_pager-label-display,
@_pager-font-size: @_pager-font-size,
@_pager-font-weight: @_pager-font-weight,
@_pager-line-height: @_pager-line-height
@_pager-label-display,
@_pager-font-size,
@_pager-font-weight,
@_pager-line-height
) when (@_pager-label-display = none) {
> .label {
.lib-visually-hidden();
}
}

._lib-pager-label-display(
@_pager-label-display: @_pager-label-display,
@_pager-font-size: @_pager-font-size,
@_pager-font-weight: @_pager-font-weight,
@_pager-line-height: @_pager-line-height
@_pager-label-display,
@_pager-font-size,
@_pager-font-weight,
@_pager-line-height
) when (@_pager-label-display = false) {
> .label {
.lib-visually-hidden();
}
}

._lib-pager-icon (
@_pager-icon-use: @_pager-icon-use,
@_pager-icon-use,
@_icon-font-content,
@_icon-font: @_pager-icon-font,
@_icon-font-size: @_pager-icon-font-size,
@_icon-font-line-height: @_pager-icon-font-line-height,
@_icon-font-color: @_pager-action-color,
@_icon-font-color-visited: @_pager-action-color-visited,
@_icon-font-color-hover: @_pager-action-color-hover,
@_icon-font-color-active: @_pager-action-color-active,
@_icon-font-margin: @_pager-icon-font-margin,
@_icon-font-vertical-align: @_pager-icon-font-vertical-align,
@_icon-font-position: @_pager-icon-font-position,
@_icon-font-text-hide: @_pager-icon-font-text-hide
@_icon-font,
@_icon-font-size,
@_icon-font-line-height,
@_icon-font-color,
@_icon-font-color-visited,
@_icon-font-color-hover,
@_icon-font-color-active,
@_icon-font-margin,
@_icon-font-vertical-align,
@_icon-font-position,
@_icon-font-text-hide
) when (@_pager-icon-use = true) and (@_icon-font-position = before) {
&:visited {
&:before {
Expand Down Expand Up @@ -402,19 +417,19 @@
}

._lib-pager-icon (
@_pager-icon-use: @_pager-icon-use,
@_icon-font-content,
@_icon-font: @_pager-icon-font,
@_icon-font-size: @_pager-icon-font-size,
@_icon-font-line-height: @_pager-icon-font-line-height,
@_icon-font-color: @_pager-action-color,
@_icon-font-color-visited: @_pager-action-color-visited,
@_icon-font-color-hover: @_pager-action-color-hover,
@_icon-font-color-active: @_pager-action-color-active,
@_icon-font-margin: @_pager-icon-font-margin,
@_icon-font-vertical-align: @_pager-icon-font-vertical-align,
@_icon-font-position: @_pager-icon-font-position,
@_icon-font-text-hide: @_pager-icon-font-text-hide
@_pager-icon-use,
@_icon-font,
@_icon-font-size,
@_icon-font-line-height,
@_icon-font-color,
@_icon-font-color-visited,
@_icon-font-color-hover,
@_icon-font-color-active,
@_icon-font-margin,
@_icon-font-vertical-align,
@_icon-font-position,
@_icon-font-text-hide
) when (@_pager-icon-use = true) and (@_icon-font-position = after) {
.lib-icon-font(
@_icon-font-content: @_icon-font-content,
Expand Down
12 changes: 0 additions & 12 deletions lib/web/css/source/lib/_utilities.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,18 +334,6 @@
@url: "@{baseDir}@{_module}/@{_path}";
}

//
// Url existing check
// ---------------------------------------------

.lib-url-check(@_path) {
@lib-url-check-output: @_path;
}

.lib-url-check(@_path) when not (@_path = false) {
@lib-url-check-output: url(@_path);
}

//
// Arrow
// ---------------------------------------------
Expand Down