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

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

@@ -1010,7 +1010,7 @@ footer{
   background: #f2f2f2;
   background: #f2f2f2;
   border-top: 1px solid #e1e1e1;
   border-top: 1px solid #e1e1e1;
   font-family: 'Outfit-Regular', sans-serif;
   font-family: 'Outfit-Regular', sans-serif;
-  display: flex;
+
 
 
   .nav-sections{
   .nav-sections{
     background: transparent;
     background: transparent;
@@ -1019,6 +1019,7 @@ footer{
     position: unset;
     position: unset;
   }
   }
   @media(min-width: 640px){
   @media(min-width: 640px){
+    display: flex;
     .navigation .active>a.level-top, .navigation .has-active>a.level-top{
     .navigation .active>a.level-top, .navigation .has-active>a.level-top{
       background:none;
       background:none;
     }
     }
@@ -1219,51 +1220,56 @@ footer{
 //  z-index: 1;
 //  z-index: 1;
 //}
 //}
 }
 }
-@media(max-width: 639.98px) {
-.navigation span.ui-menu-icon{
-top: 50%;
-right: 36px;
-margin-top: -7px;
-position: absolute;
-text-transform: uppercase;
-font: inherit;
-font-size: 9px;
-padding: 2px;
-border-radius: 2px;
-line-height: 1;
-color: #fff;
-}
-.navigation span.ui-menu-icon.ui-icon-1{
-background-color: #0cc485 !important;
-}
-.navigation span.ui-menu-icon:before{
-content: "";
-position: absolute;
-width: 3px;
-height: 3px;
-border: 3px solid transparent;
-left: -6px;
-bottom: 3px;
-}
-.navigation span.ui-menu-icon.ui-icon-1:before{
-border-right-color: #0cc485 !important;
-}
-.navigation li.level0 > .level-top{
-display: block;
-color: #222222;
-text-decoration: none;
-text-transform: capitalize;
-font-size: 16px;
-font-weight: 400;
-padding: 15px 0 !important;
-border-bottom: 1px solid #e1e1e1;
-border-color: #e5e5e5;
-line-height: 24px;
-}
-.mobile-header-panel{
-border:none;
-}
-}
+  @media (max-width: 639.98px) {
+    .navigation span.ui-menu-icon {
+      top: 50%;
+      right: 36px;
+      margin-top: -7px;
+      position: absolute;
+      text-transform: uppercase;
+      font: inherit;
+      font-size: 9px;
+      padding: 2px;
+      border-radius: 2px;
+      line-height: 1;
+      color: #fff;
+    }
+
+    .navigation span.ui-menu-icon.ui-icon-1 {
+      background-color: #0cc485 !important;
+    }
+
+    .navigation span.ui-menu-icon:before {
+      content: "";
+      position: absolute;
+      width: 3px;
+      height: 3px;
+      border: 3px solid transparent;
+      left: -6px;
+      bottom: 3px;
+    }
+
+    .navigation span.ui-menu-icon.ui-icon-1:before {
+      border-right-color: #0cc485 !important;
+    }
+
+    .navigation li.level0 > .level-top {
+      display: block;
+      color: #222222;
+      text-decoration: none;
+      text-transform: capitalize;
+      font-size: 16px;
+      font-weight: 400;
+      padding: 15px 0 !important;
+      border-bottom: 1px solid #e1e1e1;
+      border-color: #e5e5e5;
+      line-height: 24px;
+    }
+
+    .mobile-header-panel {
+      border: none;
+    }
+  }
 }
 }
 
 
 @media(max-width:789px){
 @media(max-width:789px){