From 275989e64f6b69d246fa69148f81943336d7bbdf Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 24 Aug 2015 16:32:32 -0700 Subject: [PATCH 1/4] Document that dropdowns are intentionally click-based rather than hover-based And link to a relevant blog post w/ more info. Refs #16966 [skip sauce] --- docs/components/dropdowns.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/dropdowns.md b/docs/components/dropdowns.md index 037e0d1cf..785913dc4 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 From 4fae5a6f4b6d8528a8013030850bad60e9e4fba8 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 25 Aug 2015 08:43:47 +0300 Subject: [PATCH 2/4] Fix `grunt validate-html` task. --- Gruntfile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index b2b66855b..6dcb2085b 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; From 7e2eb9e74aa627de224b384c7b8852d61c53dabb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 25 Aug 2015 08:45:07 +0300 Subject: [PATCH 3/4] js/.eslintrc: sort rules by name. [ci skip] --- js/.eslintrc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/js/.eslintrc b/js/.eslintrc index b21ede35a..33b23f245 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 From 3b415db33ff068161646b1938c59aa160ee690a7 Mon Sep 17 00:00:00 2001 From: wangsai Date: Tue, 25 Aug 2015 14:49:02 +0800 Subject: [PATCH 4/4] fix footer links --- docs/_includes/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 48074e384..f02cd4ba7 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.