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

Merge pull request #2350 from shubhwebkul/velocity-updated 

misc.bug fixes
This commit is contained in:
Jitendra Singh 2020-02-06 20:00:17 +05:30 committed by GitHub
parent e703bd7e2c 8ee5d3db83
commit d6d3462476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=26b9c7e1abf32569c51e",
"/css/velocity.css": "/css/velocity.css?id=18c9b7b602edc61d6432",
"/js/velocity.js": "/js/velocity.js?id=65a146da75db9d89424d",
"/css/velocity.css": "/css/velocity.css?id=0a048b9cd108c9456da1",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
}

4
packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
View File

@ -26,9 +26,5 @@ class VelocityMetaDataSeeder extends Seeder
'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shipping on Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Replace &amp; Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Exchange and EMI Available </span></div></div></div></div></div>',
]);
DB::table('locales')->where('code', 'en')->update([
'locale_image' => '/themes/velocity/assets/images/flags/en.png'
]);
}
}

2
packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
View File

@ -9,7 +9,7 @@ use Webkul\Product\Repositories\ProductRepository;
use Webkul\Velocity\Repositories\Product\ProductRepository as VelocityProductRepository;
/**
* Search controller
* Shop controller
*
* @author Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> @shubhwebkul
* @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)

2
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -175,7 +175,7 @@ $(document).ready(function () {
},
mounted: function () {
this.addServerErrors();
// this.addServerErrors();
document.body.style.display = "block";
this.$validator.localize(document.documentElement.lang);

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

@ -1618,10 +1618,8 @@
li {
a {
padding: 7px 0 5px 15px;
}
&:hover {
> a {
&:hover {
background: $border-light;
}
}

13
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -179,22 +179,15 @@
position: relative;
.arrow {
left: 0px;
height: 100%;
z-index: 1001;
opacity: 0.50;
margin-top: 5px;
cursor: pointer;
position: absolute;
line-height: 13em;
background: $border-dark;
&.left {
left: 0px;
line-height: 13em;
}
&.right {
right: 0px;
line-height: 13rem;
}
}
.thumb-frame {

3
packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
View File

@ -16,13 +16,12 @@
@if (core()->getCurrentLocale()->direction == 'rtl')
<link href="{{ asset('themes/velocity/assets/css/bootstrap-flipped.css') }}" rel="stylesheet">
@endif
@if ($favicon = core()->getCurrentChannel()->favicon_url)
<link rel="icon" sizes="16x16" href="{{ $favicon }}" />
@else
<link rel="icon" sizes="16x16" href="{{ asset('themes/velocity/assets/images/favicon.png') }}" />
<link rel="icon" sizes="16x16" href="{{ asset('/themes/velocity/assets/images/static/v-icon.png') }}" />
@endif
<script