Skip to content
This repository was archived by the owner on Dec 11, 2021. It is now read-only.

Build: Fix and include Normalize in dist #169

Closed
wants to merge 1 commit into from
Closed

Build: Fix and include Normalize in dist #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scss/lint.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

@import
"_utilities/clearfix",
"_utilities/colors",
"_utilities/functions",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't exist anymore

"_utilities/hidden";

Expand Down
23 changes: 9 additions & 14 deletions scss/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 1 addition & 1 deletion tasks/options/csslint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
src: [ "dist/css/*.css" ],
src: [ "dist/css/chassis.lint.css", "dist/css/chassis.lint.css" ],
options: {
csslintrc: ".csslintrc"
}
Expand Down
15 changes: 15 additions & 0 deletions tasks/options/sass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module.exports = {

// This is everything including normalize.css see lint below for explanation
dist: {
options: {
sourceMap: true,
Expand All @@ -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"
}
}
};