From f2a131314cf3d041d1790a5e433572b2953b2106 Mon Sep 17 00:00:00 2001 From: Elliot Hesp Date: Thu, 4 Dec 2014 10:29:55 +0000 Subject: [PATCH] Fixed gulpfile --- gulpfile.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 1beeca40..f1d45019 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,15 +1,21 @@ var elixir = require('laravel-elixir'); elixir(function(mix) { - mix.scripts([ - 'bower_components/jquery/dist/jquery.min.js', - 'bower_components/chartjs/Chart.min.js', - 'bower_components/rivets/dist/riverts.bundle.js', - 'js/**/*.js', - 'js/start.js', - ], 'app/assets') - .styles([ - 'bower_components/cachet-ui/dist/cachet.min.css', - ], 'app/assets') - .version(['public/css/all.css', 'public/js/all.js'], 'public'); + mix.sass('main.scss') + .styles([ + 'app/assets/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'app/assets/bower_components/fontawesome/css/font-awesome.min.css', + 'public/css/main.css', + ], './') + .scripts([ + 'bower_components/jquery/dist/jquery.min.js', + 'bower_components/bootstrap/dist/js/bootstrap.min.js', + 'bower_components/chartjs/Chart.min.js', + 'bower_components/rivets/dist/riverts.bundle.js', + 'js/app.js', + 'js/**/*.js', + ], './app/assets/') + .version(['public/css/all.css', 'public/js/all.js'], 'public') + .publish('bootstrap/dist/fonts', 'public/build/fonts') + .publish('fontawesome/fonts', 'public/build/fonts'); });