diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index b3ce36c5f..63ceca534 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -85,16 +85,16 @@ class EventServiceProvider extends ServiceProvider 'route' => 'admin.customer.index', 'sort' => 1, 'icon-class' => '', - ], [ - 'key' => 'customers.reviews', - 'name' => 'Reviews', - 'route' => 'admin.customer.review.index', - 'sort' => 2, - 'icon-class' => '', ], [ 'key' => 'customers.groups', 'name' => 'Groups', 'route' => 'admin.groups.index', + 'sort' => 2, + 'icon-class' => '', + ], [ + 'key' => 'customers.reviews', + 'name' => 'Reviews', + 'route' => 'admin.customer.review.index', 'sort' => 3, 'icon-class' => '', ], [ diff --git a/packages/Webkul/Shop/src/Resources/assets/images/facebook.svg b/packages/Webkul/Shop/src/Resources/assets/images/facebook.svg new file mode 100644 index 000000000..43ea8e451 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/facebook.svg @@ -0,0 +1,13 @@ + + + + facebook + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/google-plus.svg b/packages/Webkul/Shop/src/Resources/assets/images/google-plus.svg new file mode 100644 index 000000000..081172b89 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/google-plus.svg @@ -0,0 +1,13 @@ + + + + google-plus + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/instagram.svg b/packages/Webkul/Shop/src/Resources/assets/images/instagram.svg new file mode 100644 index 000000000..ed03e2fd6 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/instagram.svg @@ -0,0 +1,13 @@ + + + + instagram + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/linkedin.svg b/packages/Webkul/Shop/src/Resources/assets/images/linkedin.svg new file mode 100644 index 000000000..3e3def86d --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/linkedin.svg @@ -0,0 +1,13 @@ + + + + linkedin + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/images/twitter.svg b/packages/Webkul/Shop/src/Resources/assets/images/twitter.svg new file mode 100644 index 000000000..aba946d0c --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/images/twitter.svg @@ -0,0 +1,13 @@ + + + + twitter + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 4d21a215e..7fcf888b5 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -227,7 +227,7 @@ body { display: block; margin-left: 20px; - .stars.icon { + .stars .icon { height: 16px; width: 16px; } @@ -1087,6 +1087,10 @@ section.slider-block { .list-group { padding-top: 25px; + a { + color: #242424; + } + li { margin-bottom: 12px; list-style-type: none; @@ -2222,6 +2226,10 @@ section.review { } } + .product-name a { + color: #242424; + } + .product-price { .pro-price { color: $disc-price; @@ -2348,7 +2356,7 @@ section.review { font-size: 34px; } - .stars.icon { + .stars .icon { height: 16px; width: 16px; } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss index a2af8910f..360af8a2e 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss @@ -131,4 +131,25 @@ background-image: url("../images/cross-icon-adj.svg"); width: 32px; height: 32px; -} \ No newline at end of file +} + +.icon-facebook { + background-image: url("../images/facebook.svg"); +} + +.icon-twitter { + background-image: url("../images/twitter.svg"); +} + +.icon-google-plus { + background-image: url("../images/google-plus.svg"); +} + +.icon-instagram { + background-image: url("../images/instagram.svg"); +} + +.icon-linkedin { + background-image: url("../images/linkedin.svg"); +} + diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php index a16555a2f..9160d3027 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php @@ -28,12 +28,21 @@ Connect With Us @@ -54,7 +63,7 @@ @foreach (core()->getCurrentChannel()->locales as $locale) @endforeach - + diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php index f508d4f1d..f5804f41c 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -19,8 +19,6 @@
- {{-- --}} - @if(is_null($category->image)) @else diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php index e87c89d34..5839a5d62 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php @@ -13,12 +13,20 @@
+ @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') + + getProductBaseImage($product); ?> +
- + + +
- {{ $product->name }} + + {{ $product->name }} +
diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php index a844f3233..94dd155c9 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php @@ -6,20 +6,28 @@ @extends('shop::layouts.master') @section('content-wrapper')
-
+ {{--
Home > Men > Slit Open Jeans -
+
--}}
+ @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') + + getProductBaseImage($product); ?> +
- + + +
- {{ $product->name }} + + {{ $product->name }} +
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 09414c265..e5af7b7b9 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -133,6 +133,26 @@ height: 32px; } +.icon-facebook { + background-image: url("../images/facebook.svg"); +} + +.icon-twitter { + background-image: url("../images/twitter.svg"); +} + +.icon-google-plus { + background-image: url("../images/google-plus.svg"); +} + +.icon-instagram { + background-image: url("../images/instagram.svg"); +} + +.icon-linkedin { + background-image: url("../images/linkedin.svg"); +} + body { margin: 0; padding: 0; @@ -358,7 +378,7 @@ body { margin-left: 20px; } -.account-item-card .media-info .info .stars.icon { +.account-item-card .media-info .info .stars .icon { height: 16px; width: 16px; } @@ -1295,6 +1315,10 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { padding-top: 25px; } +.footer .footer-content .footer-list-container .list-container .list-group a { + color: #242424; +} + .footer .footer-content .footer-list-container .list-container .list-group li { margin-bottom: 12px; list-style-type: none; @@ -2415,6 +2439,10 @@ section.review .review-layouter .product-info .product-image img { width: 280px; } +section.review .review-layouter .product-info .product-name a { + color: #242424; +} + section.review .review-layouter .product-info .product-price .pro-price { color: #FF6472; } @@ -2546,7 +2574,7 @@ section.review .review-layouter .ratings-reviews .left-side .rate { font-size: 34px; } -section.review .review-layouter .ratings-reviews .left-side .stars.icon { +section.review .review-layouter .ratings-reviews .left-side .stars .icon { height: 16px; width: 16px; }