Merge branch 'release/v6.7.4'

Author: joeworkman

.eslintrc

@@ -21,7 +21,7 @@
   },
   "rules": {
     "block-scoped-var": 2,
-    "camelcase": 2,
+    "camelcase": 1,
     "comma-style": [2, "last"],
     "curly": [0, "all"],
     "dot-notation": [
@@ -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,

.sass-lint.yml

@@ -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
 
@@ -34,7 +35,7 @@ rules:
       leading-underscore: false
 
   empty-line-between-blocks:
-    - 1
+    - 0
     - ignore-single-line-rulesets: true
 
   extends-before-declarations: 1
@@ -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
@@ -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:
@@ -362,7 +364,7 @@ rules:
         - 'speak'
 
   quotes:
-    - 1
+    - 0
     - style: single
 
   shorthand-values: 1

bower.json

@@ -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",