🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17202: [Backport] Update template.js (by @mage2pratik)
 - #17216: [Backport] Categories > Left menu > Item title space fix (by @mage2pratik)
 - #17218: [Backport] Broken Responsive Layout on Top page (by @mage2pratik)

Author: Stanislav Idolov

app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less

@@ -198,7 +198,7 @@
                 .column.main & {
                 }
             }
-
+            display: block;
             margin-bottom: @indent__s;
         }
 

app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

@@ -420,6 +420,17 @@
     }
 }
 
+//
+//  Mobile
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .cms-page-view .page-main {
+        padding-top: 41px;
+        position: relative;
+    }
+}
+
 //
 //  Desktop
 //  _____________________________________________

lib/web/mage/utils/template.js

@@ -2,12 +2,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* eslint-disable no-shadow */
+
 define([
     'jquery',
     'underscore',
     'mage/utils/objects',
     'mage/utils/strings'
-], function (jQuery, _, utils, stringUtils) {
+], function ($, _, utils, stringUtils) {
     'use strict';
 
     var tmplSettings = _.templateSettings,
@@ -172,7 +175,7 @@ define([
 
                 if (isTemplate(value)) {
                     list[key] = render(value, tmpl, castString);
-                } else if (jQuery.isPlainObject(value) || Array.isArray(value)) {
+                } else if ($.isPlainObject(value) || Array.isArray(value)) {
                     _.each(value, iterate);
                 }
             });