From d9e475d03dad1c73ee1c27c429e8d27587e6985f Mon Sep 17 00:00:00 2001
From: Rohit Mulange <rohitmulange@gmail.com>
Date: Wed, 5 Oct 2016 23:54:37 +0530
Subject: [PATCH] Build: Fix and include Normalize in dist

---
 scss/lint.scss           |  1 -
 scss/style.scss          | 23 +++++++++--------------
 tasks/options/csslint.js |  2 +-
 tasks/options/sass.js    | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/scss/lint.scss b/scss/lint.scss
index aeebcb0..427a48d 100644
--- a/scss/lint.scss
+++ b/scss/lint.scss
@@ -11,7 +11,6 @@
 
 @import
 	"_utilities/clearfix",
-	"_utilities/colors",
 	"_utilities/functions",
 	"_utilities/hidden";
 
diff --git a/scss/style.scss b/scss/style.scss
index 81b166a..0e55f65 100644
--- a/scss/style.scss
+++ b/scss/style.scss
@@ -1,16 +1,11 @@
-// ==========================================================================
-// CSS Chassis
-// ==========================================================================
+/*
+* ==========================================================================
+* CSS Chassis
+*
+* This adds normalize.css to the build see lint.scss for expanation
+* ==========================================================================
+*/
 
 @import
-	"_utilities/clearfix",
-	"_utilities/functions",
-	"_utilities/hidden";
-
-@import
-	"atoms/icons/icons",
-	"atoms/typography/typography",
-	"atoms/buttons/buttons";
-
-@import
-	"views/main";
+	"external/normalize.css/normalize",
+	"scss/lint";
diff --git a/tasks/options/csslint.js b/tasks/options/csslint.js
index 7a9197f..1f5d1a8 100644
--- a/tasks/options/csslint.js
+++ b/tasks/options/csslint.js
@@ -1,5 +1,5 @@
 module.exports = {
-	src: [ "dist/css/*.css" ],
+	src: [ "dist/css/chassis.lint.css", "dist/css/chassis.lint.css" ],
 	options: {
 		csslintrc: ".csslintrc"
 	}
diff --git a/tasks/options/sass.js b/tasks/options/sass.js
index 0ccb304..ec4a31c 100644
--- a/tasks/options/sass.js
+++ b/tasks/options/sass.js
@@ -1,4 +1,6 @@
 module.exports = {
+
+	// This is everything including normalize.css see lint below for explanation
 	dist: {
 		options: {
 			sourceMap: true,
@@ -9,5 +11,18 @@ module.exports = {
 		files: {
 			"dist/css/chassis.css": "scss/style.scss"
 		}
+	},
+
+	// This is everything except normalize.css as normalize won't pass our lint settings
+	lint: {
+		options: {
+			sourceMap: true,
+
+			// This actually does nested until libsass updates to support expanded
+			outputStyle: "expanded"
+		},
+		files: {
+			"dist/css/chassis.lint.css": "scss/lint.scss"
+		}
 	}
 };