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

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahul shukla 2019-01-31 15:18:48 +05:30
parent ee91d69361 4644a1b9b5
commit e00ca5808f
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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=e25827d4b84cbe5d76fb",
"/css/shop.css": "/css/shop.css?id=99508f5c6ab959d4db94"
"/css/shop.css": "/css/shop.css?id=b21020d25cef947f6527"
}

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

@ -33,7 +33,7 @@
{!! view_render_event('bagisto.shop.layout.header.currency-item.before') !!}
@if (core()->getCurrentChannel()->currencies->count() > 1)
<li class="dropdown-toggle">
<li>
<span class="dropdown-toggle">
{{ core()->getCurrentCurrencyCode() }}

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

@ -29,7 +29,7 @@
</head>
<body>
<body @if (app()->getLocale() == 'ar')class="rtl"@endif>
{!! view_render_event('bagisto.shop.layout.body.before') !!}

4
packages/Webkul/Shop/webpack.mix.js vendored
View File

@ -1,8 +1,8 @@
const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest");
// var publicPath = 'publishable/assets';
var publicPath = "../../../public/themes/default/assets";
var publicPath = 'publishable/assets';
// var publicPath = "../../../public/themes/default/assets";
mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();