🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #16226: Navigation dropdown caret icon. (by @tejash-wagento)
 - #16294: Removed duplicate line and added comment on variable (by @vgelani)
 - #16255: #15255 unlock customer after password reset (by @vgelani)
 - #15727: [Backport] Feature space between category page (by @sanjay-wagento)


Fixed GitHub Issues:
 - #15255: Customer who exceeded max login failures not able to login even after reset password (reported by @tizzyguy87) has been fixed in #16255 by @vgelani in 2.1-develop branch
   Related commits:
     1. be0f9bc

 - #12601: A space between the category page and the main footer when applying specific settings (reported by @wd7080) has been fixed in #15727 by @sanjay-wagento in 2.1-develop branch
   Related commits:
     1. 5e6abd5

Author: Stanislav Idolov

app/code/Magento/Customer/Model/AccountManagement.php

@@ -586,6 +586,7 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
+        $this->getAuthentication()->unlock($customer->getId());
         $this->sessionManager->destroy();
         $this->destroyCustomerSessions($customer->getId());
         $this->customerRepository->save($customer);

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php

@@ -15,8 +15,6 @@
  */
 class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
-    //protected $_template = 'tax/checkout/subtotal.phtml';
-
     /**
      * Tax config
      *

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

@@ -494,6 +494,16 @@
         }
     }
 
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
+
 }
 
 //

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

@@ -562,6 +562,16 @@
             }
         }
     }
+
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
 }
 
 //

lib/web/css/source/lib/_navigation.less

@@ -355,6 +355,25 @@
                 overflow: visible !important;
             }
 
+            &.parent {
+                > .level-top {
+                    padding-right: 20px;
+
+                    > .ui-menu-icon {
+                        position: absolute;
+                        right: 0;
+
+                        .lib-icon-font(
+                            @icon-down,
+                            @_icon-font-size: 12px,
+                            @_icon-font-line-height: 20px,
+                            @_icon-font-text-hide: true,
+                            @_icon-font-position: after
+                        );
+                    }
+                }
+            }
+
             .submenu {
                 .lib-css(background, @_submenu-background-color);
                 .lib-css(border, @_submenu-border-width @_submenu-border-style @_submenu-border-color);
@@ -414,6 +433,26 @@
                     left: auto !important;
                     right: 100%;
                 }
+
+                li {
+                    margin: 0;
+                    &.parent {
+                        > a {
+                            > .ui-menu-icon {
+                                position: absolute;
+                                right: 3px;
+
+                                .lib-icon-font(
+                                    @icon-next,
+                                    @_icon-font-size: 12px,
+                                    @_icon-font-line-height: 20px,
+                                    @_icon-font-text-hide: true,
+                                    @_icon-font-position: after
+                                );
+                            }
+                        }
+                    }
+                }
             }
 
             &.more {