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

Merge pull request #2446 from vivek-webkul/patch-34 

[Fixed: layout issue #2381 resolved.]
This commit is contained in:
Jitendra Singh 2020-02-12 17:05:02 +05:30 committed by GitHub
parent c0ff3a8e75 b6ab1b0f99
commit b432ecb68b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=50ea01bd19c367308b08",
"/css/velocity.css": "/css/velocity.css?id=aa8d76055810af176fc3",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
"/js/velocity.js": "/js/velocity.js?id=7f746af03035ad1a9a1f",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=aa8d76055810af176fc3"
}

2
packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
View File

@ -44,7 +44,7 @@ class ConfigurationController extends Controller
$velocityMetaData = $this->velocityHelper->getVelocityMetaData();
if ( $velocityMetaData->advertisement ) {
$velocityMetaData->advertisement = $this->manageAddImages(json_decode($velocityMetaData->advertisement, true));
$velocityMetaData->advertisement = $this->manageAddImages(json_decode($velocityMetaData->advertisement, true));
}
return view($this->_config['view'], [

6
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue
View File

@ -1,7 +1,11 @@
<template>
<div :class="`row mb15 col-12 ${rowClass}`">
<div class="col-4 no-padding">
<div class="col-4 no-padding" v-if="tabs || viewAll || scrollable">
<h2 class="fs20 fw6">{{ headerHeading }}</h2>
</div>
<div class="col-12 no-padding" v-else >
<h2 class="fs20 fw6">{{ headerHeading }}</h2>
</div>

4
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -21,6 +21,10 @@
@push('css')
<style type="text/css">
.related-products {
width: 100%;
}
.recently-viewed {
margin-top: 20px;
}