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

Merge pull request #4426 from devansh-webkul/issue-4423 

Fixed quantity box position in RTL #4423
This commit is contained in:
Glenn Hermans 2021-01-05 12:49:31 +01:00 committed by GitHub
parent b14a16be06 86b30eec7f
commit fd08d1786f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/repository.php
View File

@ -169,8 +169,7 @@ return [
*/
'acceptedConditions' => [
'=',
'like',
'in'
'like'
],
/*
|--------------------------------------------------------------------------

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=fd3e9e2c897df46dd84c",
"/css/shop.css": "/css/shop.css?id=45a1e46876af32f30871"
"/css/shop.css": "/css/shop.css?id=5f874d3390a80dcc95dd"
}

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

@ -2553,21 +2553,24 @@ section.cart {
margin-bottom: 10px;
}
.quantity-container {
display: flex !important;
}
button {
width: 40px;
height: 38px;
font-size: 16px;
background: #ffffff;
border: 1px solid #C7C7C7;
float: left;
cursor: pointer;
&.decrease {
border-radius: 3px 0px 0px 3px;
border-radius: 3px;
}
&.increase {
border-radius: 0px 3px 3px 0px;
border-radius: 3px;
}
}

11
packages/Webkul/Shop/src/Resources/views/products/view.blade.php
View File

@ -141,14 +141,15 @@
<script type="text/x-template" id="quantity-changer-template">
<div class="quantity control-group" :class="[errors.has(controlName) ? 'has-error' : '']">
<label class="required">{{ __('shop::app.products.quantity') }}</label>
<span class="quantity-container">
<button type="button" class="decrease" @click="decreaseQty()">-</button>
<button type="button" class="decrease" @click="decreaseQty()">-</button>
<input :name="controlName" class="control" :value="qty" :v-validate="validations" data-vv-as="&quot;{{ __('shop::app.products.quantity') }}&quot;" readonly>
<input :name="controlName" class="control" :value="qty" :v-validate="validations" data-vv-as="&quot;{{ __('shop::app.products.quantity') }}&quot;" readonly>
<button type="button" class="increase" @click="increaseQty()">+</button>
<button type="button" class="increase" @click="increaseQty()">+</button>
<span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
<span class="control-error" v-if="errors.has(controlName)">@{{ errors.first(controlName) }}</span>
</span>
</div>
</script>

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=d5391a65146f1d0f4ca1",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=3e302547ab5f13f8c85a"
"/css/velocity.css": "/css/velocity.css?id=c0ee0beda342603e1144"
}

19
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -401,9 +401,9 @@
@extend .btn;
height: 35px;
border-radius: 0px;
border-radius: 2px;
vertical-align: top;
padding: 0 6px !important;
padding: 0 10px !important;
font-size: 24px !important;
font-weight: 600 !important;
color: $dark-color !important;
@ -411,28 +411,19 @@
border: 1px solid $border-common !important;
}
button:nth-of-type(1) {
border-right: 0px !important;
}
input {
max-width: 40px;
max-width: 50px;
cursor: default;
font-size: 16px !important;
border-left: 0px !important;
border-right: 0px !important;
text-align: center;
margin-left: -5px;
margin-right: -5px;
}
button:hover {
background-color: #f5f5f5 !important;
}
button:nth-last-of-type(1) {
border-radius: 0px;
border-left: 0px !important;
}
button:active,
button:focus,
input:active,

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

@ -161,10 +161,12 @@
</div>
<div class="product-quantity col-2 no-padding">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}">
</quantity-changer>
<div class="row">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}">
</quantity-changer>
</div>
</div>
<div class="product-price fs18 col-1">