Merge pull request #2427 from shubhwebkul/velocity-updated

WIP: misc. bug fixes

packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php

@@ -20,7 +20,8 @@ class ChannelTableSeeder extends Seeder
                 'footer_content' => '<div class="list-container"><span class="list-heading">Quick Links</span><ul class="list-group"><li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li><li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li><li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li><li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li><li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li></ul></div><div class="list-container"><span class="list-heading">Connect With Us</span><ul class="list-group"><li><a href="#"><span class="icon icon-facebook"></span>Facebook </a></li><li><a href="#"><span class="icon icon-twitter"></span> Twitter </a></li><li><a href="#"><span class="icon icon-instagram"></span> Instagram </a></li><li><a href="#"> <span class="icon icon-google-plus"></span>Google+ </a></li><li><a href="#"> <span class="icon icon-linkedin"></span>LinkedIn </a></li></ul></div>',
                 'name' => 'Default',
                 'default_locale_id' => 1,
-                'base_currency_id' => 1
+                'base_currency_id' => 1,
+                'home_seo' => '{"meta_title": "Demo store", "meta_keywords": "Demo store meta keyword", "meta_description": "Demo store meta description"}',
             ]);
 
         DB::table('channel_currencies')->insert([

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

@@ -1,5 +1,5 @@
 {
     "/js/velocity.js": "/js/velocity.js?id=50ea01bd19c367308b08",
-    "/css/velocity.css": "/css/velocity.css?id=e9266605aba73153bf0f",
+    "/css/velocity.css": "/css/velocity.css?id=083f463830ae7db04ed7",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
 }

packages/Webkul/Velocity/src/Resources/assets/sass/app.scss

@@ -481,19 +481,29 @@ header {
 
         #mini-cart {
             .mini-cart-content {
-                width: 75px;
                 font-size: 16px;
                 font-weight: 600;
                 text-align: right;
+                margin-right: 7px;
                 letter-spacing: 0;
                 position: relative;
                 color: $font-color;
                 display: inline-block;
 
                 i {
-                    ~ span {
-                        top: -2px;
-                        left: -4px;
+                    + span.cart-text {
+                        padding-left: 0px;
+                        vertical-align: text-bottom;
+                    }
+                }
+
+                .cart-text {
+                    padding-left: 5px;
+                }
+
+                + .down-arrow-container {
+                    .rango-arrow-down {
+                        top: 8px;
                     }
                 }
             }

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

@@ -523,19 +523,13 @@
         .badge {
             @include border-radius(50%);
 
-            top: -7px;
-            left: -13px;
+            top: -2px;
+            left: 15px;
             padding: 4px;
             min-width: 20px;
-            position: relative;
+            position: absolute;
             background: $button-primary-bg;
         }
-
-        .cart-text {
-            top: 0px;
-            left: -14px;
-            position: relative;
-        }
     }
 }
 

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

@@ -258,6 +258,7 @@
 }
 
 .theme-btn {
+    z-index: 10;
     border: none;
     cursor: pointer;
     font-weight: 600;

packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php

@@ -120,11 +120,11 @@
                         disable_button: false,
                         reviewComponentKey: 0,
                         summeryComponentKey: 0,
+                        showPaymentSection: false,
+                        showSummarySection: false,
                         isPlaceOrderEnabled: false,
                         new_billing_address: false,
                         showShippingSection: false,
-                        showPaymentSection: false,
-                        showSummarySection: false,
                         new_shipping_address: false,
                         selected_payment_method: '',
                         selected_shipping_method: '',

packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php

@@ -105,7 +105,10 @@
                 </h3>
 
                 <i class="rango-arrow"></i>
+            </div>
 
+
+            <div class="col-12 no-padding" slot="body">
                 @auth('customer')
                     @if(count(auth('customer')->user()->addresses))
                         <a
@@ -116,9 +119,7 @@
                         </a>
                     @endif
                 @endauth
-            </div>
 
-            <div class="col-12 no-padding" slot="body">
                 @include('shop::checkout.onepage.customer-new-form', [
                     'billing' => true
                 ])