Skip to content

Commit

Permalink
Merge branch 'release/v6.7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
joeworkman committed Nov 2, 2021
2 parents 1f072b6 + d19604e commit 705bc1b
Show file tree
Hide file tree
Showing 212 changed files with 2,638 additions and 2,459 deletions.
6 changes: 3 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"rules": {
"block-scoped-var": 2,
"camelcase": 2,
"camelcase": 1,
"comma-style": [2, "last"],
"curly": [0, "all"],
"dot-notation": [
Expand All @@ -32,15 +32,15 @@
],
"eqeqeq": [2, "allow-null"],
"guard-for-in": 2,
"new-cap": 2,
"new-cap": 0,
"no-bitwise": 2,
"no-caller": 2,
"no-cond-assign": [2, "except-parens"],
"no-debugger": 2,
"no-empty": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-parens": 1,
"no-extra-parens": 0,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-loop-func": 2,
Expand Down
14 changes: 8 additions & 6 deletions .sass-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ rules:
- 1
- convention: '0'

# Turning this off since it break if/else statements
brace-style:
- 1
- 0
- style: stroustrup
- allow-single-line: true

Expand All @@ -34,7 +35,7 @@ rules:
leading-underscore: false

empty-line-between-blocks:
- 1
- 0
- ignore-single-line-rulesets: true

extends-before-declarations: 1
Expand Down Expand Up @@ -113,8 +114,8 @@ rules:

no-qualifying-elements:
- 1
- allow-element-with-attribute: false
allow-element-with-class: false
- allow-element-with-attribute: true
allow-element-with-class: true
allow-element-with-id: false

no-trailing-zero: 1
Expand All @@ -131,8 +132,9 @@ rules:
- 1
- convention: '([a-z0-9]+-?)+'

# Disabling this for now. Remembering some arbitrary custom sort order is not sustainable
property-sort-order:
- 1
- 0
-
ignore-custom-properties: true
order:
Expand Down Expand Up @@ -362,7 +364,7 @@ rules:
- 'speak'

quotes:
- 1
- 0
- style: single

shorthand-values: 1
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foundation-sites",
"version": "6.7.3",
"version": "6.7.4",
"description": "The most advanced responsive front-end framework in the world.",
"homepage": "https://get.foundation/sites",
"license": "MIT",
Expand Down
91 changes: 72 additions & 19 deletions dist/css/foundation-float.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.min.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit 705bc1b

Please sign in to comment.