Skip to content

Commit

Permalink
ENGCOM-5546: Fixes less compilation problems in the Magento/luma theme
Browse files Browse the repository at this point in the history
…#24003

 - Merge Pull Request #24003 from hostep/magento2:fix-for-issue-23619-luma-theme
 - Merged commits:
   1. 820fd79
   2. 164a053
   3. 8419d5c
   4. 4abaaa0
   5. 5657076
  • Loading branch information
magento-engcom-team committed Feb 27, 2020
2 parents 9f093a3 + 5657076 commit 02c6691
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
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);
}
}
}
}
}
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);
}
}
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);
}
}
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@
margin-right: 30px;

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

.order-actions-toolbar {
.action.print {
&:extend(.abs-action-print all);
display: block;
float: right;
}
Expand Down Expand Up @@ -709,7 +709,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

0 comments on commit 02c6691

Please sign in to comment.