Merge pull request #430 from jitendra-webkul/jitendra
Assets compiled for production
This commit is contained in:
commit
911650c6b1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/admin.js": "/js/admin.js",
|
||||
"/css/admin.css": "/css/admin.css"
|
||||
}
|
||||
"/js/admin.js": "/js/admin.js?id=c70dacdf945a32e04b77",
|
||||
"/css/admin.css": "/css/admin.css?id=d40a640933cbcc121f1d"
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
const { mix } = require("laravel-mix");
|
||||
require("laravel-mix-merge-manifest");
|
||||
|
||||
// var publicPath = 'publishable/assets';
|
||||
var publicPath = "../../../public/vendor/webkul/admin/assets";
|
||||
var publicPath = 'publishable/assets';
|
||||
// var publicPath = "../../../public/vendor/webkul/admin/assets";
|
||||
|
||||
mix.setPublicPath(publicPath).mergeManifest();
|
||||
mix.disableNotifications();
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
<<<<<<< HEAD
|
||||
"/js/shop.js": "/js/shop.js?id=0e3e1ea03fe1f7358aaa",
|
||||
"/css/shop.css": "/css/shop.css?id=4bdb6dfb99c5788a9dc4"
|
||||
}
|
||||
=======
|
||||
"/js/shop.js": "/js/shop.js?id=dc2ea56a854d779e7089",
|
||||
"/css/shop.css": "/css/shop.css?id=d5e0d64663045e5aa78b"
|
||||
}
|
||||
>>>>>>> c9f2fd218b27272ccdb7183bc26b482410dfea1b
|
||||
"/css/shop.css": "/css/shop.css?id=7a0ee09c1b127c0490e0"
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 51.1 (57501) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Icon-star</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Icon-star" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<polygon id="Star" fill="#0031F0" points="11.0839804 15.75 6.08780574 18.3766445 7.04199019 12.8133222 3 8.87335555 8.58589307 8.06167777 11.0839804 3 13.5820677 8.06167777 19.1679608 8.87335555 15.1259706 12.8133222 16.080155 18.3766445"></polygon>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 711 B |
File diff suppressed because one or more lines are too long
|
|
@ -1,10 +1,4 @@
|
|||
{
|
||||
<<<<<<< HEAD
|
||||
"/js/ui.js": "/js/ui.js?id=188cc8772638ec817a35",
|
||||
"/css/ui.css": "/css/ui.css?id=014ff883008a2459b5e1"
|
||||
}
|
||||
=======
|
||||
"/js/ui.js": "/js/ui.js?id=c3ee60fd11e29aca2922",
|
||||
"/css/ui.css": "/css/ui.css?id=0433c5b81c6583e79c04"
|
||||
}
|
||||
>>>>>>> 4e89ce082ea6e0282b569e4928016771b99a8f56
|
||||
"/css/ui.css": "/css/ui.css?id=0b2b51d90a970c9a4219"
|
||||
}
|
||||
Loading…
Reference in New Issue