merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4575 from devansh-webkul/issue-4570 

Alignment Fixed #4570
This commit is contained in:
Glenn Hermans 2021-02-10 11:28:06 +01:00 committed by GitHub
parent 664108c083 36a8cf09ed
commit 83adbf6eb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=83c93b077da401f7b709",
"/css/shop.css": "/css/shop.css?id=6f4a4f8fad1b25e05e33"
"/css/shop.css": "/css/shop.css?id=5010731b9744e6f9a8d2"
}

29
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -409,6 +409,7 @@ input {
}
.product-card {
height: 480px;
position: relative;
padding: 15px;
@ -448,6 +449,30 @@ input {
}
.cart-wish-wrap {
position: absolute;
display: inline-flex;
justify-content: flex-start;
align-items: center;
bottom: 5px;
height: 40px;
.addtocart {
margin-right: 10px;
text-transform: uppercase;
text-align: left;
box-shadow: 1px 1px 0px $shadow-color;
}
.add-to-wishlist {
margin-top: 5px;
background: transparent;
border: 0;
cursor: pointer;
padding: 0;
}
}
.default-wrap {
display: inline-flex;
justify-content: flex-start;
align-items: center;
@ -4724,10 +4749,14 @@ td {
.cart-wish-wrap {
display: flex;
}
.default-wrap {
display: flex;
}
.white-cross-sm-icon {
width: 24px;
height:24px;
}
.add-to-wishlist {
margin-top: auto;
margin-left: 15px;
}

4
packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php
View File

@ -1,10 +1,12 @@
@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
@php
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false;
$showWishlist = core()->getConfigData('general.content.shop.wishlist_option') == "1" ? true : false;
@endphp
<div class="cart-wish-wrap">
<div class="{{ $toolbarHelper->isModeActive('grid') ? 'cart-wish-wrap' : 'default-wrap' }}">
<form action="{{ route('cart.add', $product->product_id) }}" method="POST">
@csrf
<input type="hidden" name="product_id" value="{{ $product->product_id }}">