Merge branch 'stylelint-plus-prettier' of github.com:pmarsceill/just-the-docs into stylelint-plus-prettier

This commit is contained in:
Patrick Marsceill
2020-04-24 15:17:52 -04:00
12 changed files with 357 additions and 141 deletions

View File

@@ -1,13 +1,17 @@
{
"ignoreFiles" : [
"ignoreFiles": [
"assets/css/just-the-docs.scss",
"assets/css/dark-mode-preview.scss",
"_sass/vendor/**/*.scss"
],
<<<<<<< HEAD
"extends": [
"stylelint-config-primer",
"stylelint-config-prettier"
],
=======
"extends": ["stylelint-prettier/recommended", "stylelint-config-primer"],
>>>>>>> c81862436316d38aea535163427d17f84e29343a
"plugins": ["stylelint-prettier"],
"rules": {
"prettier/prettier": true