Merge branch 'master' into derp

Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/button-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/browser-device-support.html docs/_includes/js/carousel.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/getting-started.html docs/_includes/nav/javascript.html docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/justified-nav/index.html less/_forms.less less/_tooltip.less less/navs.less less/theme.less

Merge branch 'master' into derp
Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/button-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/browser-device-support.html docs/_includes/js/carousel.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/getting-started.html docs/_includes/nav/javascript.html docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/justified-nav/index.html less/_forms.less less/_tooltip.less less/navs.less less/theme.less
86af1f39 · Mark Otto · 9796f56f · d1278efc · 86af1f39 · 86af1f39
Commit 86af1f39 authored Nov 09, 2014 by Mark Otto
91 changed files
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ after_script:
  - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
 env:
  global:
-    - JEKYLL_VERSION: 2.3.0
-    - ROUGE_VERSION: 1.6.2
+    - JEKYLL_VERSION: 2.4.0
+    - ROUGE_VERSION: 1.7.2
    - SAUCE_USERNAME: bootstrap
    - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
    - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -88,6 +88,10 @@ When feasible, we aim to report such upstream bugs to the relevant browser vendo
 | Google, Opera | Chrome, Chromium, Opera v15+ | Blink            | https://code.google.com/p/chromium/issues/list                                        | Click the "New issue" button.                            |
 | Microsoft     | Internet Explorer            | Trident          | https://connect.microsoft.com/IE/feedback/LoadSubmitFeedbackForm                      |                                                          |

+### Issues bots
+
+[@twbs-lmvtfy](https://github.com/twbs-lmvtfy) is a Bootstrap bot that hangs out in our GitHub issue tracker and automatically checks for HTML validation errors in live examples (e.g. jsFiddles, JS Bins, Bootplys, Plunks, CodePens, etc.) posted in issue comments. If it finds any errors, it will post a follow-up comment on the issue and point out the errors. If this happens with an example you've posted, please fix the errors and post an updated live example. If you opened a bug report, please check whether the bug still occurs with your revised, valid live example. If the bug no longer occurs, it was probably due to your invalid HTML rather than something in Bootstrap and we'd appreciate it if you could close out the GitHub issue.
+

 ## Feature requests

@@ -112,6 +116,17 @@ Please adhere to the [coding guidelines](#code-guidelines) used throughout the
 project (indentation, accurate comments, etc.) and any other requirements
 (such as test coverage).

+**Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js`
+directly!** Those files are automatically generated. You should edit the
+source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/master/less)
+and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead.
+
+Similarly, when contributing to Bootstrap's documentation, you should edit the
+documentation source files in
+[the `/bootstrap/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/docs).
+**Do not edit the `gh-pages` branch.** That branch is generated from the
+documentation source files and is managed separately by the Bootstrap Core Team.
+
 Adhering to the following process is the best way to get your work
 included in the project:

@@ -165,6 +180,13 @@ included in the project:
 **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
 license your work under the terms of the [MIT License](LICENSE.md).

+### Pull request checker bot: Rorschach
+
+[@twbs-rorschach](https://github.com/twbs-rorschach) is a Bootstrap bot that hangs out in our GitHub issue tracker and automatically checks all pull requests for a few simple common mistakes. It's possible that Rorschach might leave a comment on your pull request and then close it. If that happens, simply fix the problem(s) mentioned in the comment (there should be link(s) in the comment explaining the problem(s) in detail) and then either:
+
+* Push the revised version to your pull request's branch and post a comment on the pull request saying that you've fixed the problem(s). One of the Bootstrap Core Team members will then come along and reopen your pull request.
+* Or you can just open a new pull request for your revised version.
+

 ## Code guidelines


--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -27,6 +27,13 @@ module.exports = function (grunt) {
  };
  var generateRawFiles = require('./grunt/bs-raw-files-generator.js');
  var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
+  var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' });
+
+  Object.keys(configBridge.paths).forEach(function (key) {
+    configBridge.paths[key].forEach(function (val, i, arr) {
+      arr[i] = path.join('./docs/assets', val);
+    });
+  });

  // Project configuration.
  grunt.initConfig({
@@ -38,21 +45,8 @@ module.exports = function (grunt) {
            ' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
            ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
            ' */\n',
-    // NOTE: This jqueryCheck/jqueryVersionCheck code is duplicated in customizer.js;
-    //       if making changes here, be sure to update the other copy too.
-    jqueryCheck: [
-      'if (typeof jQuery === \'undefined\') {',
-      '  throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\')',
-      '}\n'
-    ].join('\n'),
-    jqueryVersionCheck: [
-      '+function ($) {',
-      '  var version = $.fn.jquery.split(\' \')[0].split(\'.\')',
-      '  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {',
-      '    throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 1.9.1 or higher\')',
-      '  }',
-      '}(jQuery);\n\n'
-    ].join('\n'),
+    jqueryCheck: configBridge.config.jqueryCheck.join('\n'),
+    jqueryVersionCheck: configBridge.config.jqueryVersionCheck.join('\n'),

    // Task configuration.
    clean: {
@@ -138,24 +132,11 @@ module.exports = function (grunt) {
        dest: 'dist/js/<%= pkg.name %>.min.js'
      },
      customize: {
-        src: [
-          'docs/assets/js/vendor/less.min.js',
-          'docs/assets/js/vendor/jszip.min.js',
-          'docs/assets/js/vendor/uglify.min.js',
-          'docs/assets/js/vendor/Blob.js',
-          'docs/assets/js/vendor/FileSaver.js',
-          'docs/assets/js/raw-files.min.js',
-          'docs/assets/js/src/customizer.js'
-        ],
+        src: configBridge.paths.customizerJs,
        dest: 'docs/assets/js/customize.min.js'
      },
      docsJs: {
-        // NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
-        src: [
-          'docs/assets/js/vendor/holder.js',
-          'docs/assets/js/vendor/ZeroClipboard.min.js',
-          'docs/assets/js/src/application.js'
-        ],
+        src: configBridge.paths.docsJs,
        dest: 'docs/assets/js/docs.min.js'
      }
    },
@@ -191,16 +172,7 @@ module.exports = function (grunt) {

    autoprefixer: {
      options: {
-        browsers: [
-          'Android 2.3',
-          'Android >= 4',
-          'Chrome >= 20',
-          'Firefox >= 24', // Firefox 24 is the latest ESR
-          'Explorer >= 9',
-          'iOS >= 6',
-          'Opera >= 12',
-          'Safari >= 6'
-        ]
+        browsers: configBridge.config.autoprefixerBrowsers
      },
      core: {
        options: {

--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!

 Four quick start options are available:

- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.2.0.zip).
+- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.0.zip).
 - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
 - Install with [Bower](http://bower.io): `bower install bootstrap`.
 - Install with [npm](https://www.npmjs.org): `npm install bootstrap`.
@@ -67,7 +67,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built

 ### Running documentation locally

-1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.3.x).
+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.4.x).
  - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.

--- a/_config.yml
+++ b/_config.yml
@@ -13,28 +13,26 @@ source:           docs
 destination:      _gh_pages
 host:             0.0.0.0
 port:             9001
-baseurl:          /
 url:              http://getbootstrap.com
 encoding:         UTF-8
 exclude:          [assets/less/, assets/js/src/]

 # Custom vars
-current_version:  3.2.0
+current_version:  3.3.0
 repo:             https://github.com/twbs/bootstrap
 sass_repo:        https://github.com/twbs/bootstrap-sass

 download:
-  source:         https://github.com/twbs/bootstrap/archive/v3.2.0.zip
-  dist:           https://github.com/twbs/bootstrap/releases/download/v3.2.0/bootstrap-3.2.0-dist.zip
-  sass:           https://github.com/twbs/bootstrap-sass/archive/v3.2.0.tar.gz
+  source:         https://github.com/twbs/bootstrap/archive/v3.3.0.zip
+  dist:           https://github.com/twbs/bootstrap/releases/download/v3.3.0/bootstrap-3.3.0-dist.zip
+  sass:           https://github.com/twbs/bootstrap-sass/archive/v3.3.0.tar.gz

 blog:             http://blog.getbootstrap.com
 expo:             http://expo.getbootstrap.com

 cdn:
-  css:            https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css
-  css_theme:      https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css
-  js:             https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js
+  css:            https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css
+  js:             https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js
  jquery:         //code.jquery.com/jquery-2.1.1.min.js

 bug:

--- a/bower.json
+++ b/bower.json
 {
  "name": "bootstrap",
  "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-  "version": "3.2.0",
+  "version": "3.3.0",
  "keywords": [
    "css",
    "js",

--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
  "license": "MIT",
  "extra": {
    "branch-alias": {
-      "dev-master": "3.2.x-dev"
+      "dev-master": "3.3.x-dev"
    }
  },
  "replace": {

--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/dist/js/npm.js
+++ b/dist/js/npm.js
-// This file is generated. You can require() it in a CommonJS environment.
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
 require('../../js/transition.js')
 require('../../js/alert.js')
 require('../../js/button.js')

--- a/docs/_data/browser-bugs.yml
+++ b/docs/_data/browser-bugs.yml
+-
+  browser: >
+    Internet Explorer 11
+  summary: >
+    Hovered element still remains in `:hover` state after scrolling away.
+  upstream_bug: >
+    IE#926665
+  origin: >
+    Bootstrap#14211
+
+-
+  browser: >
+    Internet Explorer 11
+  summary: >
+    When hovering over a `<select>` menu item, the cursor for the element underneath the menu is displayed.
+  upstream_bug: >
+    IE#963961
+  origin: >
+    Bootstrap#14528
+
+-
+  browser: >
+    Firefox
+  summary: >
+    `.table-bordered` with an empty `<tbody>` is missing borders.
+  upstream_bug: >
+    Mozilla#1023761
+  origin: >
+    Bootstrap#13453
+
+-
+  browser: >
+    Firefox
+  summary: >
+    `max-width: 100%;` doesn't work inside tables.
+  upstream_bug: >
+    Mozilla#975632
+  origin: >
+    Bootstrap#10690
+
+-
+  browser: >
+    Firefox (Windows)
+  summary: >
+    Java applets that are descendants of elements with forced hardware acceleration using `translate3d(0,0,0)` are invisible.
+  upstream_bug: >
+    Mozilla#1048279
+  origin: >
+    Bootstrap#14124
+
+-
+  browser: >
+    Firefox
+  summary: >
+    Button elements with `width: 100%` become cropped in long tables.
+  upstream_bug: >
+    Mozilla#1060131
+  origin: >
+    Bootstrap#14320
+
+-
+  browser: >
+    Firefox
+  summary: >
+    If the disabled state of a form control is changed via JavaScript, the normal state doesn't return after refreshing the page.
+  upstream_bug: >
+    Mozilla#654072
+  origin: >
+    Bootstrap#793
+
+-
+  browser: >
+    Chrome (OS X)
+  summary: >
+    Clicking above `<input type="number">` increment button flashes the decrement button.
+  upstream_bug: >
+    Chromium#419108
+  origin: >
+    Offshoot of Bootstrap#8350 & Chromium#337668
+
+-
+  browser: >
+    Chrome
+  summary: >
+    `display: table;` within `display: block;` forces sibling content to new line.
+  upstream_bug: >
+    Chromium#309483
+  origin: >
+    Bootstrap#9950
+
+-
+  browser: >
+    Chrome
+  summary: >
+    Incorrect viewport size used for media queries when printing.
+  upstream_bug: >
+    Chromium#273306
+  origin: >
+    Bootstrap#12078
+
+-
+  browser: >
+    Safari (OS X)
+  summary: >
+    Scrollbar clipped in `select[multiple]` with padding.
+  upstream_bug: >
+    WebKit#128489
+  origin: >
+    Bootstrap#12536
+
+-
+  browser: >
+    Chrome
+  summary: >
+    `display: table-cell; width: 100%;` doesn't work correctly on `<input type="date">`.
+  upstream_bug: >
+    Chromium#346051
+  origin: >
+    Bootstrap#12548
+
+-
+  browser: >
+    Chrome
+  summary: >
+    `<input type="password">` sporadically causes bad widths on floated elements.
+  upstream_bug: >
+    Chromium#377346
+  origin: >
+    Bootstrap#13892
+
+-
+  browser: >
+    Chrome
+  summary: >
+    CSS infinite linear animation with alpha transparency leaks memory.
+  upstream_bug: >
+    Chromium#429375
+  origin: >
+    Bootstrap#14409
+
+-
+  browser: >
+    Safari (OS X)
+  summary: >
+    Weird button behavior with some `<input type="number">` elements.
+  upstream_bug: >
+    WebKit#137269
+  origin: >
+    Bootstrap#8350,
+    Normalize#283,
+    Chromium#337668
+
+-
+  browser: >
+    Safari (OS X)
+  summary: >
+    `display: table-cell;` within media query renders incorrectly when resizing the window.
+  upstream_bug: >
+    WebKit#138167
+  origin: >
+    Bootstrap#9774
+
+-
+  browser: >
+    Safari (iOS)
+  summary: >
+    `transform: translate3d(0,0,0);` rendering bug.
+  upstream_bug: >
+    WebKit#138162, Safari#18804973
+  origin: >
+    Bootstrap#14603
+
+-
+  browser: >
+    Safari (OS X)
+  summary: >
+    Small font size when printing webpage with fixed-width `.container`.
+  upstream_bug: >
+    WebKit#138192
+  origin: >
+    Bootstrap#14868
+
+-
+  browser: >
+    Safari (iOS)
+  summary: >
+    Text input's cursor doesn't move while scrolling the page.
+  upstream_bug: >
+    WebKit#138201, Safari#18819624
+  origin: >
+    Bootstrap#14708
+
+-
+  browser: >
+    Chrome (Windows & Linux)
+  summary: >
+    Body content can be scrolled even though `overflow: hidden;` is applied to it.
+  upstream_bug: >
+    Chromium#429604
+  origin: >
+    Bootstrap#14972
\ No newline at end of file
--- a/docs/_data/showcase.yml
+++ b/docs/_data/showcase.yml
- name: Red Antler
-  url: http://www.redantler.com/
-  expo_url: http://expo.getbootstrap.com/2014/02/24/redantler/
-  img: redantler
+- name: Lyft
+  url: https://www.lyft.com
+  expo_url: http://expo.getbootstrap.com/2014/10/29/lyft/
+  img: lyft
+
+- name: Vogue
+  url: http://www.vogue.com
+  expo_url: http://expo.getbootstrap.com/2014/09/30/vogue/
+  img: vogue

 - name: Riot Design
  url: http://riotdesign.eu/en/
@@ -12,8 +17,3 @@
  url: http://www.newsweek.com/
  expo_url: http://expo.getbootstrap.com/2014/02/12/newsweek/
  img: newsweek
-
- name: Robinhood
-  url: https://www.robinhood.com
-  expo_url: http://expo.getbootstrap.com/2014/02/26/robinhood/
-  img: robinhood
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -33,21 +33,31 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-{% if jekyll.environment == "development" %}
-<script src="{{ site.baseurl }}dist/js/bootstrap.min.js"></script>
+{% if site.github %}
+  <script src="../dist/js/bootstrap.min.js"></script>
 {% else %}
-<script src="{{ site.baseurl }}dist/js/bootstrap.js"></script>
+  <script src="../dist/js/bootstrap.js"></script>
 {% endif %}
-{% if jekyll.environment == "development" %}
-<script src="{{ site.baseurl }}assets/js/docs.min.js"></script>
+
+{% if site.github %}
+  <script src="../assets/js/docs.min.js"></script>
 {% else %}
-<script src="{{ site.baseurl }}assets/js/vendor/holder.js"></script>
-<script src="{{ site.baseurl }}assets/js/vendor/ZeroClipboard.min.js"></script>
-<script src="{{ site.baseurl }}assets/js/src/application.js"></script>
+  {% for file in site.data.configBridge.paths.docsJs %}
+  <script src="{{ file }}"></script>
+  {% endfor %}
 {% endif %}
+
 {% if page.slug == "customize" %}
-<script src="{{ site.baseurl }}assets/js/customize.min.js"></script>
+  <script>var __configBridge = {{ site.data.configBridge.config | jsonify }}</script>
+  {% if site.github %}
+    <script src="../assets/js/customize.min.js"></script>
+  {% else %}
+    {% for file in site.data.configBridge.paths.customizerJs %}
+      <script src="{{ file }}"></script>
+    {% endfor %}
+  {% endif %}
 {% endif %}
+
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>


--- a/docs/_includes/getting-started/tools.html
+++ b/docs/_includes/getting-started/tools.html
@@ -2,5 +2,5 @@
  <h1 id="tools" class="page-header">Tools</h1>

  <h2 id="tools-bootlint">Bootlint</h2>
-  <p><strong><a href="https://github.com/twbs/bootlint">Bootlint</a></strong> is an official Bootstrap HTML <a href="http://en.wikipedia.org/wiki/Lint_(software)">linter</a> tool. It automatically checks for several common HTML mistakes in webpages that are using Bootstrap in a fairly "vanilla" way. Vanilla Bootstrap's components/widgets require their parts of the DOM to conform to certain structures. Bootlint checks that instances of Bootstrap components have correctly-structured HTML. Consider adding Bootlint to your Bootstrap web development toolchain so that none of the common mistakes slow down your project's development.</p>
+  <p><strong><a href="https://github.com/twbs/bootlint">Bootlint</a></strong> is the official Bootstrap HTML <a href="http://en.wikipedia.org/wiki/Lint_(software)">linter</a> tool. It automatically checks for several common HTML mistakes in webpages that are using Bootstrap in a fairly "vanilla" way. Vanilla Bootstrap's components/widgets require their parts of the DOM to conform to certain structures. Bootlint checks that instances of Bootstrap components have correctly-structured HTML. Consider adding Bootlint to your Bootstrap web development toolchain so that none of the common mistakes slow down your project's development.</p>
 </div>
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -6,7 +6,7 @@
 <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">

 <title>
-  {% if page.url == site.baseurl %}
+  {% if page.layout == "home" %}
    {{ page.title }}
  {% else %}
    {{ page.title }} &middot; Bootstrap

--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
--- a/docs/_jade/customizer-variables.jade
+++ b/docs/_jade/customizer-variables.jade
@@ -8,8 +8,10 @@ each section in sections
      if subsection.heading
        h3(id=subsection.id)= subsection.heading
      div.row
-        each variable in subsection.variables
-          div.bs-customizer-input
+        each variable, index in subsection.variables
+          if index > 0 && index % 3 === 0
+            div.clearfix
+          div.col-xs-4
            label(for="input-" + variable.name)= variable.name
            input.form-control(
              id="input-" + variable.name

--- a/docs/_plugins/bridge.rb
+++ b/docs/_plugins/bridge.rb
+require 'yaml'
+
+module Bridge
+  class Generator < Jekyll::Generator
+    def generate(site)
+      site.data["configBridge"] = YAML.load_file("./grunt/configBridge.json")
+    end
+  end
+end
\ No newline at end of file
--- a/docs/_plugins/bugify.rb
+++ b/docs/_plugins/bugify.rb
+module Jekyll
+  module BugFilter
+    def bugify(input)
+      upstream_map = {
+        "Bootstrap" => "https://github.com/twbs/bootstrap/issues/",
+        "IE" => ["https://connect.microsoft.com/IE/feedback/details/", "IE bug"],
+        "Mozilla" => ["https://bugzilla.mozilla.org/show_bug.cgi?id=", "Mozilla bug"],
+        "Chromium" => ["https://code.google.com/p/chromium/issues/detail?id=", "Chromium issue"],
+        "WebKit" => ["https://bugs.webkit.org/show_bug.cgi?id=", "WebKit bug"],
+        "Safari" => ["https://openradar.appspot.com/", "Apple Safari Radar"],
+        "Normalize" => ["https://github.com/necolas/normalize.css/issues/", "Normalize"]
+      }
+
+      upstream_map.each do |key, data|
+        url = data.is_a?(Array) ? data[0] : data
+        label = data.is_a?(Array) ? "#{data[1]} " : ""
+        input = input.gsub(/#{key}#(\d+)/, "<a href=\"#{url}\\1\">#{label}#\\1</a>")
+      end
+
+      return input
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::BugFilter)
\ No newline at end of file
--- a/docs/assets/css/src/docs.css
+++ b/docs/assets/css/src/docs.css
--- a/docs/assets/js/src/application.js
+++ b/docs/assets/js/src/application.js
@@ -85,6 +85,17 @@
      }, 3000)
    })

+    // Modal relatedTarget demo
+    $('#exampleModal').on('show.bs.modal', function (event) {
+      var button = $(event.relatedTarget) // Button that triggered the modal
+      var recipient = button.data('whatever') // Extract info from data-* attributes
+      // If necessary, you could initiate an AJAX request here (and then do the updating in a callback).
+      // Update the modal's content. We'll use jQuery here, but you could use a data binding library or other methods instead.
+      var modal = $(this)
+      modal.find('.modal-title').text('New message to ' + recipient)
+      modal.find('.modal-body input').val(recipient)
+    })
+
    // Activate animated progress bar
    $('.bs-docs-activate-animated-progressbar').on('click', function () {
      $(this).prev('.progress-striped').toggleClass('progress-animated')

--- a/docs/assets/js/src/customizer.js
+++ b/docs/assets/js/src/customizer.js
@@ -6,13 +6,13 @@
 * details, see http://creativecommons.org/licenses/by/3.0/.
 */

-/* global JSZip, less, saveAs, UglifyJS, __js, __less, __fonts */
+/* global JSZip, less, autoprefixer, saveAs, UglifyJS, __configBridge, __js, __less, __fonts */

 window.onload = function () { // wait for load in a dumb way because B-0
  'use strict';
  var cw = '/*!\n' +
-           ' * Bootstrap v3.2.0 (http://getbootstrap.com)\n' +
-           ' * Copyright 2011-2014 Twitter, Inc.\n' +
+           ' * Bootstrap v3.3.0 (http://getbootstrap.com)\n' +
+           ' * Copyright 2011-' + new Date().getFullYear() + ' Twitter, Inc.\n' +
           ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
           ' */\n\n'

@@ -251,6 +251,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
  }

  function compileLESS(lessSource, baseFilename, intoResult) {
+    var promise = $.Deferred()
    var parser = new less.Parser({
      paths: ['variables.less', 'mixins.less'],
      optimization: 0,
@@ -259,14 +260,18 @@ window.onload = function () { // wait for load in a dumb way because B-0

    parser.parse(lessSource, function (err, tree) {
      if (err) {
-        return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
+        return promise.reject(err)
      }
      intoResult[baseFilename + '.css']     = cw + tree.toCSS()
      intoResult[baseFilename + '.min.css'] = cw + tree.toCSS({ compress: true })
+      promise.resolve()
    })
+
+    return promise.promise()
  }

  function generateCSS(preamble) {
+    var promise = $.Deferred()
    var oneChecked = false
    var lessFileIncludes = {}
    $('#less-section input').each(function () {
@@ -290,14 +295,22 @@ window.onload = function () { // wait for load in a dumb way because B-0
    var bsLessSource    = preamble + generateLESS('bootstrap.less', lessFileIncludes, vars)
    var themeLessSource = preamble + generateLESS('theme.less',     lessFileIncludes, vars)

-    try {
-      compileLESS(bsLessSource, 'bootstrap', result)
+    var prefixer = autoprefixer({ browsers: __configBridge.autoprefixerBrowsers })
+
+    $.when(
+      compileLESS(bsLessSource, 'bootstrap', result),
      compileLESS(themeLessSource, 'bootstrap-theme', result)
-    } catch (err) {
-      return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
-    }
+    ).done(function () {
+      for (var key in result) {
+        result[key] = prefixer.process(result[key]).css
+      }
+      promise.resolve(result)
+    }).fail(function (err) {
+      showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
+      promise.reject()
+    })

-    return result
+    return promise.promise()
  }

  function uglify(js) {
@@ -319,19 +332,8 @@ window.onload = function () { // wait for load in a dumb way because B-0

  function generateJS(preamble) {
    var $checked = $('#plugin-section input:checked')
-    var jqueryCheck = [
-      'if (typeof jQuery === \'undefined\') {',
-      '  throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\')',
-      '}\n'
-    ].join('\n')
-    var jqueryVersionCheck = [
-      '+function ($) {',
-      '  var version = $.fn.jquery.split(\' \')[0].split(\'.\')',
-      '  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {',
-      '    throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 1.9.1 or higher\')',
-      '  }',
-      '}(jQuery);\n\n'
-    ].join('\n')
+    var jqueryCheck = __configBridge.jqueryCheck.join('\n')
+    var jqueryVersionCheck = __configBridge.jqueryVersionCheck.join('\n')

    if (!$checked.length) return false

@@ -359,20 +361,15 @@ window.onload = function () { // wait for load in a dumb way because B-0

    var file = (e.originalEvent.hasOwnProperty('dataTransfer')) ? e.originalEvent.dataTransfer.files[0] : e.originalEvent.target.files[0]

-    if (!file.type.match('application/json')) {
-      return showAlert('danger', '<strong>Ruh roh.</strong> We can only read <code>.json</code> files. Please try again.', importDropTarget)
-    }
-
    var reader = new FileReader()

-    reader.onload = (function () {
-      return function (e) {
+    reader.onload = function (e) {
      var text = e.target.result

      try {
        var json = JSON.parse(text)

-          if (typeof json != 'object') {
+        if (!$.isPlainObject(json)) {
          throw new Error('JSON data from config file is not an object.')
        }

@@ -382,9 +379,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
        return showAlert('danger', '<strong>Shucks.</strong> We can only read valid <code>.json</code> files. Please try again.', importDropTarget)
      }
    }
-    })(file)

-    reader.readAsText(file)
+    reader.readAsText(file, 'utf-8')
  }

  function handleConfigDragOver(e) {
@@ -401,7 +397,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
      .on('drop', handleConfigFileSelect)
  }

-  $('#import-file-select').on('select', handleConfigFileSelect)
+  $('#import-file-select').on('change', handleConfigFileSelect)
  $('#import-manual-trigger').on('click', removeImportAlerts)

  var inputsComponent = $('#less-section input')
@@ -464,9 +460,15 @@ window.onload = function () { // wait for load in a dumb way because B-0
        ' * Config saved to config.json and ' + gistUrl + '\n' +
        ' */\n'

-      generateZip(generateCSS(preamble), generateJS(preamble), generateFonts(), configJson, function (blob) {
+      $.when(
+        generateCSS(preamble),
+        generateJS(preamble),
+        generateFonts()
+      ).done(function (css, js, fonts) {
+        generateZip(css, js, fonts, configJson, function (blob) {
          $compileBtn.removeAttr('disabled')
-        saveAs(blob, 'bootstrap.zip')
+          setTimeout(function () { saveAs(blob, 'bootstrap.zip') }, 0)
+        })
      })
    })
  });

--- a/docs/assets/js/vendor/autoprefixer.js
+++ b/docs/assets/js/vendor/autoprefixer.js
--- a/docs/assets/less/docs.less
+++ b/docs/assets/less/docs.less
@@ -840,6 +840,19 @@ body {
 }


+// Wall of Browser Bugs
+//
+// Better display for the responsive table on the Wall of Browser Bugs.
+
+.bs-docs-browser-bugs {
+  td p {
+    margin-bottom: 0;
+  }
+  th:first-child {
+    width: 18%;
+  }
+}
+
 //
 // Grid examples
 //
@@ -1232,13 +1245,6 @@ body {
  font-weight: normal;
 }

-.bs-customizer-input {
-  float: left;
-  width: 33.333333%;
-  padding-right: 1rem;
-  padding-left: 1rem;
-}
-
 // Downloads
 .bs-customize-download .btn-outline {
  padding: 20px;

--- a/docs/browser-bugs.md
+++ b/docs/browser-bugs.md
@@ -8,7 +8,7 @@ Bootstrap currently works around several outstanding browser bugs in major brows
 We publicly list browser bugs that are impacting us here, in the hopes of expediting the process of fixing them. For information on Bootstrap's browser compatibility, [see our browser compatibility docs](../getting-started/#support).

 <div class="table-responsive">
-  <table class="table table-bordered table-hover">
+  <table class="bs-docs-browser-bugs table table-bordered table-hover">
    <thead>
      <tr>
        <th>Browser(s)</th>
@@ -18,96 +18,14 @@ We publicly list browser bugs that are impacting us here, in the hopes of expedi
      </tr>
    </thead>
    <tbody>
+      {% for bug in site.data.browser-bugs %}
      <tr>
-        <td>Internet Explorer 11</td>
-        <td>Hovered element still remains in <code>:hover</code> state after scrolling away</td>
-        <td><a href="https://connect.microsoft.com/IE/feedback/details/926665/ie-11-hovering-over-an-element-and-then-scrolling-without-moving-the-mouse-pointer-leaves-the-element-in-hover-state">IE bug #926665</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/14211">#14211</a></td>
-      </tr>
-      <tr>
-        <td>Internet Explorer 11</td>
-        <td>When hovering over a <code>&lt;select&gt;</code> menu item, the cursor for the element underneath the menu is displayed</td>
-        <td><a href="https://connect.microsoft.com/IE/feedbackdetail/view/963961">IE bug #963961</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/14528">#14528</a></td>
-      </tr>
-      <tr>
-        <td>Firefox</td>
-        <td><code>.table-bordered</code> with an empty <code>&lt;tbody&gt;</code> is missing borders</td>
-        <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1023761">Mozilla bug #1023761</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/13453">#13453</a></td>
-      </tr>
-      <tr>
-        <td>Firefox</td>
-        <td><code>max-width: 100%;</code> doesn't work inside tables</td>
-        <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=975632">Mozilla bug #975632</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/10690">#10690</a></td>
-      </tr>
-      <tr>
-        <td>Firefox</td>
-        <td>Java applets that are descendants of elements with forced hardware acceleration using <code>translate3d(0,0,0)</code> are invisible on Windows</td>
-        <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1048279">Mozilla bug #1048279</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/14124">#14124</a></td>
-      </tr>
-      <tr>
-        <td>Firefox</td>
-        <td>Button elements with <code>width: 100%</code> become cropped in long tables.</td>
-        <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1060131">Mozilla bug #1060131</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/14320">#14320</a></td>
-      </tr>
-      <tr>
-        <td>Firefox</td>
-        <td>If the disabled state of a form control is changed via JavaScript, the normal state doesn't return after refreshing the page.</td>
-        <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=654072">Mozilla bug #654072</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/793">#793</a></td>
-      </tr>
-      <tr>
-        <td>Chrome</td>
-        <td>Clicking above <code>&lt;input type="number"&gt;</code> increment button flashes the decrement button</td>
-        <td><a href="https://code.google.com/p/chromium/issues/detail?id=419108"></a></td>
-        <td>Offshoot of <a href="https://github.com/twbs/bootstrap/issues/8350">#8350</a> &amp; <a href="https://code.google.com/p/chromium/issues/detail?id=337668">Chromium issue #337668</a></td>
-      </tr>
-      <tr>
-        <td>Chrome</td>
-        <td><code>display: table;</code> within <code>display: block;</code> forces sibling content to new line</td>
-        <td><a href="https://code.google.com/p/chromium/issues/detail?id=309483">Chromium issue #309483</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/9950">#9950</a></td>
-      </tr>
-      <tr>
-        <td>Chrome</td>
-        <td>Incorrect viewport size used for media queries when printing</td>
-        <td><a href="https://code.google.com/p/chromium/issues/detail?id=273306">Chromium issue #273306</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/12078">#12078</a></td>
-      </tr>
-      <tr>
-        <td>Chrome &amp; Safari</td>
-        <td>OS X scrollbar clipped in <code>select[multiple]</code> with padding</td>
-        <td><a href="https://code.google.com/p/chromium/issues/detail?id=342208">Chromium issue #342208</a>, <a href="https://bugs.webkit.org/show_bug.cgi?id=128489">WebKit bug #128489</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/12536">#12536</a></td>
-      </tr>
-      <tr>
-        <td>Chrome</td>
-        <td><code>display: table-cell; width: 100%;</code> doesn't work correctly on date <code>&lt;input&gt;</code></td>
-        <td><a href="https://code.google.com/p/chromium/issues/detail?id=346051">Chromium issue #346051</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/12548">#12548</a></td>
-      </tr>
-      <tr>
-        <td>Chrome</td>
-        <td><code>&lt;input type="password"&gt;</code> sporadically causes bad widths on floated elements</td>
-        <td><a href="https://code.google.com/p/chromium/issues/detail?id=377346">Chrome issue #377346</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/13892">#13892</a></td>
-      </tr>
-      <tr>
-        <td>Safari</td>
-        <td>Weird button behavior with some number <code>&lt;input&gt;</code>s</td>
-        <td><a href="https://bugs.webkit.org/show_bug.cgi?id=137269">WebKit bug #137269</a></td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/8350">#8350</a>, <a href="https://github.com/necolas/normalize.css/issues/283">Normalize #283</a>, <a href="https://code.google.com/p/chromium/issues/detail?id=337668">Chromium issue #337668</a></td>
-      </tr>
-      <tr>
-        <td>Safari</td>
-        <td>Justified nav rendering bug</td>
-        <td>(No public bug tracker)</td>
-        <td><a href="https://github.com/twbs/bootstrap/issues/9774">#9774</a></td>
+        <td>{{ bug.browser }}</td>
+        <td>{{ bug.summary | markdownify | bugify }}</td>
+        <td>{{ bug.upstream_bug | bugify }}</td>
+        <td>{{ bug.origin | bugify }}</td>
      </tr>
+      {% endfor %}
    </tbody>
  </table>
 </div>
--- a/docs/components/button-group.md
+++ b/docs/components/button-group.md
@@ -178,16 +178,16 @@ Just wrap a series of `.btn`s in `.btn-group.btn-group-justified`.

 <div class="bs-example">
  <div class="btn-group btn-group-justified">
-    <a class="btn btn-secondary" role="button">Left</a>
-    <a class="btn btn-secondary" role="button">Middle</a>
-    <a class="btn btn-secondary" role="button">Right</a>
+    <a class="btn btn-secondary" href="#" role="button">Left</a>
+    <a class="btn btn-secondary" href="#" role="button">Middle</a>
+    <a class="btn btn-secondary" href="#" role="button">Right</a>
  </div>
  <br>
  <div class="btn-group btn-group-justified">
-    <a class="btn btn-secondary" role="button">Left</a>
-    <a class="btn btn-secondary" role="button">Middle</a>
+    <a class="btn btn-secondary" href="#" role="button">Left</a>
+    <a class="btn btn-secondary" href="#" role="button">Middle</a>
    <div class="btn-group">
-      <a class="btn btn-secondary dropdown-toggle" data-toggle="dropdown">
+      <a class="btn btn-secondary dropdown-toggle" href="#" data-toggle="dropdown">
        Dropdown
      </a>
      <ul class="dropdown-menu" role="menu">

--- a/docs/components/jumbotron.md
+++ b/docs/components/jumbotron.md
@@ -9,7 +9,7 @@ A lightweight, flexible component that can optionally extend the entire viewport
 <div class="jumbotron">
  <h1 class="jumbotron-heading">Hello, world!</h1>
  <p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
-  <p class="lead"><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
+  <p class="lead"><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
 </div>
 {% endexample %}

@@ -30,6 +30,6 @@ Jumbotrons also come with an adaptive `hr`—just add `.jumbotron-hr` to the ele
  <h1 class="jumbotron-heading">Jumbotron <code>hr</code></h1>
  <p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
  <hr class="jumbotron-hr">
-  <p class="lead"><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
+  <p class="lead"><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
 </div>
 {% endexample %}
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
--- a/docs/dist/js/bootstrap.min.js
+++ b/docs/dist/js/bootstrap.min.js
--- a/docs/dist/js/npm.js
+++ b/docs/dist/js/npm.js
-// This file is generated. You can require() it in a CommonJS environment.
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
 require('../../js/transition.js')
 require('../../js/alert.js')
 require('../../js/button.js')

--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@@ -149,12 +149,12 @@

    </div><!-- /.container -->

-    <div class="blog-footer">
+    <footer class="blog-footer">
      <p>Blog template built for <a href="http://getbootstrap.com">Bootstrap</a> by <a href="https://twitter.com/mdo">@mdo</a>.</p>
      <p>
        <a href="#">Back to top</a>
      </p>
-    </div>
+    </footer>


    <!-- Bootstrap core JavaScript

--- a/docs/examples/jumbotron-narrow/index.html
+++ b/docs/examples/jumbotron-narrow/index.html
@@ -62,9 +62,9 @@
        </div>
      </div>

-      <div class="footer">
+      <footer class="footer">
        <p>&copy; Company 2014</p>
-      </div>
+      </footer>

    </div> <!-- /container -->


--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -52,7 +52,7 @@
      <div class="container">
        <h1>Hello, world!</h1>
        <p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-        <p><a class="btn btn-primary btn-lg" role="button">Learn more &raquo;</a></p>
+        <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more &raquo;</a></p>
      </div>
    </div>


--- a/docs/examples/justified-nav/index.html
+++ b/docs/examples/justified-nav/index.html
@@ -47,7 +47,7 @@
      <div class="row">
        <div class="col-lg-4">
          <h2>Safari bug warning!</h2>
-          <p class="text-danger">As of v7.0.1, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing.</p>
+          <p class="text-danger">As of v8.0, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing.</p>
          <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
          <p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
        </div>
@@ -64,9 +64,9 @@
      </div>

      <!-- Site footer -->
-      <div class="footer">
+      <footer class="footer">
        <p>&copy; Company 2014</p>
-      </div>
+      </footer>

    </div> <!-- /container -->


--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -65,11 +65,11 @@
      <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
    </div>

-    <div class="footer">
+    <footer class="footer">
      <div class="container">
        <p class="text-muted">Place sticky footer content here.</p>
      </div>
-    </div>
+    </footer>


    <!-- Bootstrap core JavaScript

--- a/docs/examples/sticky-footer/index.html
+++ b/docs/examples/sticky-footer/index.html
@@ -31,11 +31,11 @@
      <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
    </div>

-    <div class="footer">
+    <footer class="footer">
      <div class="container">
        <p class="text-muted">Place sticky footer content here.</p>
      </div>
-    </div>
+    </footer>


    <!-- Bootstrap core JavaScript

--- a/docs/getting-started/support.md
+++ b/docs/getting-started/support.md
@@ -184,13 +184,21 @@ The `.dropdown-backdrop` element isn't used on iOS in the nav because of the com

 Page zooming inevitably presents rendering artifacts in some components, both in Bootstrap and the rest of the web. Depending on the issue, we may be able to fix it (search first and then open an issue if need be). However, we tend to ignore these as they often have no direct solution other than hacky workarounds.

-### Printer viewports
+### Printing

-Even in some modern browsers, printing can be quirky. In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. <a href="https://github.com/twbs/bootstrap/issues/12078">See #12078 for some details.</a> Suggested workarounds:
+Even in some modern browsers, printing can be quirky.

- Embrace the extra-small grid and make sure your page looks acceptable under it.
- Customize the values of the `@screen-*` Less variables so that your printer paper is considered larger than extra-small.
- Add custom media queries to change the grid size breakpoints for print media only.
+In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. [See #12078 for some details.](https://github.com/twbs/bootstrap/issues/12078) Suggested workarounds:
+
+Also, as of Safari v8.0, fixed-width <code>.container</code>s can cause Safari to use an unusually small font size when printing. See <a href="https://github.com/twbs/bootstrap/issues/14868">#14868</a> for more details. One potential workaround for this is adding the following CSS:</p>
+
+{% highlight css %}
+@media print {
+  .container {
+    width: auto;
+  }
+}
+{% endhighlight %}

 ### Android stock browser


--- a/docs/javascript/dropdowns.md
+++ b/docs/javascript/dropdowns.md
--- a/docs/javascript/modal.md
+++ b/docs/javascript/modal.md
@@ -224,6 +224,88 @@ For modals that simply appear rather than fade in to view, remove the `.fade` cl
 </div>
 {% endhighlight %}

+## Varying modal content based on trigger button
+
+Have a bunch of buttons that all trigger the same modal, just with slightly different contents? Use `event.relatedTarget` and [HTML `data-*` attributes](https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_data_attributes) (possibly [via jQuery](http://api.jquery.com/data/)) to vary the contents of the modal depending on which button was clicked. See the Modal Events docs for details on `relatedTarget`.
+
+<div class="bs-example" style="padding-bottom: 24px;">
+  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@mdo">Open modal for @mdo</button>
+  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@fat">Open modal for @fat</button>
+  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@twbootstrap">Open modal for @twbootstrap</button>
+
+  <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+          <h4 class="modal-title" id="exampleModalLabel">New message</h4>
+        </div>
+        <div class="modal-body">
+          <form role="form">
+            <div class="form-group">
+              <label for="recipient-name" class="control-label">Recipient:</label>
+              <input type="text" class="form-control" id="recipient-name">
+            </div>
+            <div class="form-group">
+              <label for="message-text" class="control-label">Message:</label>
+              <textarea class="form-control" id="message-text"></textarea>
+            </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          <button type="button" class="btn btn-primary">Send message</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% highlight html %}
+<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@mdo">Open modal for @mdo</button>
+<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@fat">Open modal for @fat</button>
+<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal" data-whatever="@twbootstrap">Open modal for @twbootstrap</button>
+
+<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+        <h4 class="modal-title" id="exampleModalLabel">New message</h4>
+      </div>
+      <div class="modal-body">
+        <form role="form">
+          <div class="form-group">
+            <label for="recipient-name" class="control-label">Recipient:</label>
+            <input type="text" class="form-control" id="recipient-name">
+          </div>
+          <div class="form-group">
+            <label for="message-text" class="control-label">Message:</label>
+            <textarea class="form-control" id="message-text"></textarea>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary">Send message</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endhighlight %}
+
+{% highlight js %}
+$('#exampleModal').on('show.bs.modal', function (event) {
+  var button = $(event.relatedTarget) // Button that triggered the modal
+  var recipient = button.data('whatever') // Extract info from data-* attributes
+  // If necessary, you could initiate an AJAX request here (and then do the updating in a callback).
+  // Update the modal's content. We'll use jQuery here, but you could use a data binding library or other methods instead.
+  var modal = $(this)
+  modal.find('.modal-title').text('New message to ' + recipient)
+  modal.find('.modal-body input').val(recipient)
+})
+{% endhighlight %}
+
 ## Usage

 The modal plugin toggles your hidden content on demand, via data attributes or JavaScript. It also adds `.modal-open` to the `<body>` to override default scrolling behavior and generates a `.modal-backdrop` to provide a click area for dismissing shown modals when clicking outside the modal.

--- a/docs/javascript/popovers.md
+++ b/docs/javascript/popovers.md
@@ -14,6 +14,12 @@ Popovers whose both title and content are zero-length are never displayed.
 <div class="bs-callout bs-callout-danger">
  <h4>Opt-in functionality</h4>
  <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p>
+  <p>One way to initialize all popovers on a page would be to select them by their <code>data-toggle</code> attribute:</p>
+{% highlight js %}
+$(function () {
+  $('[data-toggle="popover"]').popover()
+})
+{% endhighlight %}
 </div>
 <div class="bs-callout bs-callout-warning">
  <h4>Popovers in button groups and input groups require special setting</h4>

--- a/docs/javascript/tooltips.md
+++ b/docs/javascript/tooltips.md
@@ -78,6 +78,12 @@ Hover over the buttons below to see their tooltips.
 <div class="bs-callout bs-callout-danger">
  <h4>Opt-in functionality</h4>
  <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p>
+  <p>One way to initialize all tooltips on a page would be to select them by their <code>data-toggle</code> attribute:</p>
+{% highlight js %}
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})
+{% endhighlight %}
 </div>
 <div class="bs-callout bs-callout-warning">
  <h4>Tooltips in button groups and input groups require special setting</h4>

--- a/docs/layout/media.md
+++ b/docs/layout/media.md
@@ -11,7 +11,7 @@ The default media allow to float a media object (images, video, audio) to the le

 {% example html %}
 <div class="media">
-  <a class="pull-left" href="#">
+  <a class="media-left" href="#">
    <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
  </a>
  <div class="media-body">
@@ -21,20 +21,20 @@ The default media allow to float a media object (images, video, audio) to the le
 </div>
 {% endexample %}

-### Nested media
+### Nesting

 Media components can also be nested.

 {% example html %}
 <div class="media">
-  <a class="pull-left" href="#">
+  <a class="media-left" href="#">
    <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
  </a>
  <div class="media-body">
    <h4 class="media-heading">Media heading</h4>
    Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
    <div class="media">
-      <a class="pull-left" href="#">
+      <a class="media-left" href="#">
        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
      </a>
      <div class="media-body">
@@ -46,7 +46,7 @@ Media components can also be nested.
 </div>
 {% endexample %}

-### Media alignment
+### Alignment

 The images or other media can be aligned top, middle, or bottom. The default is top aligned.

@@ -96,7 +96,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
 {% example html %}
 <ul class="media-list">
  <li class="media">
-    <a class="pull-left" href="#">
+    <a class="media-left" href="#">
      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
    </a>
    <div class="media-body">
@@ -104,7 +104,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
      <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p>
      <!-- Nested media object -->
      <div class="media">
-        <a class="pull-left" href="#">
+        <a class="media-left" href="#">
          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
        </a>
        <div class="media-body">
@@ -112,7 +112,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
          Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
          <!-- Nested media object -->
          <div class="media">
-            <a class="pull-left" href="#">
+            <a class="media-left" href="#">
              <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
            </a>
            <div class="media-body">
@@ -124,7 +124,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
      </div>
      <!-- Nested media object -->
      <div class="media">
-        <a class="pull-left" href="#">
+        <a class="media-left" href="#">
          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
        </a>
        <div class="media-body">
@@ -135,7 +135,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
    </div>
  </li>
  <li class="media">
-    <a class="pull-right" href="#">
+    <a class="media-right" href="#">
      <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
    </a>
    <div class="media-body">

--- a/grunt/bs-commonjs-generator.js
+++ b/grunt/bs-commonjs-generator.js
@@ -2,7 +2,7 @@
 var fs = require('fs');
 var path = require('path');

-var COMMONJS_BANNER = '// This file is generated. You can require() it in a CommonJS environment.\n';
+var COMMONJS_BANNER = '// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.\n';

 module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath) {
  var destDir = path.dirname(destFilepath);

--- a/grunt/bs-lessdoc-parser.js
+++ b/grunt/bs-lessdoc-parser.js
@@ -6,11 +6,13 @@
 */
 'use strict';

-var markdown = require('markdown').markdown;
+var Remarkable = require('remarkable');

 function markdown2html(markdownString) {
+  var md = new Remarkable();
+
  // the slice removes the <p>...</p> wrapper output by Markdown processor
-  return markdown.toHTML(markdownString.trim()).slice(3, -4);
+  return md.render(markdownString.trim()).slice(3, -5);
 }


@@ -33,9 +35,9 @@ Mini-language:
 var CUSTOMIZABLE_HEADING = /^[/]{2}={2}(.*)$/;
 var UNCUSTOMIZABLE_HEADING = /^[/]{2}-{2}(.*)$/;
 var SUBSECTION_HEADING = /^[/]{2}={3}(.*)$/;
-var SECTION_DOCSTRING = /^[/]{2}#{2}(.*)$/;
-var VAR_ASSIGNMENT = /^(@[a-zA-Z0-9_-]+):[ ]*([^ ;][^;]+);[ ]*$/;
-var VAR_DOCSTRING = /^[/]{2}[*]{2}(.*)$/;
+var SECTION_DOCSTRING = /^[/]{2}#{2}(.+)$/;
+var VAR_ASSIGNMENT = /^(@[a-zA-Z0-9_-]+):[ ]*([^ ;][^;]*);[ ]*$/;
+var VAR_DOCSTRING = /^[/]{2}[*]{2}(.+)$/;

 function Section(heading, customizable) {
  this.heading = heading.trim();

--- a/grunt/configBridge.json
+++ b/grunt/configBridge.json
+{
+  "paths": {
+    "customizerJs": [
+      "../assets/js/vendor/autoprefixer.js",
+      "../assets/js/vendor/less.min.js",
+      "../assets/js/vendor/jszip.min.js",
+      "../assets/js/vendor/uglify.min.js",
+      "../assets/js/vendor/Blob.js",
+      "../assets/js/vendor/FileSaver.js",
+      "../assets/js/raw-files.min.js",
+      "../assets/js/src/customizer.js"
+    ],
+    "docsJs": [
+      "../assets/js/vendor/holder.js",
+      "../assets/js/vendor/ZeroClipboard.min.js",
+      "../assets/js/src/application.js"
+    ]
+  },
+  "config": {
+    "autoprefixerBrowsers": [
+      "Android 2.3",
+      "Android >= 4",
+      "Chrome >= 20",
+      "Firefox >= 24",
+      "Explorer >= 8",
+      "iOS >= 6",
+      "Opera >= 12",
+      "Safari >= 6"
+    ],
+    "jqueryCheck": [
+      "if (typeof jQuery === 'undefined') {",
+      "  throw new Error('Bootstrap\\'s JavaScript requires jQuery')",
+      "}\n"
+    ],
+    "jqueryVersionCheck": [
+      "+function ($) {",
+      "  var version = $.fn.jquery.split(' ')[0].split('.')",
+      "  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {",
+      "    throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')",
+      "  }",
+      "}(jQuery);\n\n"
+    ]
+  }
+}
\ No newline at end of file
--- a/grunt/sauce_browsers.yml
+++ b/grunt/sauce_browsers.yml
@@ -57,7 +57,7 @@
  {
    browserName: "iphone",
    platform: "OS X 10.9",
-    version: "7.1"
+    version: "8.0"
  },

  # iOS Chrome not currently supported by Sauce Labs

--- a/js/affix.js
+++ b/js/affix.js
 /* ========================================================================
- * Bootstrap: affix.js v3.2.0
+ * Bootstrap: affix.js v3.3.0
 * http://getbootstrap.com/javascript/#affix
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -28,7 +28,7 @@
    this.checkPosition()
  }

-  Affix.VERSION  = '3.2.0'
+  Affix.VERSION  = '3.3.0'

  Affix.RESET    = 'affix affix-top affix-bottom'


--- a/js/alert.js
+++ b/js/alert.js
 /* ========================================================================
- * Bootstrap: alert.js v3.2.0
+ * Bootstrap: alert.js v3.3.0
 * http://getbootstrap.com/javascript/#alerts
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -18,7 +18,7 @@
    $(el).on('click', dismiss, this.close)
  }

-  Alert.VERSION = '3.2.0'
+  Alert.VERSION = '3.3.0'

  Alert.TRANSITION_DURATION = 150


--- a/js/button.js
+++ b/js/button.js
 /* ========================================================================
- * Bootstrap: button.js v3.2.0
+ * Bootstrap: button.js v3.3.0
 * http://getbootstrap.com/javascript/#buttons
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@
    this.isLoading = false
  }

-  Button.VERSION  = '3.2.0'
+  Button.VERSION  = '3.3.0'

  Button.DEFAULTS = {
    loadingText: 'loading...'
@@ -35,10 +35,10 @@

    if (data.resetText == null) $el.data('resetText', $el[val]())

-    $el[val](data[state] == null ? this.options[state] : data[state])
-
    // push to event loop to allow forms to submit
    setTimeout($.proxy(function () {
+      $el[val](data[state] == null ? this.options[state] : data[state])
+
      if (state == 'loadingText') {
        this.isLoading = true
        $el.addClass(d).attr(d, d)
@@ -110,7 +110,7 @@
      e.preventDefault()
    })
    .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus')
+      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
    })

 }(jQuery);
--- a/js/carousel.js
+++ b/js/carousel.js
 /* ========================================================================
- * Bootstrap: carousel.js v3.2.0
+ * Bootstrap: carousel.js v3.3.0
 * http://getbootstrap.com/javascript/#carousel
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
  }

-  Carousel.VERSION  = '3.2.0'
+  Carousel.VERSION  = '3.3.0'

  Carousel.TRANSITION_DURATION = 600

@@ -42,6 +42,7 @@
  }

  Carousel.prototype.keydown = function (e) {
+    if (/input|textarea/i.test(e.target.tagName)) return
    switch (e.which) {
      case 37: this.prev(); break
      case 39: this.next(); break
@@ -207,7 +208,7 @@
  // CAROUSEL DATA-API
  // =================

-  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+  var clickHandler = function (e) {
    var href
    var $this   = $(this)
    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
@@ -223,7 +224,11 @@
    }

    e.preventDefault()
-  })
+  }
+
+  $(document)
+    .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
+    .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)

  $(window).on('load', function () {
    $('[data-ride="carousel"]').each(function () {

--- a/js/collapse.js
+++ b/js/collapse.js
 /* ========================================================================
- * Bootstrap: collapse.js v3.2.0
+ * Bootstrap: collapse.js v3.3.0
 * http://getbootstrap.com/javascript/#collapse
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -16,18 +16,25 @@
  var Collapse = function (element, options) {
    this.$element      = $(element)
    this.options       = $.extend({}, Collapse.DEFAULTS, options)
+    this.$trigger      = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
    this.transitioning = null

-    if (this.options.parent) this.$parent = $(this.options.parent)
+    if (this.options.parent) {
+      this.$parent = this.getParent()
+    } else {
+      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
+    }
+
    if (this.options.toggle) this.toggle()
  }

-  Collapse.VERSION  = '3.2.0'
+  Collapse.VERSION  = '3.3.0'

  Collapse.TRANSITION_DURATION = 350

  Collapse.DEFAULTS = {
-    toggle: true
+    toggle: true,
+    trigger: '[data-toggle="collapse"]'
  }

  Collapse.prototype.dimension = function () {
@@ -62,6 +69,10 @@
      .addClass('collapsing')[dimension](0)
      .attr('aria-expanded', true)

+    this.$trigger
+      .removeClass('collapsed')
+      .attr('aria-expanded', true)
+
    this.transitioning = 1

    var complete = function () {
@@ -98,6 +109,10 @@
      .removeClass('collapse in')
      .attr('aria-expanded', false)

+    this.$trigger
+      .addClass('collapsed')
+      .attr('aria-expanded', false)
+
    this.transitioning = 1

    var complete = function () {
@@ -120,6 +135,33 @@
    this[this.$element.hasClass('in') ? 'hide' : 'show']()
  }

+  Collapse.prototype.getParent = function () {
+    return $(this.options.parent)
+      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
+      .each($.proxy(function (i, element) {
+        var $element = $(element)
+        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
+      }, this))
+      .end()
+  }
+
+  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
+    var isOpen = $element.hasClass('in')
+
+    $element.attr('aria-expanded', isOpen)
+    $trigger
+      .toggleClass('collapsed', !isOpen)
+      .attr('aria-expanded', isOpen)
+  }
+
+  function getTargetFromTrigger($trigger) {
+    var href
+    var target = $trigger.attr('data-target')
+      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+
+    return $(target)
+  }
+

  // COLLAPSE PLUGIN DEFINITION
  // ==========================
@@ -155,22 +197,13 @@
  // =================

  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var href
    var $this   = $(this)
-    var target  = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-    var $target = $(target)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-    var parent  = $this.attr('data-parent')
-    var $parent = parent && $(parent)

-    if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed').attr('aria-expanded', false)
-      var isCollapsed = $target.hasClass('in')
-      $this.toggleClass('collapsed', isCollapsed).attr('aria-expanded', !isCollapsed)
-    }
+    if (!$this.attr('data-target')) e.preventDefault()
+
+    var $target = getTargetFromTrigger($this)
+    var data    = $target.data('bs.collapse')
+    var option  = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })

    Plugin.call($target, option)
  })

--- a/js/dropdown.js
+++ b/js/dropdown.js
 /* ========================================================================
- * Bootstrap: dropdown.js v3.2.0
+ * Bootstrap: dropdown.js v3.3.0
 * http://getbootstrap.com/javascript/#dropdowns
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@
    $(element).on('click.bs.dropdown', this.toggle)
  }

-  Dropdown.VERSION = '3.2.0'
+  Dropdown.VERSION = '3.3.0'

  Dropdown.prototype.toggle = function (e) {
    var $this = $(this)
@@ -154,6 +154,8 @@
    .on('click.bs.dropdown.data-api', clearMenus)
    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)

 }(jQuery);
--- a/js/modal.js
+++ b/js/modal.js
 /* ========================================================================
- * Bootstrap: modal.js v3.2.0
+ * Bootstrap: modal.js v3.3.0
 * http://getbootstrap.com/javascript/#modals
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
    }
  }

-  Modal.VERSION  = '3.2.0'
+  Modal.VERSION  = '3.3.0'

  Modal.TRANSITION_DURATION = 300
  Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -56,10 +56,11 @@
    this.isShown = true

    this.checkScrollbar()
+    this.setScrollbar()
    this.$body.addClass('modal-open')

-    this.setScrollbar()
    this.escape()
+    this.resize()

    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))

@@ -74,6 +75,9 @@
        .show()
        .scrollTop(0)

+      if (that.options.backdrop) that.adjustBackdrop()
+      that.adjustDialog()
+
      if (transition) {
        that.$element[0].offsetWidth // force reflow
      }
@@ -108,6 +112,7 @@
    this.isShown = false

    this.escape()
+    this.resize()

    $(document).off('focusin.bs.modal')

@@ -143,11 +148,20 @@
    }
  }

+  Modal.prototype.resize = function () {
+    if (this.isShown) {
+      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
+    } else {
+      $(window).off('resize.bs.modal')
+    }
+  }
+
  Modal.prototype.hideModal = function () {
    var that = this
    this.$element.hide()
    this.backdrop(function () {
      that.$body.removeClass('modal-open')
+      that.resetAdjustments()
      that.resetScrollbar()
      that.$element.trigger('hidden.bs.modal')
    })
@@ -204,13 +218,43 @@
    }
  }

+  // these following methods are used to handle overflowing modals
+
+  Modal.prototype.handleUpdate = function () {
+    if (this.options.backdrop) this.adjustBackdrop()
+    this.adjustDialog()
+  }
+
+  Modal.prototype.adjustBackdrop = function () {
+    this.$backdrop
+      .css('height', 0)
+      .css('height', this.$element[0].scrollHeight)
+  }
+
+  Modal.prototype.adjustDialog = function () {
+    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
+
+    this.$element.css({
+      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
+      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
+    })
+  }
+
+  Modal.prototype.resetAdjustments = function () {
+    this.$element.css({
+      paddingLeft: '',
+      paddingRight: ''
+    })
+  }
+
  Modal.prototype.checkScrollbar = function () {
+    this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
    this.scrollbarWidth = this.measureScrollbar()
  }

  Modal.prototype.setScrollbar = function () {
    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
-    if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
  }

  Modal.prototype.resetScrollbar = function () {
@@ -218,7 +262,6 @@
  }

  Modal.prototype.measureScrollbar = function () { // thx walsh
-    if (document.body.clientWidth >= window.innerWidth) return 0
    var scrollDiv = document.createElement('div')
    scrollDiv.className = 'modal-scrollbar-measure'
    this.$body.append(scrollDiv)

--- a/js/popover.js
+++ b/js/popover.js
 /* ========================================================================
- * Bootstrap: popover.js v3.2.0
+ * Bootstrap: popover.js v3.3.0
 * http://getbootstrap.com/javascript/#popovers
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@

  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')

-  Popover.VERSION  = '3.2.0'
+  Popover.VERSION  = '3.3.0'

  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
    placement: 'right',

--- a/js/scrollspy.js
+++ b/js/scrollspy.js
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.2.0
+ * Bootstrap: scrollspy.js v3.3.0
 * http://getbootstrap.com/javascript/#scrollspy
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
    this.process()
  }

-  ScrollSpy.VERSION  = '3.2.0'
+  ScrollSpy.VERSION  = '3.3.0'

  ScrollSpy.DEFAULTS = {
    offset: 10

--- a/js/tab.js
+++ b/js/tab.js
 /* ========================================================================
- * Bootstrap: tab.js v3.2.0
+ * Bootstrap: tab.js v3.3.0
 * http://getbootstrap.com/javascript/#tabs
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.
@@ -17,7 +17,7 @@
    this.element = $(element)
  }

-  Tab.VERSION = '3.2.0'
+  Tab.VERSION = '3.3.0'

  Tab.TRANSITION_DURATION = 150

@@ -141,9 +141,13 @@
  // TAB DATA-API
  // ============

-  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+  var clickHandler = function (e) {
    e.preventDefault()
    Plugin.call($(this), 'show')
-  })
+  }
+
+  $(document)
+    .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
+    .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)

 }(jQuery);
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -3,6 +3,7 @@
  <head>
    <meta charset="utf-8">
    <title>Bootstrap Plugin Test Suite</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">

    <!-- jQuery -->
    <script src="vendor/jquery.min.js"></script>
@@ -12,7 +13,12 @@
    <script src="vendor/qunit.js"></script>
    <style>
      #qunit-tests > li.pass {
-        display: none;/* Make it easier to see failing tests is Sauce screencasts */
+        display: none;/* Make it easier to see failing tests in Sauce screencasts */
+      }
+
+      #qunit-fixture {
+        top: 0;
+        left: 0;
      }
    </style>
    <script>
@@ -36,6 +42,7 @@
      })

      QUnit.testStart(function (testDetails) {
+        $(window).scrollTop(0)
        QUnit.log = function (details) {
          if (!details.result) {
            details.name = testDetails.name

--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -33,9 +33,9 @@ $(function () {
    var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
    equal($btn.html(), 'mdo', 'btn text equals mdo')
    $btn.bootstrapButton('loading')
-    equal($btn.html(), 'fat', 'btn text equals fat')
    stop()
    setTimeout(function () {
+      equal($btn.html(), 'fat', 'btn text equals fat')
      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
      ok($btn.hasClass('disabled'), 'btn has disabled class')
      start()
@@ -46,16 +46,16 @@ $(function () {
    var $btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
    equal($btn.html(), 'mdo', 'btn text equals mdo')
    $btn.bootstrapButton('loading')
-    equal($btn.html(), 'fat', 'btn text equals fat')
    stop()
    setTimeout(function () {
+      equal($btn.html(), 'fat', 'btn text equals fat')
      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
      ok($btn.hasClass('disabled'), 'btn has disabled class')
      start()
      stop()
      $btn.bootstrapButton('reset')
-      equal($btn.html(), 'mdo', 'btn text equals mdo')
      setTimeout(function () {
+        equal($btn.html(), 'mdo', 'btn text equals mdo')
        ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
        ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
        start()
@@ -67,16 +67,16 @@ $(function () {
    var $btn = $('<button class="btn" data-loading-text="fat"/>')
    equal($btn.html(), '', 'btn text equals ""')
    $btn.bootstrapButton('loading')
-    equal($btn.html(), 'fat', 'btn text equals fat')
    stop()
    setTimeout(function () {
+      equal($btn.html(), 'fat', 'btn text equals fat')
      ok($btn[0].hasAttribute('disabled'), 'btn is disabled')
      ok($btn.hasClass('disabled'), 'btn has disabled class')
      start()
      stop()
      $btn.bootstrapButton('reset')
-      equal($btn.html(), '', 'btn text equals ""')
      setTimeout(function () {
+        equal($btn.html(), '', 'btn text equals ""')
        ok(!$btn[0].hasAttribute('disabled'), 'btn is not disabled')
        ok(!$btn.hasClass('disabled'), 'btn does not have disabled class')
        start()

--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -478,6 +478,48 @@ $(function () {
    strictEqual($template.find('.item')[0], $template.find('.active')[0], 'first item still active after left arrow press')
  })

+  test('should ignore keyboard events within <input>s and <textarea>s', function () {
+    var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false">'
+        + '<div class="carousel-inner">'
+        + '<div id="first" class="item active">'
+        + '<img alt="">'
+        + '<input type="text" id="in-put">'
+        + '<textarea id="text-area"></textarea>'
+        + '</div>'
+        + '<div id="second" class="item">'
+        + '<img alt="">'
+        + '</div>'
+        + '<div id="third" class="item">'
+        + '<img alt="">'
+        + '</div>'
+        + '</div>'
+        + '</div>'
+    var $template = $(templateHTML)
+    var $input = $template.find('#in-put')
+    var $textarea = $template.find('#text-area')
+
+    strictEqual($input.length, 1, 'found <input>')
+    strictEqual($textarea.length, 1, 'found <textarea>')
+
+    $template.bootstrapCarousel()
+
+    strictEqual($template.find('.item')[0], $template.find('.active')[0], 'first item active')
+
+
+    $input.trigger($.Event('keydown', { which: 39 }))
+    strictEqual($template.find('.item')[0], $template.find('.active')[0], 'first item still active after right arrow press in <input>')
+
+    $input.trigger($.Event('keydown', { which: 37 }))
+    strictEqual($template.find('.item')[0], $template.find('.active')[0], 'first item still active after left arrow press in <input>')
+
+
+    $textarea.trigger($.Event('keydown', { which: 39 }))
+    strictEqual($template.find('.item')[0], $template.find('.active')[0], 'first item still active after right arrow press in <textarea>')
+
+    $textarea.trigger($.Event('keydown', { which: 37 }))
+    strictEqual($template.find('.item')[0], $template.find('.active')[0], 'first item still active after left arrow press in <textarea>')
+  })
+
  test('should only add mouseenter and mouseleave listeners when not on mobile', function () {
    var isMobile     = 'ontouchstart' in document.documentElement
    var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false" data-pause="hover">'

--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -79,7 +79,7 @@ $(function () {

    $('<div id="test1"/>')
      .appendTo('#qunit-fixture')
-      .on('show.bs.collapse', function () {
+      .on('shown.bs.collapse', function () {
        ok(!$target.hasClass('collapsed'))
        start()
      })
@@ -94,7 +94,7 @@ $(function () {

    $('<div id="test1" class="in"/>')
      .appendTo('#qunit-fixture')
-      .on('hide.bs.collapse', function () {
+      .on('hidden.bs.collapse', function () {
        ok($target.hasClass('collapsed'))
        start()
      })
@@ -137,12 +137,12 @@ $(function () {
  test('should remove "collapsed" class from active accordion target', function () {
    stop()

-    var accordionHTML = '<div id="accordion">'
-        + '<div class="accordion-group"/>'
-        + '<div class="accordion-group"/>'
-        + '<div class="accordion-group"/>'
+    var accordionHTML = '<div class="panel-group" id="accordion">'
+        + '<div class="panel"/>'
+        + '<div class="panel"/>'
+        + '<div class="panel"/>'
        + '</div>'
-    var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.accordion-group')
+    var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.panel')

    var $target1 = $('<a data-toggle="collapse" href="#body1" data-parent="#accordion"/>').appendTo($groups.eq(0))

@@ -156,7 +156,7 @@ $(function () {

    $('<div id="body3"/>')
      .appendTo($groups.eq(2))
-      .on('show.bs.collapse', function () {
+      .on('shown.bs.collapse', function () {
        ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
        ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
        ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
@@ -170,12 +170,12 @@ $(function () {
  test('should allow dots in data-parent', function () {
    stop()

-    var accordionHTML = '<div class="accordion">'
-        + '<div class="accordion-group"/>'
-        + '<div class="accordion-group"/>'
-        + '<div class="accordion-group"/>'
+    var accordionHTML = '<div class="panel-group accordion">'
+        + '<div class="panel"/>'
+        + '<div class="panel"/>'
+        + '<div class="panel"/>'
        + '</div>'
-    var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.accordion-group')
+    var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.panel')

    var $target1 = $('<a data-toggle="collapse" href="#body1" data-parent=".accordion"/>').appendTo($groups.eq(0))

@@ -189,7 +189,7 @@ $(function () {

    $('<div id="body3"/>')
      .appendTo($groups.eq(2))
-      .on('show.bs.collapse', function () {
+      .on('shown.bs.collapse', function () {
        ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
        ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
        ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
@@ -207,7 +207,7 @@ $(function () {

    $('<div id="test1"/>')
      .appendTo('#qunit-fixture')
-      .on('show.bs.collapse', function () {
+      .on('shown.bs.collapse', function () {
        equal($target.attr('aria-expanded'), 'true', 'aria-expanded on target is "true"')
        start()
      })
@@ -222,7 +222,7 @@ $(function () {

    $('<div id="test1" class="in"/>')
      .appendTo('#qunit-fixture')
-      .on('hide.bs.collapse', function () {
+      .on('hidden.bs.collapse', function () {
        equal($target.attr('aria-expanded'), 'false', 'aria-expanded on target is "false"')
        start()
      })
@@ -233,12 +233,12 @@ $(function () {
  test('should change aria-expanded from active accordion target to "false" and set the newly active one to "true"', function () {
    stop()

-    var accordionHTML = '<div id="accordion">'
-        + '<div class="accordion-group"/>'
-        + '<div class="accordion-group"/>'
-        + '<div class="accordion-group"/>'
+    var accordionHTML = '<div class="panel-group" id="accordion">'
+        + '<div class="panel"/>'
+        + '<div class="panel"/>'
+        + '<div class="panel"/>'
        + '</div>'
-    var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.accordion-group')
+    var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.panel')

    var $target1 = $('<a data-toggle="collapse" href="#body1" data-parent="#accordion"/>').appendTo($groups.eq(0))

@@ -252,7 +252,7 @@ $(function () {

    $('<div id="body3" aria-expanded="false"/>')
      .appendTo($groups.eq(2))
-      .on('show.bs.collapse', function () {
+      .on('shown.bs.collapse', function () {
        equal($target1.attr('aria-expanded'), 'false', 'inactive target 1 has aria-expanded="false"')
        equal($target2.attr('aria-expanded'), 'false', 'inactive target 2 has aria-expanded="false"')
        equal($target3.attr('aria-expanded'), 'true', 'active target 3 has aria-expanded="false"')
@@ -298,4 +298,32 @@ $(function () {
    }, 1)
  })

+  test('should add "collapsed" class to target when collapse is hidden via manual invocation', function () {
+    stop()
+
+    var $target = $('<a data-toggle="collapse" href="#test1"/>').appendTo('#qunit-fixture')
+
+    $('<div id="test1" class="in"/>')
+      .appendTo('#qunit-fixture')
+      .on('hidden.bs.collapse', function () {
+        ok($target.hasClass('collapsed'))
+        start()
+      })
+      .bootstrapCollapse('hide')
+  })
+
+  test('should remove "collapsed" class from target when collapse is shown via manual invocation', function () {
+    stop()
+
+    var $target = $('<a data-toggle="collapse" class="collapsed" href="#test1"/>').appendTo('#qunit-fixture')
+
+    $('<div id="test1"/>')
+      .appendTo('#qunit-fixture')
+      .on('shown.bs.collapse', function () {
+        ok(!$target.hasClass('collapsed'))
+        start()
+      })
+      .bootstrapCollapse('show')
+  })
+
 })
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
--- a/js/tests/visual/affix.html
+++ b/js/tests/visual/affix.html
--- a/js/tests/visual/alert.html
+++ b/js/tests/visual/alert.html
--- a/js/tests/visual/button.html
+++ b/js/tests/visual/button.html
--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html
--- a/js/tests/visual/collapse.html
+++ b/js/tests/visual/collapse.html
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
--- a/js/tests/visual/popover.html
+++ b/js/tests/visual/popover.html
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
--- a/js/tests/visual/tab.html
+++ b/js/tests/visual/tab.html
--- a/js/tests/visual/tooltip.html
+++ b/js/tests/visual/tooltip.html
--- a/js/tooltip.js
+++ b/js/tooltip.js
--- a/js/transition.js
+++ b/js/transition.js
 /* ========================================================================
- * Bootstrap: transition.js v3.2.0
+ * Bootstrap: transition.js v3.3.0
 * http://getbootstrap.com/javascript/#transitions
 * ========================================================================
 * Copyright 2011-2014 Twitter, Inc.

--- a/less/_badge.less
+++ b/less/_badge.less
--- a/less/_buttons.less
+++ b/less/_buttons.less
--- a/less/_dropdown.less
+++ b/less/_dropdown.less
--- a/less/_forms.less
+++ b/less/_forms.less
--- a/less/_list-group.less
+++ b/less/_list-group.less
--- a/less/_modal.less
+++ b/less/_modal.less
--- a/less/_nav.less
+++ b/less/_nav.less
--- a/less/_navbar.less
+++ b/less/_navbar.less
--- a/less/_pager.less
+++ b/less/_pager.less
--- a/less/_pagination.less
+++ b/less/_pagination.less
--- a/less/_popover.less
+++ b/less/_popover.less
--- a/less/_tooltip.less
+++ b/less/_tooltip.less
--- a/less/_variables.less
+++ b/less/_variables.less
--- a/less/mixins/grid-framework.less
+++ b/less/mixins/grid-framework.less
--- a/package.json
+++ b/package.json
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json