From 50ff5db6e631e790aada35221aa37a7946b8ba62 Mon Sep 17 00:00:00 2001 From: Matthew Dahl Date: Wed, 8 Feb 2017 22:18:25 -0800 Subject: [PATCH] Update linting --- .remarkrc | 13 +++++++++++++ .travis.yml | 2 +- package.json | 13 ++++--------- .../components/list-item-expansion/_styles.scss | 2 +- .../app/pods/components/list-item/_styles.scss | 2 +- 5 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 .remarkrc diff --git a/.remarkrc b/.remarkrc new file mode 100644 index 0000000..9863e64 --- /dev/null +++ b/.remarkrc @@ -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 + } +} diff --git a/.travis.yml b/.travis.yml index f77aba4..0302081 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/package.json b/package.json index 06d0016..d03bc34 100644 --- a/package.json +++ b/package.json @@ -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": { @@ -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" }, @@ -91,4 +86,4 @@ "ember-frost-icon-pack": { "name": "frost-list" } -} \ No newline at end of file +} diff --git a/tests/dummy/app/pods/components/list-item-expansion/_styles.scss b/tests/dummy/app/pods/components/list-item-expansion/_styles.scss index 9e5de43..f8f6223 100644 --- a/tests/dummy/app/pods/components/list-item-expansion/_styles.scss +++ b/tests/dummy/app/pods/components/list-item-expansion/_styles.scss @@ -1,5 +1,5 @@ .list-item-expansion-placeholder { align-self: top; - font-style: italic; color: $frost-color-grey-5; + font-style: italic; } diff --git a/tests/dummy/app/pods/components/list-item/_styles.scss b/tests/dummy/app/pods/components/list-item/_styles.scss index 04171a8..895ca75 100644 --- a/tests/dummy/app/pods/components/list-item/_styles.scss +++ b/tests/dummy/app/pods/components/list-item/_styles.scss @@ -1,5 +1,5 @@ .list-item-placeholder { align-self: center; - font-style: italic; color: $frost-color-grey-5; + font-style: italic; }