gulp mix as npm package

CHANGELOG.md

@@ -4,15 +4,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 See also [http://keepachangelog.com].
 
 
+## [5.2.6] - 2015-10-21
+### Changed
+- Moved gulp mix to npm package
+
+### Removed
+- resources/gulp
+
+
 ## [5.2.5] - 2015-10-20
 ### Changed
 - elixir built-in browsersync
 - front-end sass rewrite
-- sassdoc removal
 - removed a step in Sass->css generation
 - npm3 support in gulp
 - added license to package.json
 
+### Removed
+- sassdoc
+
 
 ## [5.2.4] - 2015-08-05
 ### Changed

gulpfile.js

@@ -1,69 +1,24 @@
-/*
- |--------------------------------------------------------------------------
- | Elixir Asset Management
- |--------------------------------------------------------------------------
- */
-
-/* config */
-var settings = require("./resources/gulp/settings.js");
-var config = settings.config;
-var files = settings.files;
-
-//disable notifications
-if (config.disableNotifier) process.env.DISABLE_NOTIFIER = true;
-
-/* Require npm modules */
-var elixir = require('laravel-elixir');
-var gutil = require('gulp-util');
-require('laravel-elixir-browser-sync-simple');
-
-
-/* Proccess settings */
-process.env.module = (gutil.env.back == 1) ? 'back' : 'front';
-process.env.dev = (gutil.env.back == 1) ? config.app.dev + '/blender' : config.app.dev;
-elixir.config.sourcemaps = false;
-
-/* Custom extensions */
-var extensions = require("./resources/gulp/extend.js");
-
-/* Elixir main function */
-elixir(function (mix) {
-
-
-    /* NPM -> Javascript */
-
-    files[process.env.module].js.map( function(item) {
-        mix.browserify( process.env.module + '/' + item , config.paths.js.public + process.env.module + '.' + item );
-    })
-
-
-    mix
-
-        .svg(config.paths.svg.resources + '*')
-
-        /* Sass -> CSS */
-
-        //compile sass to resources/css. Extra includePaths for @imports eg. from vendor/node_modules
-        .sass(files[process.env.module].sass, config.paths.css.public + process.env.module + '.css', {includePaths: [config.paths.node]})
-
-        /* Version CSS & Javascript */
-
-        //versioning public css & js
-        .version( [ config.paths.css.public , config.paths.js.public  ] )
-
-        .browserSync({
-            files: [
-                'public/build/*',
-                'resources/views/**/*'
-            ],
-            proxy: process.env.dev,
-            reloadOnRestart: false,
-            notify: false,
-            open: false,
-            xip: true
-        });
-    ;
-
-
-});
-
+/* Blender front-end build process */
+
+var blenderGulp = require("blender-gulp");
+
+blenderGulp.options = {
+    files : {
+        front : {
+            sass : 'front/front.scss',
+            js : ['app.js']
+        },
+        back : {
+            sass : 'back/back.scss',
+            js : ['app.js', 'chart.js']
+        }
+    },
+    url: 'http://groener.be',
+    browserSync: {
+        proxy: 'http://groener.be.192.168.10.10.xip.io/',
+        xip: false, //mostly when using webfonts with domain restrictions: add xip.io as valid domain
+        open: false //open browser automatically?
+    }
+};
+
+blenderGulp.init();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Blender",
-  "version": "5.2.5",
+  "version": "5.2.6",
   "authors": [
     "Sebastian De Deyne <[email protected]>",
     "Freek Van der Herten <[email protected]>",
@@ -12,13 +12,7 @@
     "url": "[email protected]:spatie-custom/blender.git"
   },
   "devDependencies": {
-    "browserify": "^11.0.1",
-    "del": "^1.1.1",
-    "favicons": "^3.0.2",
-    "gulp": "^3.8.11",
-    "gulp-svgmin": "^1.1.2",
-    "gulp-util": "^3.0.3",
-    "laravel-elixir": "^3.0.0"
+    "blender-gulp": "spatie-custom/blender-gulp#1.0.0"
   },
   "dependencies": {
     "blender.js": "git://github.com/spatie-custom/blender.js#1.0.1",

resources/assets/sass/back/layout/_footer.scss

@@ -1,3 +1,5 @@
+@include footer-is-fixed($height: 12em);
+
 .footer{
   margin-top: 5em;
   padding: 6em 0;

resources/assets/sass/back/layout/_main.scss

@@ -1,3 +1,4 @@
 .main{
-  min-height: 60vh;
+  max-width: 100%;
+  overflow-x: auto;
 }

resources/assets/sass/front/front.scss

@@ -32,8 +32,6 @@
 
 // Components
 
-
 // Vendor custom
 
-
 // Animations

resources/views/back/layout/master.blade.php

@@ -30,7 +30,7 @@
         </div>
     @endif
 
-    <main>
+    <main class="main">
         @yield('content')
     </main>
 

resources/views/front/layout/_partials/favicons.blade.php

@@ -16,4 +16,4 @@
 <meta property="og:image" content="/open-graph.png">
 <meta name="msapplication-TileColor" content="#ddd">
 <meta name="msapplication-TileImage" content="/mstile-144x144.png">
-<meta name="theme-color" content="#ddd">
+<meta name="theme-color" content="#ddd">