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

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

@@ -197,12 +197,7 @@ class Topmenu extends Template implements IdentityInterface
         $name = $child->getData('name');
         $name = strtoupper($name);
 
-        if ($name == 'TOPS') {
-            $html .= '<div class="level' . $childLevel . ' ' . $childrenWrapClass . '">';
-//        $html .= $this->_getHtml($child, $childrenWrapClass, $limit, $colStops);
-            $html .= '1222';
-            $html .= '</div>';
-        } elseif ($name == 'BODYSUITS') {
+        if ($name == 'BODYSUITS' || $name == 'SUPERDEAL') {
             $html .= '<div class="level' . $childLevel . ' ' . $childrenWrapClass . '">';
             $html .= '<div class="row">';
             $html .= '<ul class="subchildmenu col-sm-12 mega-columns columns4">';
@@ -227,6 +222,15 @@ class Topmenu extends Template implements IdentityInterface
             $html .= '</div>';
             $html .= '</div>';
             $html .= '</div>';
+        } elseif ($name == 'SERVICES') {
+            $html .= '<div class="level' . $childLevel . ' ' . $childrenWrapClass . ' col-sm-11">';
+            $html .= '<div class="row">';
+            $html .= '<ul class="subchildmenu col-sm-9">';
+            $html .= $this->_getHtml($child, $childrenWrapClass, $limit, $colStops);
+            $html .= '</ul>';
+
+            $html .= '</div>';
+            $html .= '</div>';
         } else {
             $html .= '<ul class="level' . $childLevel . '">';
             $html .= $this->_getHtml($child, $childrenWrapClass, $limit, $colStops);

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

@@ -1013,6 +1013,23 @@ footer{
       color: #666666;
       font-family: 'Outfit-Regular', sans-serif;
     }
+
+    .navigation .subchildmenu.col-sm-9 li{
+      position: relative;
+      border: none;
+    }
+    .navigation li.level0 .submenu .subchildmenu.col-sm-9 li.level1{
+      position: relative;
+      border: none;
+    }
+    .navigation li.level0.last{
+      position: relative;
+    }
+    .submenu.col-sm-11{
+      width: 13rem;
+      margin-top: 16px;
+      padding: 10px 0;
+    }
   }
 }