From 004914dc6a9eeac2ce65ffa54c02bdd74eecdea8 Mon Sep 17 00:00:00 2001 From: Aayush Bhatt Date: Wed, 5 Feb 2020 17:33:03 +0530 Subject: [PATCH 1/8] Issue #1656 fixed --- .../Resources/views/customers/account/address/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php index dcf6b5a6a..c52fcb05d 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php @@ -87,7 +87,7 @@
- + @{{ errors.first('phone') }}
From 1be6498becd3b505bf650098889811b1fb4b443a Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 6 Feb 2020 11:50:07 +0530 Subject: [PATCH 2/8] Issue #2297 --- .../views/shop/products/list/recently-viewed.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/recently-viewed.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/recently-viewed.blade.php index a7dba34fe..ffed19d8c 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/recently-viewed.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/recently-viewed.blade.php @@ -40,12 +40,12 @@ class="fs18 card-current-price fw6"> - - @{{ product.totalReviews }} Reviews + @{{ product.totalReviews }} Reviews From 28a4aaa5acad8d398534c5bd4bb2ef5d37c2cd65 Mon Sep 17 00:00:00 2001 From: Aayush Bhatt Date: Thu, 6 Feb 2020 11:57:53 +0530 Subject: [PATCH 3/8] Bug fixed --- .../Resources/assets/sass/partials/_default.scss | 13 +++++++++---- .../src/Resources/views/layouts/nav-top.blade.php | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss index ff8c76d06..5a738697d 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss @@ -28,7 +28,7 @@ body { height: 60px; background-color: $navbar-top-background; font-size: 0; - @include box-shadow(0 3px 6px 0 rgba(0, 0, 0, 0.05)); + @include box-shadow(0 3px 6px 0 #0000000d); border-bottom: 1px solid $border-color; position: fixed; left: 0; @@ -89,7 +89,7 @@ body { } } -.navbar-left { +.navbar-left { position: fixed; left: 0; top: 60px; @@ -98,10 +98,10 @@ body { border-right: 1px solid rgba(162, 162, 162, 0.2); height: auto; bottom: 0; - z-index: 2; + z-index: 2; background-color: $white; - ul.menubar { + ul.menubar { // padding-bottom: 60px; li.menu-item { padding: 10px 5px; @@ -309,4 +309,9 @@ body { margin-top: 10px; margin-bottom: 5px; } +} + +.container-shadow { + background-color: #fff; + box-shadow: 0 3px 6px 0 #bbb; } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index 12369b3b1..f87525dcb 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -31,7 +31,7 @@