Merge pull request #1020 from codedge/Set-up-Elixir-with-built.public.js

Set up Elixir with built.public.js
This commit is contained in:
Hillel Coren 2016-07-26 23:03:11 +03:00 committed by GitHub
commit 6bcdc98d08
4 changed files with 27 additions and 969 deletions

View File

@ -149,7 +149,7 @@ module.exports = function(grunt) {
process: false
}
},
css_public: {
/*css_public: {
src: [
'public/vendor/bootstrap/dist/css/bootstrap.min.css',
'public/vendor/font-awesome/css/font-awesome.min.css',
@ -162,7 +162,7 @@ module.exports = function(grunt) {
nonull: true,
options: {
process: false
}
}*/
},
/*js_pdf: {
src: [

View File

@ -23,6 +23,14 @@ elixir.config.assetsPath = '';
*/
elixir.config.js.folder = '';
/**
* Configuring CSS assets path.
* Explicitly setting it to empty, as we're not using Laravels resources/assets/css folder
*
* @type {string}
*/
elixir.config.css.folder = '';
/**
* Directory for bower source files.
* If changing this, please also see .bowerrc
@ -36,7 +44,14 @@ elixir(function(mix) {
/**
* CSS configuration
*/
mix.styles([
bowerDir + '/bootstrap/dist/css/bootstrap.css',
bowerDir + '/font-awesome/css/font-awesome.css',
bowerDir + '/datatables/media/css/jquery.dataTables.css',
bowerDir + '/datatables-bootstrap3/BS3/assets/css/datatables.css',
'public/css/bootstrap-combobox.css',
'public/css/public.style.css'
], 'public/css/built.public.css');
/**
* JS configuration

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long