Merge branch 'master' of https://github.com/twbs/ratchet into fix-paths

.travis.yml

@@ -6,7 +6,7 @@ before_install:
 install:
   - travis_retry npm install -g grunt-cli
   - travis_retry npm install
-  - travis_retry gem install --no-document "jekyll:~>1.5.0" "sass:~>3.3.0"
+  - travis_retry gem install --no-document "jekyll:~>2.2.0" "sass:~>3.3.12"
 matrix:
   fast_finish: true
 notifications:

Gruntfile.js

@@ -223,7 +223,8 @@ module.exports = function(grunt) {
         reset: true,
         relaxerror: [
           'Attribute ontouchstart not allowed on element body at this point.',
-          'Bad value X-UA-Compatible for attribute http-equiv on element meta.'
+          'Bad value X-UA-Compatible for attribute http-equiv on element meta.',
+          'Consider using the h1 element as a top-level heading only \\(all h1 elements are treated as top-level headings by many screen readers and other tools\\)\\.'
         ]
       },
       files: {

_config.yml

@@ -4,7 +4,7 @@ authors:      Connor Sears
 description:  Build mobile apps with simple HTML, CSS, and JS components.
 
 # Dependencies
-pygments:     true
+highlighter:  pygments
 
 # Permalinks
 permalink:    pretty

docs/robots.txt

@@ -1,5 +1,4 @@
 ---
-layout: nil
 ---
 
 # www.robotstxt.org/

docs/sitemap.xml

@@ -1,5 +1,4 @@
 ---
-layout: nil
 ---
 
 <?xml version="1.0" encoding="UTF-8"?>

js/.jscsrc

@@ -1,30 +1,32 @@
 {
   "disallowEmptyBlocks": true,
   "disallowKeywords": ["with"],
-  "disallowLeftStickedOperators": ["?", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "disallowMixedSpacesAndTabs": true,
   "disallowMultipleLineStrings": true,
   "disallowMultipleVarDecl": true,
   "disallowQuotedKeysInObjects": "allButReserved",
-  "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+  "disallowSpaceAfterPrefixUnaryOperators": ["!"],
+  "disallowSpaceBeforeBinaryOperators": [","],
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+  "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
   "disallowSpacesInsideArrayBrackets": true,
   "disallowSpacesInsideParentheses": true,
+  "disallowTrailingComma": true,
   "disallowTrailingWhitespace": true,
   "requireCamelCaseOrUpperCaseIdentifiers": true,
   "requireCapitalizedConstructors": true,
   "requireCommaBeforeLineBreak": true,
   "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch", "case", "default"],
   "requireDotNotation": true,
-  "requireLeftStickedOperators": [","],
   "requireLineFeedAtFileEnd": true,
   "requireParenthesesAroundIIFE": true,
-  "requireRightStickedOperators": ["!"],
   "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
   "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
+  "requireSpaceAfterLineComment": true,
   "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
   "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true },
+  "requireSpacesInConditionalExpression": true,
   "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
   "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
   "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },

package.json

@@ -27,22 +27,22 @@
   },
   "devDependencies": {
     "grunt": "~0.4.5",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-concat": "~0.4.0",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-concat": "~0.5.0",
     "grunt-contrib-copy": "~0.5.0",
     "grunt-contrib-csslint": "~0.2.0",
-    "grunt-contrib-cssmin": "~0.9.0",
+    "grunt-contrib-cssmin": "~0.10.0",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-sass": "~0.7.3",
-    "grunt-contrib-uglify": "~0.4.0",
+    "grunt-contrib-uglify": "~0.5.1",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-csscomb": "~2.0.1",
-    "grunt-html-validation": "~0.1.17",
+    "grunt-csscomb": "~3.0.0",
+    "grunt-html-validation": "~0.1.18",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs-checker": "~0.4.4",
+    "grunt-jscs": "~0.6.2",
     "grunt-sed": "~0.1.1",
-    "load-grunt-tasks": "~0.4.0",
-    "time-grunt": "~0.3.1"
+    "load-grunt-tasks": "~0.6.0",
+    "time-grunt": "~0.4.0"
   },
   "engines": {
     "node": "~0.10.1"

sass/.csscomb.json

@@ -1,16 +1,20 @@
 {
   "always-semicolon": true,
   "block-indent": 2,
-  "colon-space": [0, 1],
   "color-case": "lower",
   "color-shorthand": true,
-  "combinator-space": true,
   "element-case": "lower",
   "eof-newline": true,
   "leading-zero": false,
   "remove-empty-rulesets": true,
-  "rule-indent": 2,
-  "stick-brace": " ",
+  "space-after-colon": 1,
+  "space-after-combinator": 1,
+  "space-after-declaration": "\n",
+  "space-after-opening-brace": "\n",
+  "space-before-closing-brace": "\n",
+  "space-before-colon": 0,
+  "space-before-combinator": 1,
+  "space-before-opening-brace": 1,
   "strip-spaces": true,
   "unitless-zero": true,
   "vendor-prefix-align": true,