Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop
Browse files Browse the repository at this point in the history
Accepted Public Pull Requests:
 - magento#16042: [Forwardport] fix for dropdown toggle icon in cart (by @chirag-wagento)
 - magento#16045: [Forwardport] Extend default config instead overwrite (by @chirag-wagento)
 - magento#16022: Wishlist: Remove unnecessary parameter from invoking toHtml() method (by @rogyar)
 - magento#15916: [Forwardport] [Resolved : Changing @tab-content__border variable has no effect in B� (by @hitesh-wagento)
 - magento#15884: [Forwardport 2.3] Trim username on customer account login page (by @dankhrapiyush)
 - magento#15896: [Forwardport] Solve overlapping Issue on every Home page & category page of Hot Sel (by @chirag-wagento)
 - magento#15879: [Forwardport] [Resolved : limiter float too generic] (by @hitesh-wagento)


Fixed GitHub Issues:
 - magento#14999: Changing @tab-content__border variable has no effect in Blank theme (reported by @denistrator) has been fixed in magento#15916 by @hitesh-wagento in 2.3-develop branch
   Related commits:
     1. 21ce9fb

 - magento#6058: IE11 user login email validation fails if field has leading or trailing space (reported by @dnadle) has been fixed in magento#15884 by @dankhrapiyush in 2.3-develop branch
   Related commits:
     1. c44f1f8

 - magento#15213: Alignment & overlapping Issue on every Home page & category page of Hot Seller section (reported by @cnviradiya) has been fixed in magento#15896 by @chirag-wagento in 2.3-develop branch
   Related commits:
     1. a851540

 - magento#15323: limiter float too generic (reported by @DanielRuf) has been fixed in magento#15879 by @hitesh-wagento in 2.3-develop branch
   Related commits:
     1. 172e5ae
  • Loading branch information
magento-engcom-team authored Jun 13, 2018
2 parents eca9d9d + 5d5bd7a commit 285a39c
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 16 deletions.
10 changes: 10 additions & 0 deletions app/code/Magento/Customer/view/frontend/templates/form/login.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,13 @@
</form>
</div>
</div>

<script type="text/x-magento-init">
{
".field.email": {
"Magento_Customer/js/trim-username": {
"formSelector": "form.form-login"
}
}
}
</script>
65 changes: 65 additions & 0 deletions app/code/Magento/Customer/view/frontend/web/js/trim-username.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

define([
'jquery'
], function ($) {
'use strict';

$.widget('mage.trimUsername', {
options: {
cache: {},
formSelector: 'form',
emailSelector: 'input[type="email"]'
},

/**
* Widget initialization
* @private
*/
_create: function () {
// We need to look outside the module for backward compatibility, since someone can already use the module.
// @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
// newsletter email field or any other "email" field.
this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
this._bind();
},

/**
* Event binding, will monitor change, keyup and paste events.
* @private
*/
_bind: function () {
if (this.options.cache.email.length) {
this._on(this.options.cache.email, {
'change': this._trimUsername,
'keyup': this._trimUsername,
'paste': this._trimUsername
});
}
},

/**
* Trim username
* @private
*/
_trimUsername: function () {
var username = this._getUsername().trim();

this.options.cache.email.val(username);
},

/**
* Get username value
* @returns {*}
* @private
*/
_getUsername: function () {
return this.options.cache.email.val();
}
});

return $.mage.trimUsername;
});
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $columns = $block->getColumns();
<li data-row="product-item" class="product-item" id="item_<?= $block->escapeHtmlAttr($item->getId()) ?>">
<div class="product-item-info" data-container="product-grid">
<?php foreach ($columns as $column): ?>
<?php $column->setItem($item); echo $column->toHtml($item);?>
<?= $column->setItem($item)->toHtml();?>
<?php endforeach; ?>
</div>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,10 @@
.lib-icon-font-symbol(@icon-list);
}

.limiter {
float: right;

.products.wrapper ~ .toolbar & {
.toolbar {
.products.wrapper ~ & .limiter {
display: block;
float: right;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@
&.active {
> .title {
.lib-icon-font-symbol(
@_icon-font-content: @icon-prev,
@_icon-font-content: @icon-up,
@_icon-font-position: after
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.product.data.items {
.lib-data-tabs(
@_tab-content-border-top-status: true
);
.lib-data-tabs();
}
}

Expand Down
10 changes: 10 additions & 0 deletions app/design/frontend/Magento/blank/web/css/source/_variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
@font-family-name__base: 'Open Sans';
@font-family__base: @font-family-name__base, @font-family__sans-serif;

//
// Sections variables
// _____________________________________________

//
// Tabs
// ---------------------------------------------
@tab-content__border-top-status: true;


//
// Sidebar
// ---------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@
}
.sidebar & {
.product-item-photo {
top: 9px;
left: 9px;
top: 9px;
}
}
}
Expand Down Expand Up @@ -310,8 +310,8 @@
.actions-primary + .actions-secondary {
display: table-cell;
padding-left: 10px;
width: 50%;
vertical-align: middle;
width: 50%;

> .action {
margin-right: 10px;
Expand Down Expand Up @@ -443,7 +443,7 @@

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

&:nth-child(4n + 1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@
}
}

.limiter {
float: right;
.products.wrapper ~ .toolbar & {
.toolbar {
.products.wrapper ~ & .limiter {
display: block;
float: right;
}
}
}
2 changes: 1 addition & 1 deletion lib/web/mage/adminhtml/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ define([
var idTo, idFrom, values, fromId, radioFrom;

if (config) {
this._config = config;
this._config = jQuery.extend(this._config, config);
}

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

0 comments on commit 285a39c

Please sign in to comment.