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

Merge branch 'master' into webp_format_validation 

Merged with Master
This commit is contained in:
devansh bawari 2020-10-19 12:03:26 +05:30
parent 438353c1e3 f8bb26d4e3
commit e1c165bf7c
9 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/imagecache.php
View File

@ -66,6 +66,6 @@ return array(
|
*/
'lifetime' => 43200,
'lifetime' => 525600,
);

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/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=73723ffa31b9e1876375",
"/css/shop.css": "/css/shop.css?id=c7d1af736c298987d4bd"
"/js/shop.js": "/js/shop.js?id=c4dfdb6d0482241432f9",
"/css/shop.css": "/css/shop.css?id=11adc18bed8ace91c828"
}

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

@ -204,10 +204,16 @@ input {
}
}
/* if not very important use bootstrap 4 float-left and float-right class */
.pull-right {
float:right;
float: right !important;
}
.pull-left {
float: left !important;
}
/* if not very important use bootstrap 4 float-left and float-right class */
//wishlist icon hover properties
.add-to-wishlist {
.wishlist-icon {
@ -4658,7 +4664,6 @@ td {
.icon.remove-product {
top: 5px;
float: right;
cursor: pointer;
position: relative;
background-color: black;

8
packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
View File

@ -3,7 +3,7 @@
$comparableAttributes = $attributeRepository->getComparableAttributesBelongsToFamily();
$locale = request()->get('locale') ?: app()->getLocale();
$attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson();
@endphp
@ -16,7 +16,7 @@
<button
v-if="products.length > 0"
class="btn btn-primary btn-md pull-right"
class="btn btn-primary btn-md {{ core()->getCurrentLocale()->direction == 'rtl' ? 'pull-left' : 'pull-right' }}"
@click="removeProductCompare('all')">
{{ __('shop::app.customer.account.wishlist.deleteall') }}
</button>
@ -122,7 +122,7 @@
@break
@endswitch
@endswitch
</td>
</tr>
@endforeach
@ -326,7 +326,7 @@
'type': `alert-error`,
'message': "{{ __('shop::app.common.error') }}"
}];
this.$root.addFlashMessages();
});
} else {

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=ea742e9269dc43e70f30",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=fa505a5830e7b9b4285f"
"/css/velocity.css": "/css/velocity.css?id=3726586e7617710fe839"
}

4
packages/Webkul/Velocity/src/Resources/assets/sass/components/rtl.scss vendored
View File

@ -347,7 +347,7 @@ body {
.compare-products {
.wishlist-icon {
left: 60px;
left: 52px;
right: unset;
}
@ -531,7 +531,7 @@ body {
.order-summary-container {
margin-right: 0px;
}
.nav-container {
ul {
li {