Permalink
Browse files

Build: Fix and include Normalize in dist

Closes gh-169
  • Loading branch information...
geekman-rohit committed Oct 5, 2016
1 parent 16ec9a2 commit 66e5b358524929657cca850856493b2060598aef
Showing with 25 additions and 16 deletions.
  1. +0 −1 scss/lint.scss
  2. +9 −14 scss/style.scss
  3. +1 −1 tasks/options/csslint.js
  4. +15 −0 tasks/options/sass.js
View
@@ -11,7 +11,6 @@
@import
"_utilities/clearfix",
"_utilities/colors",
"_utilities/functions",
"_utilities/hidden";
View
@@ -1,16 +1,11 @@
// ==========================================================================
// CSS Chassis
// ==========================================================================
/*
* ==========================================================================
* CSS Chassis
*
* This adds normalize.css to the build see lint.scss for expanation

This comment has been minimized.

Show comment
Hide comment
@nashvail

nashvail Oct 26, 2016

Contributor

Hey! minor typo here :P

@nashvail

nashvail Oct 26, 2016

Contributor

Hey! minor typo here :P

This comment has been minimized.

Show comment
Hide comment
@sfrisk

sfrisk Oct 26, 2016

Member

oooops

@sfrisk

sfrisk Oct 26, 2016

Member

oooops

This comment has been minimized.

Show comment
Hide comment
@sfrisk

sfrisk Oct 26, 2016

Member

This is already pulled in, but we could do a one off commit to fix this at some point.

@sfrisk

sfrisk Oct 26, 2016

Member

This is already pulled in, but we could do a one off commit to fix this at some point.

* ==========================================================================
*/
@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";
View
@@ -1,5 +1,5 @@
module.exports = {
src: [ "dist/css/*.css" ],
src: [ "dist/css/chassis.lint.css", "dist/css/chassis.lint.css" ],
options: {
csslintrc: ".csslintrc"
}
View
@@ -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"
}
}
};

0 comments on commit 66e5b35

Please sign in to comment.