Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

Commit 285a39c

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - magento/magento2#16042: [Forwardport] fix for dropdown toggle icon in cart (by @chirag-wagento) - magento/magento2#16045: [Forwardport] Extend default config instead overwrite (by @chirag-wagento) - magento/magento2#16022: Wishlist: Remove unnecessary parameter from invoking toHtml() method (by @rogyar) - magento/magento2#15916: [Forwardport] [Resolved : Changing @tab-content__border variable has no effect in B� (by @hitesh-wagento) - magento/magento2#15884: [Forwardport 2.3] Trim username on customer account login page (by @dankhrapiyush) - magento/magento2#15896: [Forwardport] Solve overlapping Issue on every Home page & category page of Hot Sel (by @chirag-wagento) - magento/magento2#15879: [Forwardport] [Resolved : limiter float too generic] (by @hitesh-wagento) Fixed GitHub Issues: - magento/magento2#14999: Changing @tab-content__border variable has no effect in Blank theme (reported by @denistrator) has been fixed in magento/magento2#15916 by @hitesh-wagento in 2.3-develop branch Related commits: 1. 21ce9fb - magento/magento2#6058: IE11 user login email validation fails if field has leading or trailing space (reported by @dnadle) has been fixed in magento/magento2#15884 by @dankhrapiyush in 2.3-develop branch Related commits: 1. c44f1f8 - magento/magento2#15213: Alignment & overlapping Issue on every Home page & category page of Hot Seller section (reported by @cnviradiya) has been fixed in magento/magento2#15896 by @chirag-wagento in 2.3-develop branch Related commits: 1. a851540 - magento/magento2#15323: limiter float too generic (reported by @DanielRuf) has been fixed in magento/magento2#15879 by @hitesh-wagento in 2.3-develop branch Related commits: 1. 172e5ae
2 parents eca9d9d + 5d5bd7a commit 285a39c

File tree

10 files changed

+98
-16
lines changed

10 files changed

+98
-16
lines changed

app/code/Magento/Customer/view/frontend/templates/form/login.phtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,13 @@
4242
</form>
4343
</div>
4444
</div>
45+
46+
<script type="text/x-magento-init">
47+
{
48+
".field.email": {
49+
"Magento_Customer/js/trim-username": {
50+
"formSelector": "form.form-login"
51+
}
52+
}
53+
}
54+
</script>
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'jquery'
8+
], function ($) {
9+
'use strict';
10+
11+
$.widget('mage.trimUsername', {
12+
options: {
13+
cache: {},
14+
formSelector: 'form',
15+
emailSelector: 'input[type="email"]'
16+
},
17+
18+
/**
19+
* Widget initialization
20+
* @private
21+
*/
22+
_create: function () {
23+
// We need to look outside the module for backward compatibility, since someone can already use the module.
24+
// @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
25+
// newsletter email field or any other "email" field.
26+
this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
27+
this._bind();
28+
},
29+
30+
/**
31+
* Event binding, will monitor change, keyup and paste events.
32+
* @private
33+
*/
34+
_bind: function () {
35+
if (this.options.cache.email.length) {
36+
this._on(this.options.cache.email, {
37+
'change': this._trimUsername,
38+
'keyup': this._trimUsername,
39+
'paste': this._trimUsername
40+
});
41+
}
42+
},
43+
44+
/**
45+
* Trim username
46+
* @private
47+
*/
48+
_trimUsername: function () {
49+
var username = this._getUsername().trim();
50+
51+
this.options.cache.email.val(username);
52+
},
53+
54+
/**
55+
* Get username value
56+
* @returns {*}
57+
* @private
58+
*/
59+
_getUsername: function () {
60+
return this.options.cache.email.val();
61+
}
62+
});
63+
64+
return $.mage.trimUsername;
65+
});

app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $columns = $block->getColumns();
1919
<li data-row="product-item" class="product-item" id="item_<?= $block->escapeHtmlAttr($item->getId()) ?>">
2020
<div class="product-item-info" data-container="product-grid">
2121
<?php foreach ($columns as $column): ?>
22-
<?php $column->setItem($item); echo $column->toHtml($item);?>
22+
<?= $column->setItem($item)->toHtml();?>
2323
<?php endforeach; ?>
2424
</div>
2525
</li>

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,10 @@
188188
.lib-icon-font-symbol(@icon-list);
189189
}
190190

191-
.limiter {
192-
float: right;
193-
194-
.products.wrapper ~ .toolbar & {
191+
.toolbar {
192+
.products.wrapper ~ & .limiter {
195193
display: block;
194+
float: right;
196195
}
197196
}
198197
}

app/design/frontend/Magento/blank/web/css/source/_extends.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@
14021402
&.active {
14031403
> .title {
14041404
.lib-icon-font-symbol(
1405-
@_icon-font-content: @icon-prev,
1405+
@_icon-font-content: @icon-up,
14061406
@_icon-font-position: after
14071407
);
14081408
}

app/design/frontend/Magento/blank/web/css/source/_sections.less

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020

2121
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
2222
.product.data.items {
23-
.lib-data-tabs(
24-
@_tab-content-border-top-status: true
25-
);
23+
.lib-data-tabs();
2624
}
2725
}
2826

app/design/frontend/Magento/blank/web/css/source/_variables.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
@font-family-name__base: 'Open Sans';
1616
@font-family__base: @font-family-name__base, @font-family__sans-serif;
1717

18+
//
19+
// Sections variables
20+
// _____________________________________________
21+
22+
//
23+
// Tabs
24+
// ---------------------------------------------
25+
@tab-content__border-top-status: true;
26+
27+
1828
//
1929
// Sidebar
2030
// ---------------------------------------------

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@
277277
}
278278
.sidebar & {
279279
.product-item-photo {
280-
top: 9px;
281280
left: 9px;
281+
top: 9px;
282282
}
283283
}
284284
}
@@ -310,8 +310,8 @@
310310
.actions-primary + .actions-secondary {
311311
display: table-cell;
312312
padding-left: 10px;
313-
width: 50%;
314313
vertical-align: middle;
314+
width: 50%;
315315

316316
> .action {
317317
margin-right: 10px;
@@ -443,7 +443,7 @@
443443

444444
.product-item {
445445
margin-left: calc(~'(100% - 4 * 24.439%) / 3');
446-
padding: 0;
446+
padding: 5px;
447447
width: 24.439%;
448448

449449
&:nth-child(4n + 1) {

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@
233233
}
234234
}
235235

236-
.limiter {
237-
float: right;
238-
.products.wrapper ~ .toolbar & {
236+
.toolbar {
237+
.products.wrapper ~ & .limiter {
239238
display: block;
239+
float: right;
240240
}
241241
}
242242
}

lib/web/mage/adminhtml/form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ define([
389389
var idTo, idFrom, values, fromId, radioFrom;
390390

391391
if (config) {
392-
this._config = config;
392+
this._config = jQuery.extend(this._config, config);
393393
}
394394

395395
for (idTo in elementsMap) { //eslint-disable-line guard-for-in

0 commit comments

Comments
 (0)