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

Commit

Permalink
Merge pull request #95 from mobify/release-v2.4.1
Browse files Browse the repository at this point in the history
Release v2.4.1
  • Loading branch information
Marlow Payne committed Feb 24, 2016
2 parents 1ee7a0f + fb2b6c3 commit 21b7717
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.4.1
- Fix some bugs with sass-lint config
2.4.0
- Add a sass-lint config file
2.3.7
Expand Down
25 changes: 14 additions & 11 deletions css/.sass-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

files:
include: '**/*.s+(a|c)ss'
ignore:
- 'node_modules/**/*.scss'
ignore: # standard ignores for Adaptive.js projects
- '**/node_modules/**/*.scss'
- '**/bower_components/**/*.scss'
- 'app/global/styles/base/**/*.scss'
options:
formatter: stylish
Expand All @@ -14,7 +15,7 @@ rules:
- max-depth: 1
border-zero:
- 2
- convention: zero
- convention: '0'
brace-style:
- 2
- allow-single-line: false
Expand Down Expand Up @@ -48,12 +49,12 @@ rules:
- style: lowercase
id-name-format:
- 2
- convention: hyphenatedbem
- convention: '[a-z]|-{3}|_{3}|[^_]_[^_]'
indentation:
- 2
- size: 4
leading-zero:
- 2
leading-zero: # this seems to conflict with spacing around operators
- 0
- include: true
mixin-name-format:
- 2
Expand All @@ -73,10 +74,12 @@ rules:
no-ids: 0
no-important: 0
no-invalid-hex: 2
no-mergeable-selectors: 2
no-misspelled-properties:
no-mergeable-selectors:
- 2
- extra-properties: []
- whitelist: ['from', 'to']
no-misspelled-properties: # only warn: sass-lint's list of properties needs updating
- 1
- extra-properties: ['tap-highlight', 'overflow-scrolling']
no-qualifying-elements:
- 2
- allow-element-with-attribute: true
Expand All @@ -88,7 +91,7 @@ rules:
placeholder-in-extend: 2
placeholder-name-format:
- 2
- convention: hyphenatedbem
- convention: '[a-z]|-{3}|_{3}|[^_]_[^_]'
property-sort-order:
- 2
- ignore-custom-properties: false
Expand Down Expand Up @@ -318,7 +321,7 @@ rules:
- 2
- include: false
trailing-semicolon: 2
url-quotes: 2
url-quotes: 1 # Only warn here, since sass-lint doesn't understand helpers in urls
variable-for-property:
- 2
- properties:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mobify-code-style",
"version": "2.4.0",
"version": "2.4.1",
"description": "Code style guide and linting tools for Mobify",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 21b7717

Please sign in to comment.