Merge branch 'master' into translations

[bookstack] / gulpfile.js

diff --git a/gulpfile.js b/gulpfile.js
index 7974350d147c52772f98bc3a87f9db0b186cac08..9d789d9b4c40c425cd0e198b504e0aa616abc55a 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,8 +1,8 @@
 var elixir = require('laravel-elixir');
 
-
-elixir(function(mix) {
+elixir(mix => {
     mix.sass('styles.scss');
-    mix.scripts('image-manager.js', 'public/js/image-manager.js');
-    mix.browserify(['jquery-extensions.js', 'pages/book-show.js' ,'global.js'], 'public/js/common.js');
+    mix.sass('print-styles.scss');
+    mix.sass('export-styles.scss');
+    mix.browserify('global.js', './public/js/common.js');
 });