From 676aeb32173d0300af4b8372b2fa282f223f9294 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Fri, 12 Oct 2018 16:45:55 +0530
Subject: [PATCH] UI and System fixes

---
 .../src/Http/Controllers/CartController.php   |  11 ++
 packages/Webkul/Shop/src/Http/routes.php      |   2 +
 .../src/Resources/assets/sass/_variables.scss |  15 ++-
 .../Shop/src/Resources/assets/sass/app.scss   | 117 ++++++++++--------
 .../src/Resources/assets/sass/override.scss   |   2 +-
 .../Webkul/Shop/src/Resources/lang/en/app.php |   3 +-
 .../views/checkout/cart/index.blade.php       |   2 +-
 .../views/products/add-to-cart.blade.php      |   2 +-
 .../views/products/list/card.blade.php        |  18 ++-
 .../Ui/src/Resources/assets/sass/app.scss     |  25 ++++
 public/themes/default/assets/css/shop.css     | 104 ++++++++--------
 11 files changed, 183 insertions(+), 118 deletions(-)

diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
index 052d3cc50..de626d840 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
@@ -126,6 +126,17 @@ class CartController extends Controller
         return redirect()->back();
     }
 
+    /**
+     * Add the configurable product
+     * to the cart.
+     *
+     * @return response
+     */
+    public function addconfigurable($slug) {
+        session()->flash('warning', trans('shop::app.checkout.cart.add-config-warning'));
+        return redirect()->route('shop.products.index', $slug);
+    }
+
     public function test() {
         $result = Cart::isConfigurable(9);
     }
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index a550ce759..f6d4b96c0 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -16,6 +16,8 @@ Route::group(['middleware' => ['web']], function () {
 
     Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->name('cart.add');
 
+    Route::get('checkout/cart/addconfigurable/{slug}', 'Webkul\Shop\Http\Controllers\CartController@addconfigurable')->name('cart.add.configurable');
+
     Route::get('checkout/cart/remove/{id}', 'Webkul\Shop\Http\Controllers\CartController@remove')->name('cart.remove');
 
     Route::post('/checkout/cart', 'Webkul\Shop\Http\Controllers\CartController@updateBeforeCheckout')->defaults('_config',[
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
index ce2f39856..594c78d3a 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/_variables.scss
@@ -2,15 +2,20 @@
 //shop variables
 $font-color: #242424;
 $border-color: #E8E8E8;
-$font-size-base: 16px;
-$border-color: #E8E8E8;
-$brand-color: #0041FF;
+$border-color1: #C7C7C7;
+$brand-color: #0031F0;
+$font-color-light: #A5A5A5;
+$link-color: #2650EF;
+$background-color: #F2F2F2;
+$dark-background: #121212;
+$disc-price: #FF6472;
+$disc-price-pro: #A5A5A5;
+$other-font-color: #5E5E5E;
 //shop variables ends here
 
 
 //=======>Need to be removed
 //customer variables
-$profile-content-color: #5e5e5e;
-$horizontal-rule-color: #E8E8E8;
+
 //customer variables ends here
 //<=======Need to be removed
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 9d425aa45..470ba1720 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -162,7 +162,7 @@ section.slider-block {
 
 
             .dark-left-icon {
-                background-color: #f2f2f2;
+                background-color: $background-color;
                 height: 48px;
                 width: 48px;
                 max-height: 100%;
@@ -170,7 +170,7 @@ section.slider-block {
             }
 
             .light-right-icon {
-                background-color: #000;
+                background-color: $font-color;
                 height: 48px;
                 width: 48px;
                 max-height: 100%;
@@ -348,7 +348,7 @@ section.slider-block {
                         overflow-y: auto;
 
                         .dropdown-cart {
-                            color: #242424;
+                            color: $font-color;
                         }
                         .dropdown-cart > .dropdown-header {
                             width: 100%;
@@ -378,7 +378,7 @@ section.slider-block {
                         .dropdown-content .item{
                             display: flex;
                             flex-direction: row;
-                            border-bottom: 1px solid #E8E8E8;
+                            border-bottom: 1px solid $border-color;
                             padding-top: 8px;
                             padding-bottom: 8px;
                         }
@@ -466,7 +466,7 @@ section.slider-block {
         .nav ul {
             margin: 0;
             padding:0;
-            border: 1px solid #B1B1B1;
+            border: 1px solid $border-color;
             box-shadow: 1px 1px 1px 0 rgba(0,0,0,0.40);
         }
 
@@ -476,7 +476,7 @@ section.slider-block {
             text-decoration: none;
             padding: 0.8em 0.3em 0.8em 0.5em;
             text-transform: uppercase;
-            letter-spacing: 2px;
+            letter-spacing: -0.38px;
             position: relative;
         }
 
@@ -542,15 +542,24 @@ section.slider-block {
         .nav ul {
             position: absolute;
             white-space: nowrap;
-            border: 1px solid #B1B1B1;
+            border: 1px solid $border-color;
             background-color:white;
             z-index: 1;
             left: -99999em;
         }
 
+        .nav > li:hover {
+            background-color: $background-color;
+        }
+
         .nav > li:hover > ul {
             left: auto;
             min-width: 100%;
+
+        }
+
+        .nav > li li:hover {
+            background-color: $background-color;
         }
 
         .nav > li li:hover > ul {
@@ -576,7 +585,7 @@ section.slider-block {
         display: none;
 
         .search-content {
-            border-bottom: 1px solid #e8e8e8;
+            border-bottom: 1px solid $border-color;
             height: 48px;
 
             .search {
@@ -599,7 +608,7 @@ section.slider-block {
         }
 
         .search-content:first-child {
-            border-top: 1px solid #e8e8e8;
+            border-top: 1px solid $border-color;
         }
     }
 
@@ -675,7 +684,7 @@ section.slider-block {
 
 //footer responsive with out media query.
 .footer {
-    background-color: #f2f2f2;
+    background-color: $background-color;
     padding-left: 10%;
     padding-right: 10%;
 
@@ -692,7 +701,7 @@ section.slider-block {
 
             .list-container {
                 .list-heading {
-                    letter-spacing: -0.26px;
+
                     text-transform: uppercase;
                     color: rgba(165, 165, 165, 1);
                 }
@@ -739,7 +748,7 @@ section.slider-block {
                         }
 
                         .btn-primary {
-                            background-color: #000;
+                            background-color: $font-color;
                             margin-top: 8px;
                             border-radius: 0px;
                             text-align: center;
@@ -802,8 +811,8 @@ section.slider-block {
             }
 
             select {
-                background: #FFFFFF;
-                border: 1px solid #C7C7C7;
+                background: $background-color;
+                border: 1px solid $border-color;
                 border-radius: 3px;
                 color: $font-color;
                 padding: 10px;
@@ -865,8 +874,8 @@ section.slider-block {
         margin-right: auto;
         text-align: center;
         font-size: 18px;
-        color: #5e5e5e;
-        letter-spacing: -0.29px;
+        color: $font-color-light;
+
         text-align: center;
     }
 
@@ -886,8 +895,8 @@ section.slider-block {
         .login-text {
             font-size: 24px;
             font-weight: bold;
-            color: #3a3a3a;
-            letter-spacing: -0.23px;
+            color: $font-color;
+
             margin-top: 5%;
             margin-bottom: 3%;
         }
@@ -903,11 +912,11 @@ section.slider-block {
         .forgot-password-link {
             font-size: 17px;
             color: $brand-color;
-            letter-spacing: -0.11px;
+
             margin-bottom: 5%;
         }
         .signup-confirm {
-            letter-spacing: -0.11px;
+
             margin-bottom: 5%;
         }
 
@@ -940,7 +949,7 @@ section.slider-block {
         width: 25%;
         height: 100%;
         text-transform: capitalize;
-        color: #5e5e5e;
+        color: $font-color-light;
 
         li {
             width: 95%;
@@ -984,7 +993,7 @@ section.slider-block {
                 font-size: 17px;
                 margin-top: 1%;
                 color: $brand-color;
-                letter-spacing: -0.11px;
+
                 float: right;
             }
 
@@ -999,7 +1008,7 @@ section.slider-block {
     }
 
     .profile-content {
-        color: $profile-content-color;
+        color: $other-font-color;
         margin-top: 1.4%;
 
         table {
@@ -1034,7 +1043,7 @@ section.slider-block {
                 font-size: 17px;
                 margin-top: 1%;
                 color: $brand-color;
-                letter-spacing: -0.11px;
+
                 float: right;
             }
 
@@ -1094,8 +1103,8 @@ section.product-detail {
                 max-width: 604px;
 
                 .loader {
-                    border: 16px solid #f3f3f3;
-                    border-top: 16px solid #3498db;
+                    border: 16px solid $border-color;
+                    border-top: 16px solid $brand-color;
                     border-radius: 50%;
                     width: 50px;
                     height: 50px;
@@ -1126,12 +1135,12 @@ section.product-detail {
 
                         .thumb-frame {
                             border: 2px solid transparent;
-                            background: #F2F2F2;
+                            background: $background-color;
                             width: 120px;
                             max-height: 120px;
 
                             &.active {
-                                border-color: #979797;
+                                border-color: $border-color1;
                             }
 
                             img {
@@ -1149,7 +1158,7 @@ section.product-detail {
 
                             .overlay {
                                 opacity: 0.3;
-                                background: #000000;
+                                background: $font-color;
                                 width: 100%;
                                 height: 18px;
                                 position: absolute;
@@ -1174,7 +1183,7 @@ section.product-detail {
                     .product-hero-image {
                         display: block;
                         position: relative;
-                        background: #F2F2F2;
+                        background: $background-color;
                         width: 100%;
                         max-height: 480px;
                         height: 100%;
@@ -1270,7 +1279,7 @@ section.product-detail {
                 .full-specifications {
                     td {
                         padding: 10px 0;
-                        color: #5E5E5E;
+                        color: $font-color-light;
 
                         &:first-child {
                             padding-right: 40px;
@@ -1421,7 +1430,7 @@ section.product-detail {
             }
 
             .reviewer-details {
-                color: #5E5E5E;
+                color: $font-color-light;
             }
         }
 
@@ -1500,6 +1509,10 @@ section.cart {
                 font-size: 18px;
                 margin-bottom: 10px;
                 font-weight: 600;
+
+                a {
+                    color: $font-color;
+                }
             }
 
             .price {
@@ -1518,7 +1531,7 @@ section.cart {
                 justify-content: flex-start;
 
                 div.qty-text {
-                    color: #5E5E5E;
+                    color: $font-color-light;
                     margin-right: 10px;
                 }
 
@@ -1645,10 +1658,10 @@ section.cart {
                 }
 
                 &.active {
-                    color: #2650EF;
+                    color: $link-color;
 
                     .decorator {
-                        border: 1px solid #2650EF;
+                        border: 1px solid $link-color;
                     }
                 }
             }
@@ -1706,14 +1719,14 @@ section.cart {
 
                     .card-content {
                         margin-top: 15px;
-                        color: #121212;
+                        color: $font-color;
                         line-height: 25px;
 
                         .horizontal-rule {
                             margin: 12px 0;
                             display: block;
                             width: 25px;
-                            background: #121212;
+                            background: $dark-background;
                         }
                     }
                 }
@@ -1725,7 +1738,7 @@ section.cart {
                         .title {
                             width: 100px;
                             display: inline-block;
-                            color: #5E5E5E;
+                            color: $font-color-light;
                             font-weight: 500;
                             margin-bottom: 10px;
                         }
@@ -1841,7 +1854,7 @@ section.cart {
 
     .horizontal-rule {
         height: 1px;
-        background: $horizontal-rule-color;
+        background: $border-color;
         width: 148px;
         margin-bottom: 24px;
         margin-left:auto;
@@ -1878,7 +1891,7 @@ section.review {
 
                 span {
                     font-size: 24px;
-                    letter-spacing: -0.58px;
+
                 }
             }
 
@@ -1887,19 +1900,19 @@ section.review {
 
                 .pro-price {
                     font-size: 24px;
-                    color: #FF6472;
-                    letter-spacing: -0.58px;
+                    color: $disc-price;
+
                 }
 
                 .pro-price-not {
                     margin-left: 10px;
-                    color: #A5A5A5;
-                    letter-spacing: -0.26px;
+                    color: $disc-price-pro;
+
                 }
 
                 .offer {
                     margin-left: 10px;
-                    letter-spacing: -0.26px;
+
                 }
             }
         }
@@ -1912,7 +1925,7 @@ section.review {
                 margin-top: 10px;
 
                 span {
-                    letter-spacing: -0.26px;
+
                 }
 
                 .btn.btn-primary.right {
@@ -1923,8 +1936,8 @@ section.review {
 
             .rating {
                 margin-top : 25px;
-                color: #5E5E5E;
-                letter-spacing: -0.12px;
+                color: $font-color-light;
+
 
                 span {
                     display: inline;
@@ -1956,7 +1969,7 @@ section.review {
 
                     textarea {
                         margin-top: 5px;
-                        border: 2px solid #C7C7C7;
+                        border: 2px solid $border-color;
                         border-radius: 3px;
                         width: 600px;
                         height: 120px;
@@ -1970,8 +1983,8 @@ section.review {
                 button {
                     background: $brand-color;
                     font-size: 14px;
-                    color: #FFFFFF;
-                    letter-spacing: -0.26px;
+                    color: $background-color;
+
                     text-align: center;
                     width: 120px;
                     height: 38px;
@@ -1995,7 +2008,7 @@ section.review {
 
                         span {
                             font-size: 34px;
-                            letter-spacing: -0.82px;
+
                             text-align: center;
                         }
                     }
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss
index 884cebc8d..57b99801d 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss
@@ -5,7 +5,7 @@ body {
     max-width: 100%;
     width: auto;
     color: $font-color;
-    font-size: $font-size-base;
+    font-size: 16px;
 }
 
 * {
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index c3b84bd97..d5496eb13 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -147,8 +147,8 @@ return [
             'integrity' => [
                 'missing_fields' =>'Cart System Integrity Violation, Some Required Fields Missing',
                 'missing_options' =>'Cart System Integrity Violation, Configurable product\'s options are missing',
-
             ],
+
             'title' => 'Shopping Cart',
             'empty' => 'Shopping Cart Is Empty',
             'continue-shopping' => 'Continue Shopping',
@@ -156,6 +156,7 @@ return [
             'remove' => 'Remove',
             'remove-link' => 'Remove',
             'move-to-wishlist' => 'Move to Wishlist',
+            'add-config-warning' => 'Please Select Option Before Adding To Cart',
             'quantity' => [
                 'quantity' => 'Quantity',
                 'success' => 'Quantity successfully updated',
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index 97db63736..1f5727c40 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -57,7 +57,7 @@
                                         <div class="misc">
                                             <div class="qty-text" :class="[errors.has('qty') ? 'has-error' : '']">{{ __('shop::app.checkout.cart.quantity.quantity') }}</div>
 
-                                            <input class="box" type="text" v-validate="'required|numeric|min_value:1'" name="qty[{{$item->id}}]" value="{{ $item->quantity }}">
+                                            <input class="box" type="text" class="control" v-validate="'required|numeric|min_value:1'" name="qty[{{$item->id}}]" value="{{ $item->quantity }}">
 
                                             <span class="control-error" v-if="errors.has('qty[{{$item->id}}]')">@{{ errors.first('qty') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
index 03cb40b04..67e0e56fa 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
@@ -1 +1 @@
-<button class="btn btn-lg btn-primary addtocart">ADD TO CART</button>
\ No newline at end of file
+<button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
index 7420c3350..dc95b7adc 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
@@ -13,7 +13,6 @@
     <div class="product-information">
 
         <div class="product-name">
-
             <a href="{{ url()->to('/').'/products/'.$product->url_key }}" title="{{ $product->name }}">
                 <span>
                     {{ $product->name }}
@@ -29,8 +28,23 @@
 
         @include ('shop::products.review', ['product' => $product])
 
-        @include ('shop::products.add-to', ['product' => $product])
+        @if(Route::currentRouteName() == "shop.products.index")
+            @include ('shop::products.add-to', ['product' => $product])
+        @else
+            @if($product->type == "configurable")
+                <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</a>
 
+                @include('shop::products.wishlist')
+            @else
+                <form action="{{route('cart.add', $product->id)}}" method="POST">
+                    @csrf
+                    <input type="hidden" name="product" value="{{ $product->id }}">
+                    <input type="hidden" name="quantity" value="1">
+                    <input type="hidden" value="false" name="is_configurable">
+                    <button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
+                </form>
+            @endif
+        @endif
     </div>
 
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 4af87b700..0325a8463 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -40,6 +40,31 @@ h2 {
     color: $font-color;
 }
 
+//tool tip
+.tooltip {
+    position: relative;
+    border-bottom: 1px solid black;
+}
+
+.tooltip .tooltiptext {
+    visibility: hidden;
+    width: 120px;
+    background-color: black;
+    color: #fff;
+    text-align: center;
+    border-radius: 6px;
+    padding: 5px 0;
+
+    /* Position the tooltip */
+    position: absolute;
+    z-index: 1;
+}
+
+.tooltip:hover .tooltiptext {
+    visibility: visible;
+}
+//tooltip ends here
+
 .hide {
     display: none !important;
 }
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index 905dcc374..84dc4b619 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -472,7 +472,7 @@ body {
 
 .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link {
   font-weight: 400;
-  color: #0041FF;
+  color: #0031F0;
   margin-right: 10px;
 }
 
@@ -710,7 +710,7 @@ section.slider-block div.slider-content div.slider-control {
 }
 
 section.slider-block div.slider-content div.slider-control .dark-left-icon {
-  background-color: #f2f2f2;
+  background-color: #F2F2F2;
   height: 48px;
   width: 48px;
   max-height: 100%;
@@ -718,7 +718,7 @@ section.slider-block div.slider-content div.slider-control .dark-left-icon {
 }
 
 section.slider-block div.slider-content div.slider-control .light-right-icon {
-  background-color: #000;
+  background-color: #242424;
   height: 48px;
   width: 48px;
   max-height: 100%;
@@ -1077,7 +1077,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 .header .header-bottom .nav ul {
   margin: 0;
   padding: 0;
-  border: 1px solid #B1B1B1;
+  border: 1px solid #E8E8E8;
   -webkit-box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.4);
           box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.4);
 }
@@ -1088,7 +1088,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   text-decoration: none;
   padding: 0.8em 0.3em 0.8em 0.5em;
   text-transform: uppercase;
-  letter-spacing: 2px;
+  letter-spacing: -0.38px;
   position: relative;
 }
 
@@ -1156,17 +1156,25 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 .header .header-bottom .nav ul {
   position: absolute;
   white-space: nowrap;
-  border: 1px solid #B1B1B1;
+  border: 1px solid #E8E8E8;
   background-color: white;
   z-index: 1;
   left: -99999em;
 }
 
+.header .header-bottom .nav > li:hover {
+  background-color: #F2F2F2;
+}
+
 .header .header-bottom .nav > li:hover > ul {
   left: auto;
   min-width: 100%;
 }
 
+.header .header-bottom .nav > li li:hover {
+  background-color: #F2F2F2;
+}
+
 .header .header-bottom .nav > li li:hover > ul {
   left: 100%;
   margin-left: 1px;
@@ -1190,7 +1198,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .header .search-responsive .search-content {
-  border-bottom: 1px solid #e8e8e8;
+  border-bottom: 1px solid #E8E8E8;
   height: 48px;
 }
 
@@ -1213,7 +1221,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .header .search-responsive .search-content:first-child {
-  border-top: 1px solid #e8e8e8;
+  border-top: 1px solid #E8E8E8;
 }
 
 .header .responsive-nav {
@@ -1275,7 +1283,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .footer {
-  background-color: #f2f2f2;
+  background-color: #F2F2F2;
   padding-left: 10%;
   padding-right: 10%;
 }
@@ -1292,7 +1300,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .footer .footer-content .footer-list-container .list-container .list-heading {
-  letter-spacing: -0.26px;
   text-transform: uppercase;
   color: #a5a5a5;
 }
@@ -1341,7 +1348,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .footer .footer-content .footer-list-container .list-container .form-container .control-group .btn-primary {
-  background-color: #000;
+  background-color: #242424;
   margin-top: 8px;
   border-radius: 0px;
   text-align: center;
@@ -1403,8 +1410,8 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .main .top-toolbar .pager select {
-  background: #FFFFFF;
-  border: 1px solid #C7C7C7;
+  background: #F2F2F2;
+  border: 1px solid #E8E8E8;
   border-radius: 3px;
   color: #242424;
   padding: 10px;
@@ -1463,8 +1470,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   margin-right: auto;
   text-align: center;
   font-size: 18px;
-  color: #5e5e5e;
-  letter-spacing: -0.29px;
+  color: #A5A5A5;
   text-align: center;
 }
 
@@ -1489,8 +1495,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 .content .login-form .login-text {
   font-size: 24px;
   font-weight: bold;
-  color: #3a3a3a;
-  letter-spacing: -0.23px;
+  color: #242424;
   margin-top: 5%;
   margin-bottom: 3%;
 }
@@ -1505,13 +1510,11 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 
 .content .login-form .forgot-password-link {
   font-size: 17px;
-  color: #0041FF;
-  letter-spacing: -0.11px;
+  color: #0031F0;
   margin-bottom: 5%;
 }
 
 .content .login-form .signup-confirm {
-  letter-spacing: -0.11px;
   margin-bottom: 5%;
 }
 
@@ -1553,7 +1556,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   width: 25%;
   height: 100%;
   text-transform: capitalize;
-  color: #5e5e5e;
+  color: #A5A5A5;
 }
 
 .account-content .account-side-menu li {
@@ -1586,7 +1589,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .account-content .account-side-menu li.active {
-  color: #0041FF;
+  color: #0031F0;
 }
 
 .account-content .profile {
@@ -1605,8 +1608,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 .account-content .profile .section-head .profile-edit {
   font-size: 17px;
   margin-top: 1%;
-  color: #0041FF;
-  letter-spacing: -0.11px;
+  color: #0031F0;
   float: right;
 }
 
@@ -1619,7 +1621,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .account-content .profile-content {
-  color: #5e5e5e;
+  color: #5E5E5E;
   margin-top: 1.4%;
 }
 
@@ -1648,8 +1650,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 .account-content .edit-form-content .section-head .profile-edit {
   font-size: 17px;
   margin-top: 1%;
-  color: #0041FF;
-  letter-spacing: -0.11px;
+  color: #0031F0;
   float: right;
 }
 
@@ -1714,8 +1715,8 @@ section.product-detail div.layouter form div.product-image-group {
 }
 
 section.product-detail div.layouter form div.product-image-group .loader {
-  border: 16px solid #f3f3f3;
-  border-top: 16px solid #3498db;
+  border: 16px solid #E8E8E8;
+  border-top: 16px solid #0031F0;
   border-radius: 50%;
   width: 50px;
   height: 50px;
@@ -1784,7 +1785,7 @@ section.product-detail div.layouter form div.product-image-group div .thumb-list
 }
 
 section.product-detail div.layouter form div.product-image-group div .thumb-list .thumb-frame.active {
-  border-color: #979797;
+  border-color: #C7C7C7;
 }
 
 section.product-detail div.layouter form div.product-image-group div .thumb-list .thumb-frame img {
@@ -1802,7 +1803,7 @@ section.product-detail div.layouter form div.product-image-group div .thumb-list
 
 section.product-detail div.layouter form div.product-image-group div .thumb-list .gallery-control .overlay {
   opacity: 0.3;
-  background: #000000;
+  background: #242424;
   width: 100%;
   height: 18px;
   position: absolute;
@@ -1926,7 +1927,7 @@ section.product-detail div.layouter form .details .description {
 
 section.product-detail div.layouter form .details .full-specifications td {
   padding: 10px 0;
-  color: #5E5E5E;
+  color: #A5A5A5;
 }
 
 section.product-detail div.layouter form .details .full-specifications td:first-child {
@@ -2065,12 +2066,12 @@ section.product-detail div.layouter form .details .attributes {
 }
 
 .rating-reviews .reviews .review .reviewer-details {
-  color: #5E5E5E;
+  color: #A5A5A5;
 }
 
 .rating-reviews .reviews .view-all {
   margin-top: 15px;
-  color: #0041FF;
+  color: #0031F0;
   margin-bottom: 15px;
 }
 
@@ -2161,6 +2162,10 @@ section.cart .cart-content .right-side {
   font-weight: 600;
 }
 
+.cart-item-list .item .item-details .item-title a {
+  color: #242424;
+}
+
 .cart-item-list .item .item-details .price {
   margin-bottom: 10px;
   font-size: 18px;
@@ -2184,7 +2189,7 @@ section.cart .cart-content .right-side {
 }
 
 .cart-item-list .item .item-details .misc div.qty-text {
-  color: #5E5E5E;
+  color: #A5A5A5;
   margin-right: 10px;
 }
 
@@ -2201,12 +2206,12 @@ section.cart .cart-content .right-side {
 }
 
 .cart-item-list .item .item-details .misc .remove {
-  color: #0041FF;
+  color: #0031F0;
   margin-right: 30px;
 }
 
 .cart-item-list .item .item-details .misc .towishlist {
-  color: #0041FF;
+  color: #0031F0;
 }
 
 .order-summary h3 {
@@ -2376,7 +2381,7 @@ section.cart .cart-content .right-side {
 
 .checkout-process .col-main .step-content .address .address-card .card-content {
   margin-top: 15px;
-  color: #121212;
+  color: #242424;
   line-height: 25px;
 }
 
@@ -2390,7 +2395,7 @@ section.cart .cart-content .right-side {
 .checkout-process .col-main .step-content .cart-item-list .item .row .title {
   width: 100px;
   display: inline-block;
-  color: #5E5E5E;
+  color: #A5A5A5;
   font-weight: 500;
   margin-bottom: 10px;
 }
@@ -2531,7 +2536,6 @@ section.review .review-layouter .product-info .heading {
 
 section.review .review-layouter .product-info .heading span {
   font-size: 24px;
-  letter-spacing: -0.58px;
 }
 
 section.review .review-layouter .product-info .price {
@@ -2541,18 +2545,15 @@ section.review .review-layouter .product-info .price {
 section.review .review-layouter .product-info .price .pro-price {
   font-size: 24px;
   color: #FF6472;
-  letter-spacing: -0.58px;
 }
 
 section.review .review-layouter .product-info .price .pro-price-not {
   margin-left: 10px;
   color: #A5A5A5;
-  letter-spacing: -0.26px;
 }
 
 section.review .review-layouter .product-info .price .offer {
   margin-left: 10px;
-  letter-spacing: -0.26px;
 }
 
 section.review .review-layouter .review-info {
@@ -2564,10 +2565,6 @@ section.review .review-layouter .review-info .heading {
   margin-top: 10px;
 }
 
-section.review .review-layouter .review-info .heading span {
-  letter-spacing: -0.26px;
-}
-
 section.review .review-layouter .review-info .heading .btn.btn-primary.right {
   float: right;
   margin-top: -10px;
@@ -2575,8 +2572,7 @@ section.review .review-layouter .review-info .heading .btn.btn-primary.right {
 
 section.review .review-layouter .review-info .rating {
   margin-top: 25px;
-  color: #5E5E5E;
-  letter-spacing: -0.12px;
+  color: #A5A5A5;
 }
 
 section.review .review-layouter .review-info .rating span {
@@ -2609,7 +2605,7 @@ section.review .review-layouter .review-info .write-review .control-group {
 
 section.review .review-layouter .review-info .write-review .control-group textarea {
   margin-top: 5px;
-  border: 2px solid #C7C7C7;
+  border: 2px solid #E8E8E8;
   border-radius: 3px;
   width: 600px;
   height: 120px;
@@ -2620,10 +2616,9 @@ section.review .review-layouter .review-info .submit-button {
 }
 
 section.review .review-layouter .review-info .submit-button button {
-  background: #0041FF;
+  background: #0031F0;
   font-size: 14px;
-  color: #FFFFFF;
-  letter-spacing: -0.26px;
+  color: #F2F2F2;
   text-align: center;
   width: 120px;
   height: 38px;
@@ -2651,7 +2646,6 @@ section.review .review-layouter .review-info .review-detail .rating-review {
 
 section.review .review-layouter .review-info .review-detail .rating-review .avg-rating-count span {
   font-size: 34px;
-  letter-spacing: -0.82px;
   text-align: center;
 }
 
@@ -2692,7 +2686,7 @@ section.review .review-layouter .review-info .review-detail .rating-calculate .p
 }
 
 .cusomer-section .customer-section-info .pro-discription .title {
-  color: #0041FF;
+  color: #0031F0;
   margin-top: 15px;
 }