From 41a5ed82dffc84c2009ac24cd7e1a558893e1dcf Mon Sep 17 00:00:00 2001
From: "shubhammehrotra.symfony@webkul.com"
 <shubhammehrotra.symfony@webkul.com>
Date: Tue, 31 Dec 2019 12:26:34 +0530
Subject: [PATCH] mini-cart design updates

---
 .../publishable/assets/css/velocity.css       | 22 +++++++++++--------
 .../publishable/assets/js/velocity.js         |  2 +-
 .../Velocity/src/Resources/assets/js/app.js   |  2 +-
 .../Resources/assets/sass/components/app.scss | 17 ++++++++++++++
 .../assets/sass/components/product-view.scss  |  6 -----
 .../assets/sass/components/shared.scss        |  6 -----
 .../Resources/views/UI/particals.blade.php    |  5 ++++-
 .../views/checkout/cart/index.blade.php       |  6 ++---
 .../views/checkout/cart/mini-cart.blade.php   |  5 ++---
 .../Resources/views/layouts/master.blade.php  |  2 +-
 .../layouts/top-nav/login-section.blade.php   |  2 +-
 .../Resources/views/search/search.blade.php   |  2 +-
 12 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
index 1bc3d0275..3f571a462 100644
--- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css
+++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
@@ -1015,6 +1015,10 @@
   margin-bottom: 5px;
 }
 
+#product-card-new .product-price .sticker {
+  display: block;
+}
+
 .quantity {
   width: 100%;
   padding-bottom: 10px;
@@ -1193,7 +1197,6 @@
   z-index: 100;
   width: 350px;
   left: -230px;
-  display: none;
   position: absolute;
 }
 
@@ -1730,6 +1733,7 @@
   left: 0;
   border: none;
   color: white;
+  display: none;
   font-size: 14px;
   font-weight: 600;
   padding: 6px 14px;
@@ -1750,6 +1754,14 @@
   text-decoration: line-through;
 }
 
+#app {
+  min-height: 65vh;
+}
+
+.search-container :first-child {
+  margin-left: 0px;
+}
+
 /* @author Shubham Mehrotra */
 body {
   overflow-x: hidden;
@@ -3056,10 +3068,6 @@ body::after {
   padding: 10px 0 !important;
 }
 
-.small-card-container .product-price .sticker {
-  display: none;
-}
-
 .small-card-container:hover {
   -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
           box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14);
@@ -3364,10 +3372,6 @@ button[disabled] {
   font-size: 16px;
 }
 
-.product-detail .right .product-price .sticker {
-  display: none;
-}
-
 .product-detail .thumb-list {
   left: 15px;
   z-index: 1000;
diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
index d0e031771..1872b2d0f 100644
--- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js
+++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
@@ -1172,7 +1172,7 @@ $(document).ready(function () {
 
         created: function created() {
             window.addEventListener('click', function () {
-                var modals = document.getElementsByClassName('account-modal');
+                var modals = document.getElementsByClassName('sensitive-modal');
 
                 Array.from(modals).forEach(function (modal) {
                     modal.classList.add('hide');
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/app.js b/packages/Webkul/Velocity/src/Resources/assets/js/app.js
index 043f2cf56..36d0d3b3b 100755
--- a/packages/Webkul/Velocity/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/app.js
@@ -90,7 +90,7 @@ $(document).ready(function () {
 
         created: function () {
             window.addEventListener('click', () => {
-                let modals = document.getElementsByClassName('account-modal');
+                let modals = document.getElementsByClassName('sensitive-modal');
 
                 Array.from(modals).forEach(modal => {
                     modal.classList.add('hide');
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 e47870556..a3cd62f3a 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
@@ -244,6 +244,12 @@
             margin-bottom: 5px;
         }
     }
+
+    .product-price {
+        .sticker {
+            display: block;
+        }
+    }
 }
 
 .quantity {
@@ -1027,6 +1033,7 @@
         left: 0;
         border: none;
         color: white;
+        display: none;
         font-size: 14px;
         font-weight: 600;
         padding: 6px 14px;
@@ -1046,4 +1053,14 @@
     .special-price {
         text-decoration: line-through;
     }
+}
+
+#app {
+    min-height: 65vh;
+}
+
+.search-container {
+    :first-child {
+        margin-left: 0px;
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss
index 7a5117152..f9b106bf3 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss
@@ -294,12 +294,6 @@
                 }
             }
         }
-
-        .product-price {
-            .sticker {
-                display: none;
-            }
-        }
     }
 
     .thumb-list {
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 e5df54155..20db4bb0e 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss
@@ -495,12 +495,6 @@
         display: inline-block;
         padding: 10px 0 !important;
     }
-
-    .product-price {
-        .sticker {
-            display: none;
-        }
-    }
 }
 
 .small-card-container:hover {
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 fef8a64ac..577c90634 100644
--- a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php
@@ -97,7 +97,10 @@
 
             methods: {
                 toggleMiniCart: function () {
-                    $('#cart-modal-content').toggle();
+                    let modal = $('#cart-modal-content')[0];
+                    modal.classList.toggle('hide');
+
+                    event.stopPropagation();
                 }
             }
         })
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php
index d04b99dd4..edb1254e9 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/index.blade.php
@@ -19,11 +19,11 @@
                         {{ __('velocity::app.checkout.items') }}
                     </span>
 
-                    <span class="col-1 fw6 fs16 no-padding">
+                    <span class="col-2 fw6 fs16 no-padding text-center">
                         {{ __('velocity::app.checkout.qty') }}
                     </span>
 
-                    <span class="col-1 fw6 fs16 pr0 ml5">
+                    <span class="col-2 fw6 fs16 text-right pr0">
                         {{ __('velocity::app.checkout.subtotal') }}
                     </span>
                 </div>
@@ -84,7 +84,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="product-quantity col-2 no-padding">
+                                    <div class="product-quantity col-3 no-padding">
                                         <quantity-changer
                                             :control-name="'qty[{{$item->id}}]'"
                                             quantity="{{ $item->quantity }}">
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php
index 3de6eab86..6fe47271b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php
@@ -14,8 +14,7 @@
         <div class="dropdown">
             <cart-btn item-count="{{ $cart->items->count() }}"></cart-btn>
 
-            <div class="modal-content" id="cart-modal-content">
-
+            <div class="modal-content sensitive-modal cart-modal-content hide" id="cart-modal-content">
                 <!--Body-->
                 <div class="pl20 pt10 pr15 fs14">
                     @foreach ($items as $item)
@@ -106,4 +105,4 @@
             <cart-btn item-count="{{ __('shop::app.minicart.zero') }}"></cart-btn>
         </div>
     @endif
-</div>
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
index 5ba81e6cf..1e03d389e 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
@@ -78,7 +78,7 @@
                         ></content-header>
 
                         <div class="container">
-                            <div class="row col-12">
+                            <div class="row col-12 pr0">
                                 <sidebar-component
                                     main-sidebar=true
                                     url="{{ url()->to('/') }}"
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
index 8eb5a6e68..801b09540 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
@@ -29,7 +29,7 @@
                 </div>
             </button>
 
-            <div class="account-modal hide mt5" role="document">
+            <div class="account-modal sensitive-modal hide mt5">
                 <!--Content-->
                     @guest('customer')
                         <div class="modal-content">
diff --git a/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php b/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php
index 70aa84282..a07652ccb 100644
--- a/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/search/search.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('content-wrapper')
-    <section class="cart-details row offset-1">
+    <section class="search-container cart-details row offset-1">
         @if (! $results)
             <h1 class="fw6 row col-12">{{  __('shop::app.search.no-results') }}</h1>
         @else