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

Merge remote-tracking branch 'upstream/master' into review-issue

This commit is contained in:
Devansh 2022-02-19 18:24:07 +05:30
parent 96c45aaf8b 94508a71aa
commit 673d063b37
4 changed files with 18 additions and 19 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=fb4ac8dc03a1e11293ee",
"/css/shop.css": "/css/shop.css?id=074a195b63f16fc2701d"
"/css/shop.css": "/css/shop.css?id=284ea3a8ddc4b5fdf6e2"
}

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

@ -2844,7 +2844,7 @@ section.cart {
.misc-controls {
position: relative;
top: 300px;
top: 320px;
margin-top: 0px;
}
}
@ -2889,8 +2889,7 @@ section.cart {
.cart-content {
.left-side {
.misc-controls {
display: block;
top: 300px;
top: 320px;
div {
button {
@ -2906,10 +2905,6 @@ section.cart {
}
}
}
.right-side {
top: -100px;
}
}
}
}

24
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -170,11 +170,13 @@
</div>
<div class="product-quantity col-3 no-padding">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}"
quantity-text="{{ __('shop::app.products.quantity') }}">
</quantity-changer>
@if ($item->product->getTypeInstance()->showQuantityBox() === true)
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}"
quantity-text="{{ __('shop::app.products.quantity') }}">
</quantity-changer>
@endif
</div>
<div class="product-price fs18 col-1">
@ -226,11 +228,13 @@
<div class="row col-12 remove-padding-margin actions">
<div class="product-quantity col-lg-4 col-6 no-padding">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}"
quantity-text="{{ __('shop::app.products.quantity') }}">
</quantity-changer>
@if ($item->product->getTypeInstance()->showQuantityBox() === true)
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}"
quantity-text="{{ __('shop::app.products.quantity') }}">
</quantity-changer>
@endif
</div>
<div class="col-4 cursor-pointer text-down-4">