diff --git a/.editorconfig b/.editorconfig index ad9d6beae3..cf8d7fa6ee 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,3 @@ end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true - -[Makefile] -indent_style = tab diff --git a/Gruntfile.js b/Gruntfile.js index 0e4fc244b6..dd0cc96009 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,6 @@ +/* jshint node: true */ module.exports = function(grunt) { + "use strict"; // Project configuration. grunt.initConfig({ @@ -26,6 +28,7 @@ module.exports = function(grunt) { }, jshint: { options: { + ignores: [],// HACK: workaround https://github.com/gruntjs/grunt-contrib-jshint/issues/86 jshintrc: 'js/.jshintrc' }, gruntfile: { diff --git a/README.md b/README.md index 1b95319ec5..5748da1194 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bootstrap v3.0.0](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) +# [Bootstrap v3.0.0](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). @@ -39,7 +39,7 @@ Learn more about using Jekyll by reading their [documentation](http://jekyllrb.c ### Documentation for previous releases -Documentation for v2.3.3 has been made available for the time being at [http://getbootstrap.com/2.3.3/](http://getbootstrap.com/2.3.3/) while folks transition to Bootstrap 3. +Documentation for v2.3.2 has been made available for the time being at [http://getbootstrap.com/2.3.2/](http://getbootstrap.com/2.3.2/) while folks transition to Bootstrap 3. [Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download. diff --git a/_includes/nav-components.html b/_includes/nav-components.html index 514dcfed3c..86bf4d070c 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -25,6 +25,17 @@
  • Dropup variation
    • +
  • + Input groups + +
  • Navs diff --git a/_layouts/default.html b/_layouts/default.html index 556c0fe1d6..67b81b9e87 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -48,9 +48,6 @@ - - Back to top -