merging with master

This commit is contained in:
prashant-webkul 2018-10-01 12:14:14 +05:30
parent f69b000052
commit 0de154a4f2
9 changed files with 723 additions and 3368 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,57 @@
// product card, requires no changes for responsiveness.
.product-card {
.product-image {
max-height: 350px;
max-width: 280px;
margin-bottom: 10px;
background: #F2F2F2;
img {
display: block;
width: 100%;
}
}
.product-name {
margin-bottom: 14px;
width: 100%;
color: $font-color;
a {
color: $font-color;
}
}
.product-description {
margin-bottom: 14px;
display: none;
}
.product-ratings {
width: 100%;
margin-bottom: 14px;
.icon {
width: 16px;
height: 16px;
}
.total-reviews {
display: none;
}
}
.cart-fav-seg {
display: inline-flex;
width: 100%;
align-items: center;
.addtocart {
border-radius: 0px;
margin-right: 10px;
text-transform: uppercase;
white-space: nowrap;
}
}
}

View File

@ -0,0 +1,69 @@
body {
margin: 0;
padding: 0;
font-weight: 500;
max-width: 100%;
width: auto;
color: $font-color;
font-size: $font-size-base;
}
* {
font-family: "Montserrat", sans-serif;
}
.btn.btn-primary{
border-radius: 0px;
}
.mb-10 {
margin-bottom: 10px;
}
.mb-15 {
margin-bottom: 15px;
}
.mb-20 {
margin-bottom: 20px;
}
.mb-25 {
margin-bottom: 25px;
}
.mb-30 {
margin-bottom: 30px;
}
.mb-35 {
margin-bottom: 35px;
}
.mb-40 {
margin-bottom: 40px;
}
.mb-45 {
margin-bottom: 45px;
}
.mb-50 {
margin-bottom: 50px;
}
.mb-60 {
margin-bottom: 60px;
}
.mb-70 {
margin-bottom: 70px;
}
.mb-80 {
margin-bottom: 80px;
}
.mb-90 {
margin-bottom: 90px;
}

View File

@ -4,7 +4,7 @@
<span class="featured-seperator" style="color:lightgrey;">_____</span>
</div>
<div class="featured-grid product-grid max-4-col">
<div class="featured-grid product-grid-4">
<div class="product-card">
<div class="product-image">
<img src="vendor/webkul/shop/assets/images/grid.png" />

View File

@ -4,7 +4,7 @@
<span class="featured-seperator" style="color:lightgrey;">_____</span>
</div>
<div class="new-product-grid product-grid max-4-col">
<div class="new-product-grid product-grid-4">
<div class="product-card">
<div class="product-image">
<img src="vendor/webkul/shop/assets/images/new.png" />

View File

@ -2,46 +2,54 @@
@section('content-wrapper')
@include ('shop::products.list.layered-navigation')
@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
<div class="main" style="display: inline-block">
<div class="main">
@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
<div class="category-block">
@include ('shop::products.list.layered-navigation')
<?php $products = $productRepository->findAllByCategory($category->id); ?>
<div class="category-block">
@include ('shop::products.list.toolbar')
<div class="hero-image mb-15">
<img src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
</div>
@inject ('toolbarHelper', 'Webkul\Product\Product\Toolbar')
<?php $products = $productRepository->findAllByCategory($category->id); ?>
@if ($toolbarHelper->getCurrentMode() == 'grid')
<div class="product-grid max-3-col">
@include ('shop::products.list.toolbar')
@foreach ($products as $product)
@inject ('toolbarHelper', 'Webkul\Product\Product\Toolbar')
@include ('shop::products.list.card', ['product' => $product])
@if ($toolbarHelper->getCurrentMode() == 'grid')
<div class="product-grid-3">
@endforeach
@foreach ($products as $product)
@include ('shop::products.list.card', ['product' => $product])
@endforeach
</div>
@else
<div class="product-list">
@foreach ($products as $product)
@include ('shop::products.list.card', ['product' => $product])
@endforeach
</div>
@endif
<div class="bottom-toolbar">
{{ $products->appends(request()->input())->links() }}
</div>
</div>
@else
<div class="product-list">
@foreach ($products as $product)
@include ('shop::products.list.card', ['product' => $product])
@endforeach
</div>
@endif
<div class="bottom-toolbar">
{{ $products->appends(request()->input())->links() }}
</div>
</div>
@stop

View File

@ -22,9 +22,7 @@
</filter-attribute-item>
</div>
</div>
</div>
</script>

View File

@ -1,6 +1,6 @@
@inject ('toolbarHelper', 'Webkul\Product\Product\Toolbar')
<div class="top-toolbar">
<div class="top-toolbar mb-35">
<div class="page-info">
<span>

File diff suppressed because it is too large Load Diff