Skip to content

LESS code clean up #18957

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
magento-engcom-team merged 14 commits into from
Nov 22, 2018
Merged

LESS code clean up #18957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
970a746
Update _module.less
Karlasa Oct 30, 2018
fc23d99
Merge pull request #1 from Karlasa/Karlasa-clean-up-multiwishlist
Karlasa Oct 30, 2018
c7aa2f7
Update _module.less
Karlasa Oct 30, 2018
b0fca1d
Update _widgets.less
Karlasa Oct 30, 2018
b198d34
Update _minicart.less
Karlasa Oct 30, 2018
b48b95f
Update _minicart.less
Karlasa Oct 30, 2018
69107f4
Merge pull request #2 from Karlasa/Karlasa-clean-up-multiwishlist
Karlasa Oct 30, 2018
ecaabe4
Update _module.less
Karlasa Oct 30, 2018
a02c49f
Update _module.less
Karlasa Oct 30, 2018
59a88f3
Update _extends.less
Karlasa Oct 30, 2018
8485195
Update _toolbar.less
Karlasa Oct 30, 2018
bbc7517
Code clean up
Karlasa Oct 31, 2018
0d5150f
Code clean up
Karlasa Oct 31, 2018
93af836
code clean up
Karlasa Oct 31, 2018
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
3 changes: 1 addition & 2 deletions app/design/frontend/Magento/blank/Magento_Banner/web/css/source/_widgets.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// _____________________________________________

& when (@media-common = true) {

.block-banners,
.block-banners-inline {
&:extend(.abs-margin-for-blocks-and-widgets);
Expand All @@ -22,7 +21,7 @@
}

.banner-item-content {
.lib-css(margin-bottom, @indent__base);
margin-bottom: @indent__base;

img {
display: block;
Expand Down
33 changes: 18 additions & 15 deletions app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
// */

//
// Common
// _____________________________________________
// Variables
// ---------------------------------------------

@toolbar-mode-icon-font-size: 24px;
@toolbar-element-background: @panel__background-color;

& when (@media-common = true) {
//
// Common
// _____________________________________________

& when (@media-common = true) {
.page-products {
.columns {
position: relative;
Expand Down Expand Up @@ -72,12 +75,12 @@
.sorter-action {
vertical-align: top;
.lib-icon-font(
@icon-arrow-up,
@_icon-font-size: 28px,
@_icon-font-line-height: 32px,
@_icon-font-color: @header-icons-color,
@_icon-font-color-hover: @header-icons-color-hover,
@_icon-font-text-hide: true
@icon-arrow-up,
@_icon-font-size: 28px,
@_icon-font-line-height: 32px,
@_icon-font-color: @header-icons-color,
@_icon-font-color-hover: @header-icons-color-hover,
@_icon-font-text-hide: true
);
}

Expand All @@ -99,7 +102,7 @@
}

.limiter-label {
font-weight: 400;
font-weight: @font-weight__regular;
}

.limiter {
Expand Down Expand Up @@ -176,11 +179,11 @@
}

.lib-icon-font(
@icon-grid,
@_icon-font-size: @toolbar-mode-icon-font-size,
@_icon-font-text-hide: true,
@_icon-font-color: @text__color__muted,
@_icon-font-color-hover: @text__color__muted
@icon-grid,
@_icon-font-size: @toolbar-mode-icon-font-size,
@_icon-font-text-hide: true,
@_icon-font-color: @text__color__muted,
@_icon-font-color-hover: @text__color__muted
);
}

Expand Down
54 changes: 28 additions & 26 deletions app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@
.action {
&.close {
.lib-button-icon(
@icon-remove,
@_icon-font-size: 32px,
@_icon-font-line-height: 32px,
@_icon-font-text-hide: true
@icon-remove,
@_icon-font-size: 32px,
@_icon-font-line-height: 32px,
@_icon-font-text-hide: true
);
.lib-button-reset();
height: 40px;
Expand Down Expand Up @@ -254,12 +254,12 @@

.toggle {
.lib-icon-font(
@_icon-font-content: @icon-down,
@_icon-font-size: 28px,
@_icon-font-line-height: 16px,
@_icon-font-text-hide: false,
@_icon-font-position: after,
@_icon-font-display: block
@_icon-font-content: @icon-down,
@_icon-font-size: 28px,
@_icon-font-line-height: 16px,
@_icon-font-text-hide: false,
@_icon-font-position: after,
@_icon-font-display: block
);
cursor: pointer;
position: relative;
Expand All @@ -274,8 +274,8 @@
&.active {
> .toggle {
.lib-icon-font-symbol(
@_icon-font-content: @icon-up,
@_icon-font-position: after
@_icon-font-content: @icon-up,
@_icon-font-position: after
);
}
}
Expand Down Expand Up @@ -304,6 +304,7 @@

.weee[data-label] {
.lib-font-size(11);

.label {
&:extend(.abs-no-display all);
}
Expand All @@ -317,12 +318,12 @@
.product.options {
.tooltip.toggle {
.lib-icon-font(
@icon-down,
@_icon-font-size: 28px,
@_icon-font-line-height: 28px,
@_icon-font-text-hide: true,
@_icon-font-margin: -3px 0 0 7px,
@_icon-font-position: after
@icon-down,
@_icon-font-size: 28px,
@_icon-font-line-height: 28px,
@_icon-font-text-hide: true,
@_icon-font-margin: -3px 0 0 7px,
@_icon-font-position: after
);

.details {
Expand Down Expand Up @@ -357,19 +358,19 @@
&.edit,
&.delete {
.lib-icon-font(
@icon-settings,
@_icon-font-size: 28px,
@_icon-font-line-height: 28px,
@_icon-font-text-hide: true,
@_icon-font-color: @color-gray19,
@_icon-font-color-hover: @color-gray19,
@_icon-font-color-active: @color-gray19
@icon-settings,
@_icon-font-size: 28px,
@_icon-font-line-height: 28px,
@_icon-font-text-hide: true,
@_icon-font-color: @color-gray19,
@_icon-font-color-hover: @color-gray19,
@_icon-font-color-active: @color-gray19
);
}

&.delete {
.lib-icon-font-symbol(
@_icon-font-content: @icon-trash
@_icon-font-content: @icon-trash
);
}
}
Expand Down Expand Up @@ -399,6 +400,7 @@
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.minicart-wrapper {
margin-left: 13px;

.block-minicart {
right: -15px;
width: 390px;
Expand Down
5 changes: 3 additions & 2 deletions app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
}

.form-wishlist-search {
.lib-css(margin-bottom, @indent__l*2);
margin-bottom: @indent__l * 2;
max-width: 500px;

.fieldset {
Expand Down Expand Up @@ -216,8 +216,9 @@

.block-wishlist-info-items {
.block-title {
.lib-css(margin-bottom, @indent__base);
.lib-font-size(22);
margin-bottom: @indent__base;

> strong {
font-weight: @font-weight__light;
}
Expand Down
14 changes: 7 additions & 7 deletions app/design/frontend/Magento/blank/Magento_Review/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
// _____________________________________________

& when (@media-common = true) {

.rating-summary {
.lib-rating-summary();

.rating-result {
margin-left: -5px;
}
Expand Down Expand Up @@ -165,10 +165,10 @@

.review-details {
.customer-review-rating {
.lib-css(margin-bottom, @indent__base);
margin-bottom: @indent__base;

.item {
.lib-css(margin-bottom, @indent__s);
margin-bottom: @indent__s;

&:last-child {
margin-bottom: 0;
Expand All @@ -178,12 +178,12 @@

.review-title {
.lib-heading(h3);
.lib-css(font-weight, @font-weight__semibold);
.lib-css(margin-bottom, @indent__base);
font-weight: @font-weight__semibold;
margin-bottom: @indent__base;
}

.review-content {
.lib-css(margin-bottom, @indent__base);
margin-bottom: @indent__base;
}
}

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

&-field-rating {
.control {
margin-bottom: 1.2*@indent__xl;
margin-bottom: 1.2 * @indent__xl;
margin-top: @indent__s;
}
}
Expand Down
Loading