Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
Merge pull request #8 from vanduynslagerp/update-stylelint
Browse files Browse the repository at this point in the history
Update stylelint
  • Loading branch information
pvdlg committed Jul 13, 2017
2 parents ee08588 + 54ce751 commit 93b117a
Show file tree
Hide file tree
Showing 8 changed files with 1,392 additions and 1,120 deletions.
11 changes: 8 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
module.exports = {
'extends': ['@metahub/eslint-config/es6-config'],
'parserOptions': {'sourceType': 'module'},
'rules': {'no-magic-numbers': 0},
extends: [
'@metahub/eslint-config/es6-config',
'@metahub/eslint-config/promise-config',
'@metahub/eslint-config/ava-config',
'@metahub/eslint-config/prettier-config',
],
parserOptions: {sourceType: 'module'},
rules: {'no-magic-numbers': 0},
};
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ coverage
test
.gitignore
.npmignore
.travis.yml
.codeclimate.yml
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
global:
- GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
before_install:
- npm install -g npm
- if [[ `npm -v` != 5* ]]; then npm install -g npm@5; fi
- npm install -g greenkeeper-lockfile@1
before_script:
- greenkeeper-lockfile-update
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ module.exports = {
'comment-word-blacklist': [['/^TODO/'], {severity: 'warning'}],

// General / Sheet
'indentation': 2,
indentation: 2,
'max-empty-lines': 1,
'max-line-length': [120, {ignore: ['comments']}],
'max-nesting-depth': 3,
Expand Down
Loading

0 comments on commit 93b117a

Please sign in to comment.