From: Geoff Kimball <geoff@zurb.com>
Date: Fri, 18 Dec 2015 19:29:06 +0000 (-0800)
Subject: Add dist CSS files with flex grid enabled over float grid, closes #7556
X-Git-Tag: v6.1.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c43389cc2c263167029c52a4b12de683a63ead9;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Add dist CSS files with flex grid enabled over float grid, closes #7556
---

diff --git a/assets/foundation-flex.scss b/assets/foundation-flex.scss
new file mode 100644
index 000000000..5728e19cd
--- /dev/null
+++ b/assets/foundation-flex.scss
@@ -0,0 +1,3 @@
+@import './scss/foundation';
+
+@include foundation-everything($flex: true);
diff --git a/foundation-sites.scss b/assets/foundation.scss
similarity index 53%
rename from foundation-sites.scss
rename to assets/foundation.scss
index b8a55b8f4..de42893bc 100644
--- a/foundation-sites.scss
+++ b/assets/foundation.scss
@@ -1,3 +1,3 @@
-@import 'foundation';
+@import './scss/foundation';
 
 @include foundation-everything;
diff --git a/foundation-flex.scss b/foundation-flex.scss
new file mode 100644
index 000000000..7ae2ca558
--- /dev/null
+++ b/foundation-flex.scss
@@ -0,0 +1,3 @@
+@import '../scss/foundation';
+
+@include foundation-everything($flex: true);
diff --git a/foundation.scss b/foundation.scss
new file mode 100644
index 000000000..09584ae14
--- /dev/null
+++ b/foundation.scss
@@ -0,0 +1,3 @@
+@import '../scss/foundation';
+
+@include foundation-everything;
diff --git a/gulp/deploy.js b/gulp/deploy.js
index ddbe2736e..b02bd1b7c 100644
--- a/gulp/deploy.js
+++ b/gulp/deploy.js
@@ -23,6 +23,12 @@ var VERSIONED_FILES = [
   'scss/foundation.scss'
 ];
 
+var DIST_FILES = [
+  './_build/assets/css/foundation.css',
+  './_build/assets/css/foundation-flex.css',
+  '_build/assets/js/foundation.js'
+];
+
 var CURRENT_VERSION = require('../package.json').version;
 var NEXT_VERSION;
 
@@ -53,17 +59,17 @@ gulp.task('deploy:dist', ['sass:foundation', 'javascript:foundation'], function(
   var cssFilter = filter(['*.css']);
   var jsFilter  = filter(['*.js']);
 
-  return gulp.src(['./_build/assets/css/foundation.css', '_build/assets/js/foundation.js'])
+  return gulp.src(DIST_FILES)
     .pipe(cssFilter)
       .pipe(gulp.dest('./dist'))
       .pipe(minifyCss())
-      .pipe(rename('foundation.min.css'))
+      .pipe(rename({ suffix: '.min' }))
       .pipe(gulp.dest('./dist'))
     .pipe(cssFilter.restore())
     .pipe(jsFilter)
       .pipe(gulp.dest('./dist'))
       .pipe(uglify())
-      .pipe(rename('foundation.min.js'))
+      .pipe(rename({ suffix: '.min' }))
       .pipe(gulp.dest('./dist'));
 });
 
diff --git a/gulp/sass.js b/gulp/sass.js
index d63ace79b..02ee6724d 100644
--- a/gulp/sass.js
+++ b/gulp/sass.js
@@ -25,16 +25,14 @@ gulp.task('sass', ['sass:foundation', 'sass:docs']);
 
 // Compiles Foundation Sass
 gulp.task('sass:foundation', function() {
-  return gulp.src('./foundation-sites.scss')
+  return gulp.src(['assets/*'])
     .pipe(sourcemaps.init())
     .pipe(plumber())
-    .pipe(sass({
-      includePaths: PATHS
-    }).on('error', sass.logError))
+    .pipe(sass().on('error', sass.logError))
     .pipe(autoprefixer({
       browsers: COMPATIBILITY
     }))
-    .pipe(rename('foundation.css'))
+    // .pipe(rename('foundation.css'))
     .pipe(sourcemaps.write('.'))
     .pipe(gulp.dest('_build/assets/css'));
 });