Merge pull request #818 from cachethq/elixir-three

Elixir 3
This commit is contained in:
James Brooks
2015-07-25 19:20:03 +01:00
6 changed files with 23 additions and 27 deletions

View File

@@ -1,13 +1,10 @@
var elixir = require('laravel-elixir');
require('laravel-elixir-jshint');
elixir.config.sourcemaps = false;
elixir(function (mix) {
mix
.sass('app.scss')
.jshint('resources/assets/js/*.js')
.sass('app.scss', 'public/dist/css/app.css')
.styles([
'vendor/bower_components/jquery-minicolors/jquery.minicolors.css',
'public/dist/css/app.css'

View File

@@ -2,7 +2,7 @@
"dependencies": {
"bower": "~1.4.1",
"gulp": "~3.9.0",
"laravel-elixir": "~2.3.11",
"laravel-elixir": "~3.0.0",
"laravel-elixir-jshint": "~0.1.7"
},
"private": true

15
public/build/dist/css/all-26424801dd.css vendored Executable file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-392fc4c4.css",
"dist/js/all.js": "dist/js/all-d557ec2d.js"
"dist/css/all.css": "dist/css/all-26424801dd.css",
"dist/js/all.js": "dist/js/all-dc1fd8781c.js"
}