From c40dd8c66272bb85a77428be71e2ca1cf7704bae Mon Sep 17 00:00:00 2001 From: vipickering Date: Thu, 27 Dec 2018 16:50:33 +0000 Subject: [PATCH] :bug: spotted at somepoint I accidentally passed blank params in to postcss config preventing stylelint from firing. Fixed it, and updated styles to fix linting --- .stylelintrc | 23 ----------------------- _css/application.css | 5 +---- _css/grid/_grid.css | 4 +--- _css/utility/_media-queries.css | 5 +---- package-lock.json | 2 +- package.json | 3 +-- postcss.config.js | 7 ++----- 7 files changed, 7 insertions(+), 42 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index bc9ce9b4c..9388a9922 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,17 +1,5 @@ { "rules": { - "at-rule-empty-line-before": [ - "always", - { - "except": [ - "blockless-after-same-name-blockless", - "first-nested" - ], - "ignore": [ - "after-comment" - ] - } - ], "at-rule-name-case": "lower", "at-rule-name-space-after": "always-single-line", "at-rule-semicolon-newline-after": "always", @@ -26,17 +14,6 @@ "color-hex-case": "lower", "color-hex-length": "short", "color-no-invalid-hex": true, - "comment-empty-line-before": [ - "always", - { - "except": [ - "first-nested" - ], - "ignore": [ - "stylelint-commands" - ] - } - ], "comment-no-empty": true, "comment-whitespace-inside": "always", "custom-property-empty-line-before": [ diff --git a/_css/application.css b/_css/application.css index 02fde06b7..aa630aef8 100644 --- a/_css/application.css +++ b/_css/application.css @@ -44,14 +44,11 @@ @import "layout/_z-index.css"; @import "layout/_flex.css"; -/* No JS Widgets */ -/*@import "widgets/_menu.css";*/ - /* Code generated by markdown */ @import "layout/_generated-code.css"; /* Dynamic Type, overwrite other values if on iOS */ -/*@import "typography/_dynamic-type.css";*/ +/* @import "typography/_dynamic-type.css"; */ /* Print */ @import "_print.css"; diff --git a/_css/grid/_grid.css b/_css/grid/_grid.css index 065bda59e..7c112fa02 100644 --- a/_css/grid/_grid.css +++ b/_css/grid/_grid.css @@ -20,9 +20,7 @@ pre { align-items: center; } -/* -When embedding CodePens or snippets. Allow them to break out the grid, but not go full screen -*/ +/* When embedding CodePens or snippets. Allow them to break out the grid, but not go full screen */ .layoutGrid > .cp_embed_wrapper { grid-column: full; width: 100%; diff --git a/_css/utility/_media-queries.css b/_css/utility/_media-queries.css index 981827f8f..30afe62b8 100644 --- a/_css/utility/_media-queries.css +++ b/_css/utility/_media-queries.css @@ -1,6 +1,4 @@ -/* - - CUSTOM MEDIA QUERIES +/* CUSTOM MEDIA QUERIES Media query values can be changed to fit your own content. There are no magic bullets when it comes to media query width values. @@ -27,7 +25,6 @@ background-color: red; } } - */ /* Media Queries */ diff --git a/package-lock.json b/package-lock.json index a5751ecfb..cd2854a44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5571,7 +5571,7 @@ }, "rgba-regex": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=", "dev": true }, diff --git a/package.json b/package.json index 9504440bd..033678b7a 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,5 @@ "postcss-reporter": "^6.0.0", "postcss-syntax": "^0.34.0", "stylelint": "^9.9.0" - }, - "dependencies": {} + } } diff --git a/postcss.config.js b/postcss.config.js index 751428b06..fcb9e48c4 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,11 +1,8 @@ module.exports = { map: false, plugins: [ - require('postcss-import')({ - plugins: [ - require('stylelint')('./.stylelintrc') - ] - }), + require('postcss-import'), + require('stylelint'), require('css-mqpacker'), require('postcss-custom-media'), require('cssnano')({ autoprefixer: false }),