merge magento/2.3-develop into magento-tsg/2.3-develop-pr23

Author: Magento CICD

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

@@ -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>

app/code/Magento/Customer/view/frontend/web/js/trim-username.js

@@ -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;
+});

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

@@ -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>

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

@@ -188,11 +188,10 @@
         .lib-icon-font-symbol(@icon-list);
     }
 
-    .limiter {
-        float: right;
-
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }

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

@@ -1402,7 +1402,7 @@
         &.active {
             > .title {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-prev,
+                @_icon-font-content: @icon-up,
                 @_icon-font-position: after
                 );
             }

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

@@ -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();
     }
 }
 

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

@@ -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
 //  ---------------------------------------------

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

@@ -277,8 +277,8 @@
                 }
                 .sidebar & {
                     .product-item-photo {
-                        top: 9px;
                         left: 9px;
+                        top: 9px;
                     }
                 }
             }
@@ -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;
@@ -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) {

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

@@ -233,10 +233,10 @@
         }
     }
 
-    .limiter {
-        float: right;
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }

lib/web/mage/adminhtml/form.js

@@ -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