aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-27 17:54:23 -0700
committerMark Otto <[email protected]>2017-05-27 17:54:23 -0700
commit7c9efe786aad4d55b468223697c6018b9b59b8dd (patch)
tree748bd712ddf46bedaec51ba9b5507b532fc6e3aa
parent9dbe77a0b0669ca47ace5bb5b5a2e394d7dfae62 (diff)
downloadbootstrap-7c9efe786aad4d55b468223697c6018b9b59b8dd.tar.xz
bootstrap-7c9efe786aad4d55b468223697c6018b9b59b8dd.zip
move .scss-lint.yml to route dir instead of symlink (which didn't work)
-rw-r--r--.hound.yml2
-rw-r--r--.scss-lint.yml (renamed from scss/.scss-lint.yml)0
l---------docs/assets/scss/.scss-lint.yml1
-rw-r--r--package.json6
4 files changed, 4 insertions, 5 deletions
diff --git a/.hound.yml b/.hound.yml
index 3387b0ce0..7449ea3f9 100644
--- a/.hound.yml
+++ b/.hound.yml
@@ -1,7 +1,7 @@
fail_on_violations: true
scss:
- config_file: scss/.scss-lint.yml
+ config_file: .scss-lint.yml
jshint:
enabled: false
diff --git a/scss/.scss-lint.yml b/.scss-lint.yml
index 845001ef4..845001ef4 100644
--- a/scss/.scss-lint.yml
+++ b/.scss-lint.yml
diff --git a/docs/assets/scss/.scss-lint.yml b/docs/assets/scss/.scss-lint.yml
deleted file mode 120000
index a6251a190..000000000
--- a/docs/assets/scss/.scss-lint.yml
+++ /dev/null
@@ -1 +0,0 @@
-scss/.scss-lint.yml \ No newline at end of file
diff --git a/package.json b/package.json
index 9ee855d58..e23a89bd9 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
"bash": "bash",
"css": "npm-run-all css-lint css-compile css-prefix css-minify",
"css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs",
- "css-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
- "css-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
+ "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss",
+ "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
"css-compile": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
"css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
"css-prefix": "postcss --config build/ --replace dist/css/*.css",
@@ -106,7 +106,7 @@
"build",
"js/.eslintrc.json",
"js/**/*.js",
- "scss/.scss-lint.yml",
+ ".scss-lint.yml",
"scss/**/*.scss",
"LICENSE"
],