Merge pull request #6108 from jitendra-webkul/master

Issue #6103 fixed (Velocity responsive header issue fixed)

packages/Webkul/Velocity/publishable/assets/mix-manifest.json

@@ -1,10 +1,10 @@
 {
     "/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
     "/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
-    "/js/velocity.js": "/js/velocity.js?id=3cd83fba39c97987d9fd43b0dcd87998",
+    "/js/velocity.js": "/js/velocity.js?id=d11c79d9247082d5ebe37d082879eb00",
     "/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
-    "/js/components.js": "/js/components.js?id=4d8e3ff8eb757c055c17e645e8186a6d",
-    "/css/velocity.css": "/css/velocity.css?id=b52d15b7e354ab4d33f797d00df3ab2a",
+    "/js/components.js": "/js/components.js?id=0ac4482abb101f7c7d074865ac6edeae",
+    "/css/velocity.css": "/css/velocity.css?id=8bf52e6eafeb3bfca6f829fe5aa5303c",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
     "/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
     "/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",

packages/Webkul/Velocity/src/Resources/assets/js/UI/components/header-mobile.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="row">
-        <div class="col-sm-6 col-xs-12">
+        <div class="col-6">
             <div v-if="hamburger" class="nav-container scrollable">
                 <div class="wrapper" v-if="this.rootCategories">
                     <div class="greeting drawer-section fw6">
@@ -282,7 +282,7 @@
             <slot name="logo"></slot>
         </div>
 
-        <div class="right-vc-header col-sm-6 col-xs-12">
+        <div class="right-vc-header col-6">
             <slot name="top-header"></slot>
 
             <a class="unset cursor-pointer" @click="openSearchBar">

packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss

@@ -411,11 +411,9 @@
                 .selectdiv {
                     display: none;
 
-                    + div {
-                        input {
-                            width: calc(100% - 40px);
-                            border: 1px solid $theme-color;
-                        }
+                    + input {
+                        width: calc(100% - 40px);
+                        border: 1px solid $theme-color;
                     }
                 }
             }
@@ -965,16 +963,6 @@
         display: none !important;
     }
 
-    .main-content-wrapper {
-        .vc-header {
-            > div.vc-small-screen {
-                .right-vc-header {
-                    text-align: center;
-                }
-            }
-        }
-    }
-
     #home-right-bar-container {
         position: unset;
         top: unset;

packages/Webkul/Velocity/src/Resources/views/shop/layouts/header/mobile.blade.php

@@ -18,7 +18,7 @@
 
     {{-- this is default content if js is not loaded --}}
     <div class="row">
-        <div class="col-sm-6 col-xs-12">
+        <div class="col-6">
             <div class="hamburger-wrapper">
                 <i class="rango-toggle hamburger"></i>
             </div>
@@ -28,7 +28,7 @@
             </a>
         </div>
 
-        <div class="right-vc-header col-sm-6 col-xs-12">
+        <div class="right-vc-header col-6">
             <a class="unset cursor-pointer">
                 <i class="material-icons">search</i>
             </a>