Skip to content
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

[WIP] Fixes a bunch of less compilation problems and resolves some sm… #23942

Closed
wants to merge 2 commits into from
Closed

[WIP] Fixes a bunch of less compilation problems and resolves some sm… #23942

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
82a0612
[WIP] Fixes a bunch of less compilation problems and resolves some sm…
hostep Jul 29, 2019
5aeefd5
Also fixed all less compilation problems in the blank theme, but I'm …
hostep Jul 31, 2019
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
4 changes: 4 additions & 0 deletions app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@

//

.modals-overlay {
&:extend(.abs-modal-overlay all);
}

.modal-popup,
.modal-slide {
.action-close {
Expand Down
18 changes: 12 additions & 6 deletions app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@
}

.block-content {
&:extend(.abs-add-clearfix-desktop all);

.box {
&:extend(.abs-blocks-2columns all);
}

.actions-toolbar {
clear: both;
.lib-actions-toolbar(
Expand Down Expand Up @@ -167,4 +161,16 @@
&:extend(.abs-add-clearfix-desktop all);
}
}

.column {
.block-addbysku {
.block-content {
&:extend(.abs-add-clearfix-desktop all);

.box {
&:extend(.abs-blocks-2columns all);
}
}
}
}
}
5 changes: 2 additions & 3 deletions ...ntend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

.opc-estimated-wrapper {
&:extend(.abs-add-clearfix all);
&:extend(.abs-no-display-desktop all);
.lib-css(border-bottom, @border-width__base solid @color-gray80);
margin: 0 0 15px;
padding: 18px 15px;
Expand All @@ -37,7 +36,7 @@
&:before {
.lib-css(color, @button__color);
}

&:hover:before {
.lib-css(color, @button__hover__color);
}
Expand All @@ -53,6 +52,6 @@

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.opc-estimated-wrapper {
display: none;
&:extend(.abs-no-display-desktop all);
}
}
1 change: 0 additions & 1 deletion app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
& when (@media-common = true) {
.gift-message {
.field {
&:extend(.abs-clearfix all);
margin-bottom: @indent__base;

.label {
Expand Down
4 changes: 0 additions & 4 deletions app/design/frontend/Magento/blank/Magento_GiftRegistry/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@
.form-giftregistry-search {
margin-bottom: @indent__l*2;

.legend {
&:extend(.abs-account-title all);
}

.fields-specific-options {
.field {
&:nth-last-of-type(1) {
Expand Down
6 changes: 1 addition & 5 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 @@ -180,10 +180,6 @@
}

.block-wishlist-search-form {
.block-title {
&:extend(.abs-account-title all);
}

.form-wishlist-search {
margin-bottom: @indent__l * 2;
max-width: 500px;
Expand Down Expand Up @@ -218,7 +214,7 @@
.block-title {
.lib-font-size(22);
margin-bottom: @indent__base;

> strong {
font-weight: @font-weight__light;
}
Expand Down
1 change: 0 additions & 1 deletion app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@

.block-title,
.block-content .title {
&:extend(.abs-account-title all);
border-bottom: @border-width__base solid @border-color__base;
padding-bottom: @indent__s;

Expand Down
3 changes: 1 addition & 2 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 @@ -17,7 +17,7 @@
& when (@media-common = true) {
.rating-summary {
.lib-rating-summary();

.rating-result {
margin-left: -5px;
}
Expand Down Expand Up @@ -299,7 +299,6 @@
display: table;
margin-bottom: @indent__s;
max-width: 100%;
&:extend(.abs-rating-summary all);
}

&-author {
Expand Down
18 changes: 12 additions & 6 deletions app/design/frontend/Magento/luma/Magento_AdvancedCheckout/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@
}

.block-content {
&:extend(.abs-add-clearfix-desktop all);

.box {
&:extend(.abs-blocks-2columns all);
}

.actions-toolbar {
clear: both;
.lib-actions-toolbar(
Expand Down Expand Up @@ -188,4 +182,16 @@
&:extend(.abs-add-clearfix-desktop all);
}
}

.column {
.block-addbysku {
.block-content {
&:extend(.abs-add-clearfix-desktop all);

.box {
&:extend(.abs-blocks-2columns all);
}
}
}
}
}
10 changes: 6 additions & 4 deletions app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// _____________________________________________

& when (@media-common = true) {

.search {
.fieldset {
.control {
Expand All @@ -31,7 +31,7 @@
}
}
}

.block-search {
margin-bottom: 0;

Expand Down Expand Up @@ -136,8 +136,6 @@
}

.form.search.advanced {
&:extend(.abs-forms-general-desktop all);

.fields.range {
.field {
&:first-child {
Expand Down Expand Up @@ -275,4 +273,8 @@
.search-autocomplete {
margin-top: 0;
}

.form.search.advanced {
&:extend(.abs-forms-general-desktop all);
}
}
3 changes: 1 addition & 2 deletions ...ontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
// ---------------------------------------------

.opc-estimated-wrapper {
&:extend(.abs-no-display-desktop all);
&:extend(.abs-add-clearfix all);
.lib-css(background, @checkout-step-content-mobile__background);
.lib-css(border-bottom, @checkout-step-title__border);
Expand Down Expand Up @@ -54,6 +53,6 @@

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.opc-estimated-wrapper {
display: none;
&:extend(.abs-no-display-desktop all);
}
}
1 change: 0 additions & 1 deletion ...d/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@

.file-uploader-preview {
.action-remove {
&:extend(.abs-action-reset all);
.lib-icon-font (
@icon-delete__content,
@_icon-font: @icons__font-name,
Expand Down
5 changes: 0 additions & 5 deletions app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
}

.field.choice {
&:extend(.clearer all);
border-bottom: 1px solid @color-gray92;
box-sizing: border-box;
margin-bottom: @indent__s;
Expand Down Expand Up @@ -178,10 +177,6 @@

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.page-product-downloadable {
.product-add-form {
&:extend(.clearer all);
}

.product-options-wrapper {
float: left;
width: 55%;
Expand Down
1 change: 0 additions & 1 deletion app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
& when (@media-common = true) {
.gift-message {
.field {
&:extend(.abs-clearfix all);
margin-bottom: @indent__base;

.label {
Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@
margin-right: 30px;

&.print {
&:extend(.abs-action-print all);
display: none;
margin: 0;
}
Expand Down Expand Up @@ -585,6 +584,7 @@

.order-actions-toolbar {
.action.print {
&:extend(.abs-action-print all);
display: block;
float: right;
}
Expand Down Expand Up @@ -705,7 +705,7 @@
}
}

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
.order-links {
.item {
margin: 0 @tab-control__margin-right 0 0;
Expand Down
1 change: 0 additions & 1 deletion lib/web/css/source/components/_modals.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@

// Modals overlay
.modals-overlay {
&:extend(.abs-modal-overlay all);
.lib-css(z-index, @overlay__z-index);
}

Expand Down