From 1b4bf01ee4f8154e80239d6581a8b3e096225271 Mon Sep 17 00:00:00 2001
From: Aayush Bhatt <aayush.bhatt172@webkul.com>
Date: Thu, 9 Jan 2020 13:57:53 +0530
Subject: [PATCH 1/2] theme bug fixes

---
 database/seeds/DatabaseSeeder.php             |  2 +-
 .../views/products/list/toolbar.blade.php     |  2 +-
 .../publishable/assets/css/velocity.css       | 44 +++++++++++++++++--
 .../publishable/assets/js/velocity.js         |  2 +-
 .../js/UI/components/content-header.vue       |  2 +-
 .../Resources/assets/sass/components/app.scss | 27 +++++++++++-
 .../assets/sass/components/home.scss          | 19 ++++++--
 .../Resources/views/UI/particals.blade.php    |  3 +-
 .../views/UI/product-quick-view.blade.php     | 11 +++--
 .../views/products/list/toolbar.blade.php     | 20 ++++-----
 10 files changed, 104 insertions(+), 28 deletions(-)

diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 4ba37fd10..3593ddb70 100755
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 use Webkul\Admin\Database\Seeders\DatabaseSeeder as BagistoDatabaseSeeder;
-use Webkul\Velocity\Database\Seeders\DatabaseSeeder as VelocityDatabaseSeeder;
+use Webkul\Velocity\Database\Seeders\VelocityMetaDataSeeder as VelocityDatabaseSeeder;
 
 class DatabaseSeeder extends Seeder
 {
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
index f8413fcc4..7db9e4e9b 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
@@ -42,7 +42,7 @@
         <div class="sorter">
             <label>{{ __('shop::app.products.sort-by') }}</label>
 
-            <select onchange="window.location.href = this.value">
+            <select style="-webkit-appearance: none;" onchange="window.location.href = this.value">
 
                 @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
 
diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
index 9044abc29..8074a6255 100644
--- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css
+++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
@@ -1090,6 +1090,10 @@
   background-color: #0D2438;
 }
 
+.product-card-new:hover #quick-view-btn-container {
+  display: block;
+}
+
 .quantity {
   width: 100%;
   padding-bottom: 10px;
@@ -2301,6 +2305,29 @@
   padding: 42px 10px 0 10px;
 }
 
+.selective-div {
+  -webkit-appearance: none;
+}
+
+.select-icon-margin {
+  margin-top: 10px;
+  margin-left: 96px;
+}
+
+.down-icon-position {
+  position: absolute;
+}
+
+.select-icon-show-margin {
+  margin-left: 35px;
+  margin-top: 10px;
+}
+
+.down-arrow-margin {
+  margin-left: 75px;
+  margin-top: 8px;
+}
+
 /* @author Shubham Mehrotra */
 body {
   overflow-x: hidden;
@@ -2780,7 +2807,7 @@ header #search-form > *:focus {
 
 .categories-sidebar-container .content-list ul {
   width: 100%;
-  height: 100%;
+  height: 104%;
   padding-left: 10px;
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;
@@ -2862,7 +2889,7 @@ header #search-form > *:focus {
 
 body::after {
   /* dark overlay layer - visible when we fire .cd-quick-view */
-  position: fixed;
+  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
@@ -2910,7 +2937,8 @@ body::after {
 }
 
 .cd-quick-view .action-buttons {
-  padding-top: 20px;
+  padding-top: 10px;
+  margin-left: 118px;
 }
 
 .cd-quick-view .action-buttons > span {
@@ -2932,6 +2960,16 @@ body::after {
   border: 1px solid red;
 }
 
+.ul-shadow {
+  -webkit-box-shadow: 1px 2px 8px #888888;
+          box-shadow: 1px 2px 8px #888888;
+}
+
+.quick-addtocart-btn {
+  margin-top: 329px;
+  margin-left: -82px;
+}
+
 .footer {
   width: 100%;
   background-color: #ffffff;
diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
index d1c5651f8..63a0d985f 100644
--- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js
+++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
@@ -36873,7 +36873,7 @@ var render = function() {
       _c("div", { staticClass: "content-list right" }, [
         _c(
           "ul",
-          { staticClass: "no-margin", attrs: { type: "none" } },
+          { staticClass: "no-margin ul-shadow", attrs: { type: "none" } },
           _vm._l(_vm.headerContent, function(content, index) {
             return _c("li", { key: index }, [
               content["content_type"] == "link"
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
index 66b9d8f23..0083953c3 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
@@ -15,7 +15,7 @@
         </div>
 
         <div class="content-list right">
-            <ul type="none" class="no-margin">
+            <ul type="none" class="no-margin ul-shadow">
                 <li v-for="(content, index) in headerContent" :key="index">
                     <a
                         v-text="content.title"
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
index 2c279458d..bfd4295ac 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
@@ -291,7 +291,7 @@
 
 .product-card-new:hover {
     #quick-view-btn-container {
-        // display: block;
+        display: block;
     }
 }
 
@@ -1611,4 +1611,27 @@
 
 .layered-filter-wrapper {
     padding: 42px 10px 0 10px;
-}
\ No newline at end of file
+}
+
+.selective-div {
+    -webkit-appearance: none;
+}
+
+.select-icon-margin {
+    margin-top: 10px;
+    margin-left: 96px;
+
+}
+.down-icon-position {
+    position: absolute;
+}
+
+.select-icon-show-margin {
+    margin-left: 35px;
+    margin-top: 10px;
+}
+
+.down-arrow-margin {
+    margin-left: 75px;
+    margin-top: 8px;
+}
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
index 5f5d49705..7aca3aa0d 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
@@ -521,7 +521,7 @@ header #search-form > *:focus {
 
         ul {
             width: 100%;
-            height: 100%;
+            height: 104%;
             padding-left: 10px;
             display: inline-flex;
             background-color: $link-color;
@@ -605,7 +605,7 @@ header #search-form > *:focus {
 
 body::after {
     /* dark overlay layer - visible when we fire .cd-quick-view */
-    position: fixed;
+    position: absolute;
     top: 0;
     left: 0;
     width: 100%;
@@ -653,7 +653,8 @@ body::after {
     }
 
     .action-buttons {
-        padding-top: 20px;
+        padding-top: 10px;
+        margin-left: 118px;
 
         > span {
             font-size: 24px;
@@ -674,4 +675,14 @@ body::after {
 
 .demo {
     border: 1px solid red;
-}
\ No newline at end of file
+}
+
+.ul-shadow {
+    box-shadow: 1px 2px 8px #888888;
+}
+
+.quick-addtocart-btn {
+    margin-top: 329px;
+    margin-left: -82px;
+}
+
diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
index f3ff627e9..6918a89aa 100644
--- a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
@@ -27,12 +27,13 @@
 
 <script type="text/x-template" id="cart-btn-template">
     <button
-        :class="`btn btn-link disable-box-shadow ${parseInt(itemCount) ? 'dropdown-icon-custom' : ''}`"
+        :class="`btn btn-link disable-box-shadow ${parseInt(itemCount)}`"
         type="button"
         id="mini-cart"
         @click="toggleMiniCart">
 
         <div class="mini-cart-content">
+            <i class="icon fs16 cell rango-arrow-down down-icon-position down-arrow-margin"></i>
             <i class="rango-cart-1 fs24 text-down-3"></i>
             <span class="badge" v-text="itemCount"></span>
             <span class="fs18 fw6 cart-text">{{ __('velocity::app.minicart.cart') }}</span>
diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
index 8ef5cb244..483675df8 100644
--- a/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
@@ -50,10 +50,10 @@
         </div>
 
         <div class="col-lg-6 cd-item-info fs16">
-            <h2 class="text-nowrap fw6">{{ $product->name }}</h2>
+            <h2 class="text-nowrap fw6" style="color: #555555; font-size: 24px;">{{ $product->name }}</h2>
 
             <div class="product-price fs14">
-                <h2 class="text-nowrap fw6">{{ $product->price }}</h2>
+                <h2 class="text-nowrap fw6" style="color: #555555; font-size: 30px;">{{ $product->price }}</h2>
             </div>
 
             {{-- @TODO --}}
@@ -67,12 +67,15 @@
                 </div>
             @endif --}}
 
-            <p class="pt20">
+            <p class="pt20" style="font-size: 14px;">
                 {!! $product->description !!}
             </p>
+            <button class="btn btn-add-to-cart quick-addtocart-btn">
+                <span class="rango-cart-1 fs20"></span>
+                Submit
+            </button>
 
             <div class="action-buttons">
-
                 <div style="display: inline-block;" class="rango-exchange fs24"></div>
                 <div style="display: inline-block;" class="rango-heart fs24"></div>
             </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php
index 4955e3e75..972100c48 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/list/toolbar.blade.php
@@ -41,24 +41,24 @@
 
     <div class="sorter">
         <label>{{ __('shop::app.products.sort-by') }}</label>
+        <i class="icon fs16 cell rango-arrow-down select-icon-margin down-icon-position"></i>
+            <select class="selective-div" onchange="window.location.href = this.value">
 
-        <select onchange="window.location.href = this.value">
+                @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
 
-            @foreach ($toolbarHelper->getAvailableOrders() as $key => $order)
+                    <option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
+                        {{ __('shop::app.products.' . $order) }}
+                    </option>
 
-                <option value="{{ $toolbarHelper->getOrderUrl($key) }}" {{ $toolbarHelper->isOrderCurrent($key) ? 'selected' : '' }}>
-                    {{ __('shop::app.products.' . $order) }}
-                </option>
+                @endforeach
 
-            @endforeach
-
-        </select>
+            </select>
     </div>
 
     <div class="limiter">
         <label>{{ __('shop::app.products.show') }}</label>
-
-        <select onchange="window.location.href = this.value">
+        <i class="icon fs16 cell rango-arrow-down select-icon-show-margin down-icon-position"></i>
+        <select class="selective-div" onchange="window.location.href = this.value" style="width: 57px;">
 
             @foreach ($toolbarHelper->getAvailableLimits() as $limit)
 

From 01a1b0511b871a9a9ac7979fc1c6f48730e3e9e6 Mon Sep 17 00:00:00 2001
From: Aayush Bhatt <aayush.bhatt172@webkul.com>
Date: Fri, 10 Jan 2020 18:33:08 +0530
Subject: [PATCH 2/2] updates

---
 .../publishable/assets/css/velocity.css       | 19 ++++++++++++++++-
 .../assets/sass/components/home.scss          |  6 +++++-
 .../assets/sass/components/shared.scss        | 12 +++++++++++
 .../views/UI/product-quick-view.blade.php     | 21 ++++++++++---------
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
index 8074a6255..52dd58a77 100644
--- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css
+++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
@@ -2966,10 +2966,14 @@ body::after {
 }
 
 .quick-addtocart-btn {
-  margin-top: 329px;
+  margin-top: 306px;
   margin-left: -82px;
 }
 
+.model-display-block {
+  display: block;
+}
+
 .footer {
   width: 100%;
   background-color: #ffffff;
@@ -3689,6 +3693,7 @@ body::after {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  color: #555555;
 }
 
 .small-card-container {
@@ -3907,6 +3912,18 @@ button[disabled] {
   font-family: 'Webkul Rango' !important;
 }
 
+.quick-view-name {
+  font-size: 24px;
+}
+
+.quick-view-price {
+  font-size: 30px;
+}
+
+.description-text {
+  font-size: 14px;
+}
+
 .product-detail {
   padding-top: 20px;
 }
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
index 7aca3aa0d..7fd6833a2 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss
@@ -682,7 +682,11 @@ body::after {
 }
 
 .quick-addtocart-btn {
-    margin-top: 329px;
+    margin-top: 306px;
     margin-left: -82px;
 }
 
+.model-display-block {
+   display:block;
+}
+
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
index 0a6a0b9a0..16f755c47 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
@@ -494,6 +494,7 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    color: #555555;
 }
 
 .small-card-container {
@@ -716,5 +717,16 @@ button[disabled] {
     font-variant: normal;
     -webkit-font-smoothing: antialiased;
     font-family: 'Webkul Rango' !important;
+}
 
+.quick-view-name {
+    font-size: 24px;
+}
+
+.quick-view-price {
+    font-size: 30px;
+}
+
+.description-text {
+    font-size: 14px;
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
index 483675df8..022e2c0d0 100644
--- a/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/UI/product-quick-view.blade.php
@@ -20,10 +20,7 @@
         id="quick-view-btn-container"
         :name="details"
         @click="openQuickView({details: details, event: $event})">
-        <product-quick-view
-            v-if="quickViewDetails"
-            :quick-view-details="quickViewDetails"
-        ></product-quick-view>
+        <product-quick-view v-if="quickViewDetails" :quick-view-details="quickViewDetails"></product-quick-view>
 
         <span class="rango-zoom-plus"></span>
 
@@ -33,7 +30,7 @@
 
 <script type="text/x-template" id="product-quick-view-template">
     <div class="cd-quick-view" v-if="quickView">
-        <div class="col-lg-6 cd-slider-wrapper">
+        <div class="col-lg-6 cd-slider-wrapper model-animation">
             <ul class="cd-slider" type="none">
                 <li class="selected">
                     <img src="{{ $productBaseImage['medium_image_url'] }}" :alt="quickViewDetails.name" />
@@ -50,10 +47,10 @@
         </div>
 
         <div class="col-lg-6 cd-item-info fs16">
-            <h2 class="text-nowrap fw6" style="color: #555555; font-size: 24px;">{{ $product->name }}</h2>
+            <h2 class="text-nowrap fw6 quick-view-name">{{ $product->name }}</h2>
 
             <div class="product-price fs14">
-                <h2 class="text-nowrap fw6" style="color: #555555; font-size: 30px;">{{ $product->price }}</h2>
+                <h2 class="text-nowrap fw6 quick-view-price">{{ $product->price }}</h2>
             </div>
 
             {{-- @TODO --}}
@@ -67,12 +64,12 @@
                 </div>
             @endif --}}
 
-            <p class="pt20" style="font-size: 14px;">
+            <p class="pt14 description-text">
                 {!! $product->description !!}
             </p>
-            <button class="btn btn-add-to-cart quick-addtocart-btn">
+            <button type="submit" class="btn btn-add-to-cart quick-addtocart-btn">
                 <span class="rango-cart-1 fs20"></span>
-                Submit
+                    Add To Cart
             </button>
 
             <div class="action-buttons">
@@ -101,6 +98,7 @@
 
                 methods: {
                     openQuickView: function ({details, event}) {
+                        document.getElementById('quick-view-btn-container').style.display = "block";
                         if (event) {
                             event.preventDefault();
                             event.stopPropagation();
@@ -134,6 +132,9 @@
                     closeQuickView: function () {
                         this.quickView = false;
                         this.quickViewDetails = false;
+                        document.getElementById('quick-view-btn-container').style.display = "none";
+                        window.location.reload();
+
                     },
 
                     changeImage: function (imageIndex) {