Merge branch 'master' of http://47.99.244.21:9999/root/joshine

app/code/Magento/Theme/Block/Html/Topmenu.php

@@ -231,7 +231,15 @@ class Topmenu extends Template implements IdentityInterface
 
 
             $html .= '</div>';
             $html .= '</div>';
             $html .= '</div>';
             $html .= '</div>';
-        } else {
+        } else if($childLevel == 0) {
+            $html .= '<div class="level' . $childLevel . ' ' . $childrenWrapClass . '">';
+            $html .= '<div class="row">';
+            $html .= '<ul class="subchildmenu col-sm-12 mega-columns columns4">';
+            $html .= $this->_getHtmlStyle1($child, $childrenWrapClass, $limit, $colStops);
+            $html .= '</ul>';
+            $html .= '</div>';
+            $html .= '</div>';
+        } else{
             $html .= '<ul class="level' . $childLevel . '">';
             $html .= '<ul class="level' . $childLevel . '">';
             $html .= $this->_getHtml($child, $childrenWrapClass, $limit, $colStops);
             $html .= $this->_getHtml($child, $childrenWrapClass, $limit, $colStops);
             $html .= '</ul>';
             $html .= '</ul>';

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -1960,11 +1960,6 @@ background-color: #000;
 //  width: 100px !important;
 //  width: 100px !important;
 //}
 //}
 
 
-.cart-container {
-  width: 81%;
-  margin: 0 auto;
-}
-
 .block.review-add.amreview-submit-form{
 .block.review-add.amreview-submit-form{
   display: none;
   display: none;
 }
 }

lib/web/jquery/ui-modules/menu.js

@@ -301,7 +301,7 @@ define([
                 })
                 })
                 .each(function () {
                 .each(function () {
                     var menu = $(this),
                     var menu = $(this),
-                        item = menu.prev("a"),
+                        item = menu.parent().parent().prev("a"),
                         submenuCarat = $("<span>")
                         submenuCarat = $("<span>")
                             .addClass("ui-menu-icon ui-icon " + icon)
                             .addClass("ui-menu-icon ui-icon " + icon)
                             .data("ui-menu-submenu-carat", true);
                             .data("ui-menu-submenu-carat", true);