Merge pull request zurb#269 from zurb/exports-mixin

Refactor of exports mixin
dfeeney-webdev · Dec 19, 2014 · c1b2d4b · c1b2d4b
2 parents 7549afa + b098f89
commit c1b2d4b
Show file tree

Hide file tree

Showing 9 changed files with 374 additions and 521 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,6 @@ bower_components/*
 node_modules/
 npm-debug.log
 /dist/*
-/.sass-cache/*
+.sass-cache/
 /build/*
-/tests/unit/scss/*.css*
+/tests/unit/scss/*.css
diff --git a/docs/assets/scss/app.scss b/docs/assets/scss/app.scss
@@ -1,7 +1,3 @@
-// CUSTOMIZE FOUNDATION
-// Customize all settings and stuff here. Yay!
-@import "settings";
-
 // FOUNDATION
 // The core of the framework. Woo!
 @import "foundation";

diff --git a/gulpfile.js b/gulpfile.js
@@ -136,8 +136,8 @@ gulp.task('sass', ['settings'], function() {
       style: 'nested',
       bundleExec: true
     })
-    .on('error', function(e) {
-      console.log(e);
+    .on('error', function(err) {
+      console.log(err.message);
     })
     .pipe(autoprefixer({
       browsers: ['last 2 versions', 'ie 10']
@@ -247,8 +247,10 @@ gulp.task('sass:test', function() {
     loadPath: ['scss', 'docs/assets/scss', 'bower_components/bootcamp/dist'],
     style: 'nested',
     bundleExec: true
-   })
-    .pipe(gulp.dest('tests/unit/scss'));
+  })
+    .on('data', function(data) {
+      console.log(data.contents.toString());
+    });
 });
 
 gulp.task('test', ['karma:test', 'sass:test'], function() {

diff --git a/scss/_global.scss b/scss/_global.scss
@@ -70,13 +70,12 @@ $foundation-colors: (
   dark: $dark-color,
 );
 
-@include exports("global") {
+@include exports(global) {
   // Make extra sure we're using the whole window
   html, body {
     height: 100%;
     font-size: $base-font-size;
   }
-
   // Set box-sizing globally to handle padding and border widths
   html {
     box-sizing: border-box;

diff --git a/scss/_settings.scss b/scss/_settings.scss
@@ -29,56 +29,6 @@
 //  23. Switch
 //  24. Tabs
 //  25. Title Bar
-//  1.  CSS Exports
-//  2.  Global Styles
-//  3.  Breakpoints
-//  4.  Typography
-//  5.  Grid
-//  6.  Accordion
-//  7.  Action Sheet
-//  8.  Block List
-//  9.  Button Group
-//  10. Button
-//  11. Card
-//  12. Extras
-//  13. Forms
-//  14. Iconic
-//  15. Label
-//  16. Menu Bar
-//  17. Modal
-//  18. Motion UI
-//  19. Notification
-//  20. Off-canvas
-//  21. Panel
-//  22. Popup
-//  23. Switch
-//  24. Tabs
-//  25. Title Bar
-//  1.  CSS Exports
-//  2.  Global Styles
-//  3.  Breakpoints
-//  4.  Typography
-//  5.  Grid
-//  6.  Accordion
-//  7.  Action Sheet
-//  8.  Block List
-//  9.  Button Group
-//  10. Button
-//  11. Card
-//  12. Extras
-//  13. Forms
-//  14. Iconic
-//  15. Label
-//  16. Menu Bar
-//  17. Modal
-//  18. Motion UI
-//  19. Notification
-//  20. Off-canvas
-//  21. Panel
-//  22. Popup
-//  23. Switch
-//  24. Tabs
-//  25. Title Bar
 
 // 1. CSS Exports
 // - - - - - - - - - - - - - - -