Small fixes, updated gulp.

Separated xl file to be outside the large media query

Gulpfile.js

@@ -21,6 +21,12 @@ gulp.task('style', function() {
     .pipe(sourcemaps.init())
     .pipe(sass())
     .pipe(minify())
+    .pipe(gulp.dest(config.cssDir));
+});
+gulp.task('style-dev', function() {
+    gulp.src(config.scssDir + '/*.scss')
+    .pipe(sourcemaps.init())
+    .pipe(sass())
     .pipe(sourcemaps.write())
     .pipe(gulp.dest(config.cssDir));
 });
@@ -40,20 +46,29 @@ gulp.task('compress', function() {
     .pipe(uglify())
     .pipe(gulp.dest(config.jsDir + '/min'));
 });
+gulp.task('compress-dev', function() {
+    return gulp.src(config.jsDir + '/scripts.js')
+    .pipe(gulp.dest(config.jsDir + '/min'));
+});
 
+// Production
+gulp.task('build', function() {
+    gulp.start('style');
+    gulp.start('compress');
+});
 
 // Watch for changes
 gulp.task('watch', function() {
     watch(config.scssDir + '/**/*.scss', function () {
-        gulp.start('style');
+        gulp.start('style-dev');
     });
 
     watch(config.jsDir + '/src/*.js', function () {
         gulp.start('js');
     });
 
     watch(config.jsDir + '/scripts.js', function () {
-        gulp.start('compress');
+        gulp.start('compress-dev');
     });
 
 });

package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "clone": "^1.0.2",
     "clone-stats": "0.0.1",
-    "gulp-install": "^0.4.0",
+    "gulp-install": "^0.6.0",
     "inherits": "^2.0.1",
     "lodash": "^3.9.3",
     "readable-stream": "^2.0.0"
@@ -42,10 +42,10 @@
     "gulp": "^3.9.0",
     "gulp-bower": "0.0.10",
     "gulp-concat": "^2.5.2",
-    "gulp-sass": "^1.3.3",
+    "gulp-sass": "^2.0.4",
     "gulp-sourcemaps": "^1.5.2",
     "gulp-uglify": "^1.2.0",
-    "gulp-minify-css": "1.1.1",
+    "gulp-minify-css": "1.2.1",
     "gulp-watch": "^4.2.0"
   },
   "scripts": {}

scss/_grid.scss

@@ -5,6 +5,11 @@
 
     @import 'l/base';
 
+}
+@media (min-width: $bp-xl) {
+
+    @import 'l/xl';
+
 }
 @media (min-width: $bp-m) and (max-width: ($bp-l - 1)) {
 

scss/l/_base.scss

@@ -87,11 +87,4 @@ $wrap: ($col-width * $col-qty) + $gutter * ($col-qty - 1);
 .center {
     float: none;
     margin: 0 auto;
-}
-
-// * Extra large screens
-@media (min-width: $bp-xl) {
-
-    @import 'xl';
-
-}
+}