Skip to content

Fixes less compilation problems in the Magento/blank theme #24001

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
merged 5 commits into from
Aug 20, 2019
Merged

Fixes less compilation problems in the Magento/blank theme #24001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbcb8c6
Fixes a less compilation problem with '.abs-modal-overlay' being used…
hostep Aug 3, 2019
ed98703
Fixes some less compilation problems in Magento's blank theme.
hostep Aug 1, 2019
beeb56c
Fixes a less compilation in Magento's blank theme in regards to the M…
hostep Aug 1, 2019
d8c86b3
Copied the definition of '.abs-rating-summary' from Luma to Blank the…
hostep Aug 11, 2019
937b2c0
Copied the definition of '.abs-account-title' from Luma to Blank so t…
hostep Aug 11, 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
49 changes: 47 additions & 2 deletions app/design/frontend/Magento/blank/web/css/source/_extends.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
& when (@media-common = true) {
.abs-block-title {
margin-bottom: 15px;

> strong {
.lib-heading(h3);
}
Expand All @@ -194,7 +194,7 @@
.abs-account-blocks {
.block-title {
&:extend(.abs-block-title all);

> .action {
margin-left: 15px;
}
Expand Down Expand Up @@ -849,6 +849,51 @@
}
}

//
// Account pages: title
// ---------------------------------------------

& when (@media-common = true) {
.abs-account-title {
> strong,
> span {
.lib-font-size(22);
.lib-css(font-weight, @font-weight__light);
}

.lib-css(border-bottom, 1px solid @border-color__base);
.lib-css(margin-bottom, @indent__m);
.lib-css(padding-bottom, @indent__s);
}
}

//
// Ratings: vertical alignment
// ---------------------------------------------

& when (@media-common = true) {
.abs-rating-summary {
.rating {
&-summary {
display: table-row;
}

&-label {
display: table-cell;
padding-bottom: @indent__xs;
padding-right: @indent__m;
padding-top: 1px;
vertical-align: top;
}

&-result {
display: table-cell;
vertical-align: top;
}
}
}
}

//
// Add colon
// ---------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/web/css/source/_extends.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@
}

//
// Forms: margin-bottom for small forms
// Ratings: vertical alignment
// ---------------------------------------------

& when (@media-common = true) {
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