diff --git a/Gruntfile.js b/Gruntfile.js index b2b66855be..6dcb2085b5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,7 @@ /*! * Bootstrap's Gruntfile * http://getbootstrap.com - * Copyright 2013-2014 Twitter, Inc. + * Copyright 2013-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -336,6 +336,7 @@ module.exports = function (grunt) { jekyll: { options: { + bundleExec: true, config: '_config.yml' }, docs: {}, @@ -350,7 +351,6 @@ module.exports = function (grunt) { options: { ignore: [ 'Element “img” is missing required attribute “src”.', - 'Bad value “X-UA-Compatible” for attribute “http-equiv” on element “meta”.', 'Attribute “autocomplete” not allowed on element “input” at this point.', 'Attribute “autocomplete” not allowed on element “button” at this point.', 'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)', @@ -438,7 +438,7 @@ module.exports = function (grunt) { require('time-grunt')(grunt); // Docs HTML validation task - grunt.registerTask('validate-html', ['jekyll:docs']); + grunt.registerTask('validate-html', ['jekyll:docs', 'htmllint']); var runSubset = function (subset) { return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset; diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 48074e3845..f02cd4ba7b 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -3,8 +3,8 @@
Designed and built with all the love in the world by @mdo and @fat. Maintained by the core team with the help of our contributors.
Currently v{{ site.current_version }}. Code licensed MIT, docs CC BY 3.0.
diff --git a/docs/components/dropdowns.md b/docs/components/dropdowns.md index 037e0d1cf0..785913dc4f 100644 --- a/docs/components/dropdowns.md +++ b/docs/components/dropdowns.md @@ -4,7 +4,7 @@ title: Dropdowns group: components --- -Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. +Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. They're toggled by clicking, not by hovering; this is [an intentional design decision.](http://markdotto.com/2012/02/27/bootstrap-explained-dropdowns/) ## Contents diff --git a/js/.eslintrc b/js/.eslintrc index b21ede35a2..33b23f2457 100644 --- a/js/.eslintrc +++ b/js/.eslintrc @@ -15,8 +15,8 @@ "no-dupe-args": 2, "no-dupe-keys": 2, "no-duplicate-case": 2, - "no-empty-character-class": 2, "no-empty": 2, + "no-empty-character-class": 2, "no-ex-assign": 2, "no-extra-boolean-cast": 2, "no-extra-parens": 0, @@ -29,11 +29,11 @@ "no-obj-calls": 2, "no-regex-spaces": 2, "no-sparse-arrays": 2, + "no-unexpected-multiline": 2, "no-unreachable": 2, "use-isnan": 2, "valid-jsdoc": 0, "valid-typeof": 2, - "no-unexpected-multiline": 2, //Best Practices "accessor-pairs": 2, @@ -41,8 +41,8 @@ "consistent-return": 2, "curly": 2, "default-case": 2, - "dot-notation": 0, "dot-location": 0, + "dot-notation": 0, "eqeqeq": 2, "guard-for-in": 2, "no-alert": 2, @@ -66,11 +66,11 @@ "no-multi-spaces": 0, "no-multi-str": 0, "no-native-reassign": 2, + "no-new": 2, "no-new-func": 0, "no-new-wrappers": 2, - "no-new": 2, - "no-octal-escape": 2, "no-octal": 2, + "no-octal-escape": 2, "no-param-reassign": 0, "no-process-env": 2, "no-proto": 2, @@ -95,11 +95,11 @@ "no-catch-shadow": 2, "no-delete-var": 2, "no-label-var": 2, - "no-shadow-restricted-names": 2, "no-shadow": 0, - "no-undef-init": 2, + "no-shadow-restricted-names": 2, "no-undef": 0, "no-undefined": 0, + "no-undef-init": 2, "no-unused-vars": 2, "no-use-before-define": 0, @@ -117,11 +117,11 @@ "func-style": 0, "indent": 0, "key-spacing": 0, - "lines-around-comment": 0, "linebreak-style": 2, + "lines-around-comment": 0, "new-cap": 0, - "new-parens": 2, "newline-after-var": 0, + "new-parens": 2, "no-array-constructor": 2, "no-continue": 0, "no-inline-comments": 0, @@ -142,17 +142,17 @@ "padded-blocks": 0, "quote-props": 0, "quotes": 0, - "semi-spacing": 0, "semi": [2, "never"], + "semi-spacing": 0, "sort-vars": 2, "space-after-keywords": 2, "space-before-blocks": 2, "space-before-function-paren": 0, - "space-in-parens": 2, + "spaced-comment": 2, "space-infix-ops": 2, + "space-in-parens": 2, "space-return-throw-case": 2, "space-unary-ops": 2, - "spaced-comment": 2, // es6 "arrow-parens": 2, @@ -167,8 +167,8 @@ "object-shorthand": 2, "prefer-arrow-callback": 2, "prefer-const": 0, - "prefer-spread": 2, "prefer-reflect": 0, + "prefer-spread": 2, "prefer-template": 2, "require-yield": 2