Skip to content

Commit f804b7c

Browse files
[EngCom] Public Pull Requests - 2.3-develop
- merged latest code from mainline branch
2 parents 02cbe85 + d36c704 commit f804b7c

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
415415
*/
416416
public function addFieldToFilter($attribute, $condition = null)
417417
{
418-
return $this->addAttributeToFilter($attribute, $condition);
418+
return $this->addAttributeToFilter($attribute, $condition, 'left');
419419
}
420420

421421
/**

app/code/Magento/Ui/view/base/web/js/grid/data-storage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ define([
199199
},
200200

201201
/**
202-
* Caches requests object with provdided parameters
202+
* Caches requests object with provided parameters
203203
* and data object associated with it.
204204
*
205205
* @param {Object} data - Data associated with request.

app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
border: 0;
235235
display: inline;
236236
margin: 0;
237+
width: 6rem;
237238

238239
body._keyfocus &:focus {
239240
box-shadow: none;

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@
152152
}
153153

154154
.product-item-name-block {
155-
display: table-cell;
155+
display: block;
156156
padding-right: @indent__xs;
157157
text-align: left;
158158
}
159159

160160
.subtotal {
161-
display: table-cell;
162-
text-align: right;
161+
display: block;
162+
text-align: left;
163163
}
164164

165165
.price {
@@ -231,3 +231,27 @@
231231
}
232232
}
233233
}
234+
235+
//
236+
// Tablet
237+
// _____________________________________________
238+
239+
@media only screen and (max-width: @screen__m) {
240+
.opc-block-summary {
241+
.product-item {
242+
.product-item-inner {
243+
display: block;
244+
}
245+
246+
.product-item-name-block {
247+
display: block;
248+
text-align: left;
249+
}
250+
251+
.subtotal {
252+
display: block;
253+
text-align: left;
254+
}
255+
}
256+
}
257+
}

0 commit comments

Comments
 (0)