Skip to content

Commit

Permalink
Merge pull request #101 from sandersky/master
Browse files Browse the repository at this point in the history
Update linting
  • Loading branch information
sandersky committed Feb 9, 2017
2 parents 13d9b0e + 50ff5db commit 64c4496
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 12 deletions.
13 changes: 13 additions & 0 deletions .remarkrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"plugins": {
"lint": {
"list-item-indent": false,
"maximum-line-length": false,
"no-duplicate-headings": false,
"no-multiple-toplevel-headings": false
}
},
"settings": {
"commonmark": true
}
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ deploy:
branch: master
condition: "$EMBER_TRY_SCENARIO = 'default'"
node: 'stable'
tags: false
tags: true
after_deploy:
- ".travis/publish-gh-pages.sh"
notifications:
Expand Down
13 changes: 4 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
},
"scripts": {
"build": "ember build",
"lint": "lint-all-the-things",
"start": "ember server",
"test": "npm run lint && COVERAGE=true ember test",
"ci-test": "ember try:one $EMBER_TRY_SCENARIO --- COVERAGE=true ember test",
"eslint": "eslint *.js addon app blueprints config tests",
"sass-lint": "sass-lint -q -v",
"lint": "npm run eslint && npm run sass-lint"
"ci-test": "ember try:one $EMBER_TRY_SCENARIO --- COVERAGE=true ember test"
},
"repository": "git@github.com:ciena-frost/ember-frost-list.git",
"engines": {
Expand Down Expand Up @@ -66,12 +64,9 @@
"ember-simple-uuid": "0.1.4",
"ember-sinon": "0.6.0",
"ember-spread": "^1.1.2",
"ember-test-utils": "^1.8.0",
"ember-test-utils": "^1.10.3",
"ember-truth-helpers": "1.3.0",
"eslint": "^3.4.0",
"eslint-config-frost-standard": "^5.3.2",
"loader.js": "^4.0.0",
"sass-lint": "^1.10.2",
"sinon-chai": "^2.8.0",
"smoke-and-mirrors": "~0.6.2"
},
Expand All @@ -91,4 +86,4 @@
"ember-frost-icon-pack": {
"name": "frost-list"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.list-item-expansion-placeholder {
align-self: top;
font-style: italic;
color: $frost-color-grey-5;
font-style: italic;
}
2 changes: 1 addition & 1 deletion tests/dummy/app/pods/components/list-item/_styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.list-item-placeholder {
align-self: center;
font-style: italic;
color: $frost-color-grey-5;
font-style: italic;
}

0 comments on commit 64c4496

Please sign in to comment.