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

Merge pull request #423 from jitendra-webkul/jitendra 

Channel alter migration issue fixed
This commit is contained in:
JItendra Singh 2018-12-31 18:49:50 +05:30 committed by GitHub
parent 4e89ce082e c49e7b6e5f
commit 9eabca881f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Core/src/Database/Migrations/2018_12_31_161114_alter_channels_table.php → packages/Webkul/Core/src/Database/Migrations/2018_12_31_161114_alter_channels_category_table.php
View File

@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AlterChannelsTable extends Migration
class AlterChannelsCategoryTable extends Migration
{
/**
* Run the migrations.

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=dc2ea56a854d779e7089",
"/css/shop.css": "/css/shop.css?id=7aa91d217344fc8f4f53"
"/css/shop.css": "/css/shop.css?id=d5e0d64663045e5aa78b"
}

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

@ -1774,8 +1774,6 @@ section.product-detail {
.description {
margin-bottom: 15px;
padding-bottom: 15px;
border-bottom: solid 1px rgba(162, 162, 162, 0.2);
ul {
padding-left: 40px;
@ -1783,6 +1781,11 @@ section.product-detail {
}
}
.quantity {
padding-top: 15px;
border-top: solid 1px rgba(162, 162, 162, 0.2);
}
.full-description {
ul {
padding-left: 40px;

4
packages/Webkul/Shop/src/Resources/views/customers/signup/forgot-password.blade.php
View File

@ -4,7 +4,7 @@
{{ __('shop::app.customer.forgot-password.page_title') }}
@stop
@section('css')
@push('css')
<style>
.button-group {
margin-bottom: 25px;
@ -13,7 +13,7 @@
vertical-align: middle;
}
</style>
@stop
@endpush
@section('content-wrapper')

2
packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
View File

@ -23,7 +23,7 @@
<meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
@show
@yield('css')
@stack('css')
{!! view_render_event('bagisto.shop.layout.head') !!}

2
packages/Webkul/Shop/src/Resources/views/products/index.blade.php
View File

@ -6,7 +6,7 @@
@section('seo')
<meta name="description" content="{{ $category->meta_description }}"/>
<meta name="description" content="{{ $category->meta_keywords }}"/>
<meta name="keywords" content="{{ $category->meta_keywords }}"/>
@stop
@section('content-wrapper')

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

@ -6,7 +6,7 @@
@section('seo')
<meta name="description" content="{{ trim($product->meta_description) != "" ? $product->meta_description : str_limit(strip_tags($product->description), 120, '') }}"/>
<meta name="description" content="{{ $product->meta_keywords }}"/>
<meta name="keywords" content="{{ $product->meta_keywords }}"/>
@stop
@section('content-wrapper')