Merge branch 'master' into pr/11388

Conflicts: dist/css/bootstrap.min.css

Merge branch 'master' into pr/11388
Conflicts: dist/css/bootstrap.min.css
bb4a39d5 · Mark Otto · 96109d31 · e6eb7981 · bb4a39d5 · bb4a39d5
Commit bb4a39d5 authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 387 additions and 440 deletions
+387 -440
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ validation-report.json
 # Folders to ignore
 node_modules
+bower_components
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,3 +59,21 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
 With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). We're in the process of collecting permissions from all Bootstrap contributors with code still part of the project to make this happen. For details, please see [#2054](https://github.com/twbs/bootstrap/issues/2054).
 By contributing your code, you agree to dual-license your contribution under the [Apache 2](https://github.com/twbs/bootstrap/blob/master/LICENSE) and [MIT](https://github.com/twbs/bootstrap/blob/master/MIT) licenses.
+## Release checklist
+1. Close ship list issue for the release.
+2. Close the milestone for the release.
+3. Open new release issue that includes this checklist.
+4. Ping folks to coordinate release (mainly @jdorfman for BootstrapCDN).
+5. Update version numbers using `grunt change-version-number --oldver=A.B.C --newver=X.Y.Z`. Review the changes and stage them manually.
+6. Run `grunt` one last time.
+7. Push to `master` branch.
+8. Merge `master` into `gh-pages`.
+9. Generate `bootstrap-X.Y.Z-dist.zip` file for release.
+10. Create release on GitHub with `/dist/` folder and release notes.
+11. Push `gh-pages`.
+12. Publish blog post.
+13. Tweet tweet.
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -135,8 +135,8 @@ module.exports = function(grunt) {
      options: {
        reset: true,
        relaxerror: [
-            "Bad value X-UA-Compatible for attribute http-equiv on element meta.",
+          "Bad value X-UA-Compatible for attribute http-equiv on element meta.",
-            "Element img is missing required attribute src."
+          "Element img is missing required attribute src."
        ]
      },
      files: {

--- a/bower.json
+++ b/bower.json
 {
  "name": "bootstrap",
  "version": "3.0.2",
-  "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"],
+  "main": [
+    "./dist/js/bootstrap.js", 
+    "./dist/css/bootstrap.css", 
+    "./dist/fonts/glyphicons-halflings-regular.eot",
+    "./dist/fonts/glyphicons-halflings-regular.svg",
+    "./dist/fonts/glyphicons-halflings-regular.ttf",
+    "./dist/fonts/glyphicons-halflings-regular.woff"
+  ],
  "ignore": [
-      "**/.*"
+    "**/.*",
+    "_*",
+    "docs-assets",
+    "examples",
+    "/fonts",
+    "js/tests",
+    "CNAME",
+    "CONTRIBUTING.md",
+    "Gruntfile.js",
+    "browserstack.json",
+    "composer.json",
+    "package.json",
+    "*.html"
  ],
  "dependencies": {
    "jquery": ">= 1.9.0"

--- a/browserstack.json
+++ b/browserstack.json
@@ -2,7 +2,7 @@
  "username": "--secure--",
  "key": "--secure--",
  "test_path": "js/tests/index.html",
-  "browsers":  [
+  "browsers": [
    {
      "browser": "firefox",
      "browser_version": "latest",

--- a/components.html
+++ b/components.html
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
  , "license": "Apache-2.0"
  , "extra": {
      "branch-alias": {
-          "dev-master": "3.0.x-dev"
+        "dev-master": "3.0.x-dev"
      }
  }
 }
--- a/css.html
+++ b/css.html
@@ -871,7 +871,7 @@ base_url: "../"
    <p>Style and content changes for simple variations on a standard <code>&lt;blockquote&gt;</code>.</p>
    <h4>Naming a source</h4>
-    <p>Add <code>&lt;small&gt;</code> tag for identifying the source. Wrap the name of the source work in <code>&lt;cite&gt;</code>.</p>
+    <p>Add <code>&lt;small&gt;</code> tag or <code>.small</code> class for identifying the source. Wrap the name of the source work in <code>&lt;cite&gt;</code>.</p>
    <div class="bs-example">
      <blockquote>
        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@@ -1617,7 +1617,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
    <h2 id="forms-horizontal">Horizontal form</h2>
    <p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding <code>.form-horizontal</code> to the form. Doing so changes <code>.form-group</code>s to behave as grid rows, so no need for <code>.row</code>.</p>
    <div class="bs-example">
-      <form class="form-horizontal">
+      <form class="form-horizontal" role="form">
        <div class="form-group">
          <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
          <div class="col-sm-10">

--- a/customize.html
+++ b/customize.html
@@ -399,7 +399,7 @@ base_url: "../"
        <input type="text" class="form-control" placeholder="Georgia, 'Times New Roman', Times, serif" data-var="@font-family-serif">
        <p class="help-block">Default serif fonts.</p>
        <label>@font-family-monospace</label>
-        <input type="text" class="form-control" placeholder="Monaco, Menlo, Consolas, 'Courier New', monospace" data-var="@font-family-monospace">
+        <input type="text" class="form-control" placeholder="Menlo, Monaco, Consolas, 'Courier New', monospace" data-var="@font-family-monospace">
        <p class="help-block">Default monospace fonts for <code>&lt;code&gt;</code> and <code>&lt;pre&gt;</code>.</p>
        <h4>Base type styes</h4>

--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -333,7 +333,7 @@ a:focus {
 }
 a:focus {
-  outline: thin dotted #333;
+  outline: thin dotted;
  outline: 5px auto -webkit-focus-ring-color;
  outline-offset: -2px;
 }
@@ -426,35 +426,35 @@ cite {
 }
 .text-warning {
-  color: #c09853;
+  color: #8a6d3b;
 }
 .text-warning:hover {
-  color: #a47e3c;
+  color: #66512c;
 }
 .text-danger {
-  color: #b94a48;
+  color: #a94442;
 }
 .text-danger:hover {
-  color: #953b39;
+  color: #843534;
 }
 .text-success {
-  color: #468847;
+  color: #3c763d;
 }
 .text-success:hover {
-  color: #356635;
+  color: #2b542c;
 }
 .text-info {
-  color: #3a87ad;
+  color: #31708f;
 }
 .text-info:hover {
-  color: #2d6987;
+  color: #245269;
 }
 .text-left {
@@ -692,13 +692,15 @@ blockquote p:last-child {
  margin-bottom: 0;
 }
-blockquote small {
+blockquote small,
+blockquote .small {
  display: block;
  line-height: 1.428571429;
  color: #999999;
 }
-blockquote small:before {
+blockquote small:before,
+blockquote .small:before {
  content: '\2014 \00A0';
 }
@@ -740,7 +742,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 code {
@@ -807,6 +809,24 @@ pre code {
  clear: both;
 }
+@media (min-width: 768px) {
+  .container {
+    width: 750px;
+  }
+}
+@media (min-width: 992px) {
+  .container {
+    width: 970px;
+  }
+}
+@media (min-width: 1200px) {
+  .container {
+    width: 1170px;
+  }
+}
 .row {
  margin-right: -15px;
  margin-left: -15px;
@@ -1105,9 +1125,6 @@ pre code {
 }
 @media (min-width: 768px) {
-  .container {
-    width: 750px;
-  }
  .col-sm-1,
  .col-sm-2,
  .col-sm-3,
@@ -1277,9 +1294,6 @@ pre code {
 }
 @media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
  .col-md-1,
  .col-md-2,
  .col-md-3,
@@ -1449,9 +1463,6 @@ pre code {
 }
 @media (min-width: 1200px) {
-  .container {
-    width: 1170px;
-  }
  .col-lg-1,
  .col-lg-2,
  .col-lg-3,
@@ -1893,7 +1904,7 @@ select optgroup {
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
-  outline: thin dotted #333;
+  outline: thin dotted;
  outline: 5px auto -webkit-focus-ring-color;
  outline-offset: -2px;
 }
@@ -1944,6 +1955,7 @@ output {
 .form-control::-moz-placeholder {
  color: #999999;
+  opacity: 1;
 }
 .form-control:-ms-input-placeholder {
@@ -2049,7 +2061,7 @@ textarea.input-sm {
 }
 .input-lg {
-  height: 45px;
+  height: 46px;
  padding: 10px 16px;
  font-size: 18px;
  line-height: 1.33;
@@ -2057,8 +2069,8 @@ textarea.input-sm {
 }
 select.input-lg {
-  height: 45px;
+  height: 46px;
-  line-height: 45px;
+  line-height: 46px;
 }
 textarea.input-lg {
@@ -2071,25 +2083,25 @@ textarea.input-lg {
 .has-warning .checkbox,
 .has-warning .radio-inline,
 .has-warning .checkbox-inline {
-  color: #c09853;
+  color: #8a6d3b;
 }
 .has-warning .form-control {
-  border-color: #c09853;
+  border-color: #8a6d3b;
  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .has-warning .form-control:focus {
-  border-color: #a47e3c;
+  border-color: #66512c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
 }
 .has-warning .input-group-addon {
-  color: #c09853;
+  color: #8a6d3b;
  background-color: #fcf8e3;
-  border-color: #c09853;
+  border-color: #8a6d3b;
 }
 .has-error .help-block,
@@ -2098,25 +2110,25 @@ textarea.input-lg {
 .has-error .checkbox,
 .has-error .radio-inline,
 .has-error .checkbox-inline {
-  color: #b94a48;
+  color: #a94442;
 }
 .has-error .form-control {
-  border-color: #b94a48;
+  border-color: #a94442;
  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .has-error .form-control:focus {
-  border-color: #953b39;
+  border-color: #843534;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
 }
 .has-error .input-group-addon {
-  color: #b94a48;
+  color: #a94442;
  background-color: #f2dede;
-  border-color: #b94a48;
+  border-color: #a94442;
 }
 .has-success .help-block,
@@ -2125,25 +2137,25 @@ textarea.input-lg {
 .has-success .checkbox,
 .has-success .radio-inline,
 .has-success .checkbox-inline {
-  color: #468847;
+  color: #3c763d;
 }
 .has-success .form-control {
-  border-color: #468847;
+  border-color: #3c763d;
  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 }
 .has-success .form-control:focus {
-  border-color: #356635;
+  border-color: #2b542c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
 }
 .has-success .input-group-addon {
-  color: #468847;
+  color: #3c763d;
  background-color: #dff0d8;
-  border-color: #468847;
+  border-color: #3c763d;
 }
 .form-control-static {
@@ -2247,7 +2259,7 @@ textarea.input-lg {
 }
 .btn:focus {
-  outline: thin dotted #333;
+  outline: thin dotted;
  outline: 5px auto -webkit-focus-ring-color;
  outline-offset: -2px;
 }
@@ -3451,9 +3463,8 @@ input[type="button"].btn-block {
  height: 0;
  margin-left: 2px;
  vertical-align: middle;
-  border-top: 4px solid #000000;
+  border-top: 4px solid;
  border-right: 4px solid transparent;
-  border-bottom: 0 dotted;
  border-left: 4px solid transparent;
 }
@@ -3571,8 +3582,8 @@ input[type="button"].btn-block {
 .dropup .caret,
 .navbar-fixed-bottom .dropdown .caret {
-  border-top: 0 dotted;
+  border-top: 0;
-  border-bottom: 4px solid #000000;
+  border-bottom: 4px solid;
  content: "";
 }
@@ -3590,30 +3601,6 @@ input[type="button"].btn-block {
  }
 }
-.btn-default .caret {
-  border-top-color: #333333;
-}
-.btn-primary .caret,
-.btn-success .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret {
-  border-top-color: #fff;
-}
-.dropup .btn-default .caret {
-  border-bottom-color: #333333;
-}
-.dropup .btn-primary .caret,
-.dropup .btn-success .caret,
-.dropup .btn-warning .caret,
-.dropup .btn-danger .caret,
-.dropup .btn-info .caret {
-  border-bottom-color: #fff;
-}
 .btn-group,
 .btn-group-vertical {
  position: relative;
@@ -3780,7 +3767,8 @@ input[type="button"].btn-block {
 }
 .btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group {
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
  display: block;
  float: none;
  width: 100%;
@@ -3888,7 +3876,7 @@ input[type="button"].btn-block {
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
 .input-group-lg > .input-group-btn > .btn {
-  height: 45px;
+  height: 46px;
  padding: 10px 16px;
  font-size: 18px;
  line-height: 1.33;
@@ -3898,8 +3886,8 @@ input[type="button"].btn-block {
 select.input-group-lg > .form-control,
 select.input-group-lg > .input-group-addon,
 select.input-group-lg > .input-group-btn > .btn {
-  height: 45px;
+  height: 46px;
-  line-height: 45px;
+  line-height: 46px;
 }
 textarea.input-group-lg > .form-control,
@@ -4093,13 +4081,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
  border-color: #428bca;
 }
-.nav .open > a .caret,
-.nav .open > a:hover .caret,
-.nav .open > a:focus .caret {
-  border-top-color: #2a6496;
-  border-bottom-color: #2a6496;
-}
 .nav .nav-divider {
  height: 1px;
  margin: 9px 0;
@@ -4212,13 +4193,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
  background-color: #428bca;
 }
-.nav-pills > li.active > a .caret,
-.nav-pills > li.active > a:hover .caret,
-.nav-pills > li.active > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
 .nav-stacked > li {
  float: none;
 }
@@ -4291,16 +4265,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
  display: block;
 }
-.nav .caret {
-  border-top-color: #428bca;
-  border-bottom-color: #428bca;
-}
-.nav a:hover .caret {
-  border-top-color: #2a6496;
-  border-bottom-color: #2a6496;
-}
 .nav-tabs .dropdown-menu {
  margin-top: -1px;
  border-top-right-radius: 0;
@@ -4503,6 +4467,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
  margin-right: 15px;
  margin-bottom: 8px;
  background-color: transparent;
+  background-image: none;
  border: 1px solid transparent;
  border-radius: 4px;
 }
@@ -4657,13 +4622,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .navbar-text {
-  float: left;
  margin-top: 15px;
  margin-bottom: 15px;
 }
 @media (min-width: 768px) {
  .navbar-text {
+    float: left;
    margin-right: 15px;
    margin-left: 15px;
  }
@@ -4730,12 +4695,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
  border-color: #e7e7e7;
 }
-.navbar-default .navbar-nav > .dropdown > a:hover .caret,
-.navbar-default .navbar-nav > .dropdown > a:focus .caret {
-  border-top-color: #333333;
-  border-bottom-color: #333333;
-}
 .navbar-default .navbar-nav > .open > a,
 .navbar-default .navbar-nav > .open > a:hover,
 .navbar-default .navbar-nav > .open > a:focus {
@@ -4743,18 +4702,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
  background-color: #e7e7e7;
 }
-.navbar-default .navbar-nav > .open > a .caret,
-.navbar-default .navbar-nav > .open > a:hover .caret,
-.navbar-default .navbar-nav > .open > a:focus .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-.navbar-default .navbar-nav > .dropdown > a .caret {
-  border-top-color: #777777;
-  border-bottom-color: #777777;
-}
 @media (max-width: 767px) {
  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
    color: #777777;
@@ -4854,27 +4801,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
  background-color: #080808;
 }
-.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-.navbar-inverse .navbar-nav > .dropdown > a .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
-}
-.navbar-inverse .navbar-nav > .open > a .caret,
-.navbar-inverse .navbar-nav > .open > a:hover .caret,
-.navbar-inverse .navbar-nav > .open > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
 @media (max-width: 767px) {
  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
    border-color: #080808;
  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+    background-color: #080808;
+  }
  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
    color: #999999;
  }
@@ -5238,6 +5171,10 @@ a.list-group-item.active > .badge,
  border-radius: 6px;
 }
+.jumbotron .container {
+  max-width: 100%;
+}
 @media screen and (min-width: 768px) {
  .jumbotron {
    padding-top: 48px;
@@ -5253,10 +5190,7 @@ a.list-group-item.active > .badge,
 }
 .thumbnail {
-  display: inline-block;
  display: block;
-  height: auto;
-  max-width: 100%;
  padding: 4px;
  margin-bottom: 20px;
  line-height: 1.428571429;
@@ -5323,7 +5257,7 @@ a.thumbnail.active {
 }
 .alert-success {
-  color: #468847;
+  color: #3c763d;
  background-color: #dff0d8;
  border-color: #d6e9c6;
 }
@@ -5333,11 +5267,11 @@ a.thumbnail.active {
 }
 .alert-success .alert-link {
-  color: #356635;
+  color: #2b542c;
 }
 .alert-info {
-  color: #3a87ad;
+  color: #31708f;
  background-color: #d9edf7;
  border-color: #bce8f1;
 }
@@ -5347,11 +5281,11 @@ a.thumbnail.active {
 }
 .alert-info .alert-link {
-  color: #2d6987;
+  color: #245269;
 }
 .alert-warning {
-  color: #c09853;
+  color: #8a6d3b;
  background-color: #fcf8e3;
  border-color: #faebcc;
 }
@@ -5361,11 +5295,11 @@ a.thumbnail.active {
 }
 .alert-warning .alert-link {
-  color: #a47e3c;
+  color: #66512c;
 }
 .alert-danger {
-  color: #b94a48;
+  color: #a94442;
  background-color: #f2dede;
  border-color: #ebccd1;
 }
@@ -5375,7 +5309,7 @@ a.thumbnail.active {
 }
 .alert-danger .alert-link {
-  color: #953b39;
+  color: #843534;
 }
 @-webkit-keyframes progress-bar-stripes {
@@ -5387,24 +5321,6 @@ a.thumbnail.active {
  }
 }
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
 @keyframes progress-bar-stripes {
  from {
    background-position: 40px 0;
@@ -5665,7 +5581,7 @@ a.list-group-item.active:focus .list-group-item-text {
 }
 .panel > .table,
-.panel > .table-responsive {
+.panel > .table-responsive > .table {
  margin-bottom: 0;
 }
@@ -5674,6 +5590,11 @@ a.list-group-item.active:focus .list-group-item-text {
  border-top: 1px solid #dddddd;
 }
+.panel > .table > tbody:first-child th,
+.panel > .table > tbody:first-child td {
+  border-top: 0;
+}
 .panel > .table-bordered,
 .panel > .table-responsive > .table-bordered {
  border: 0;
@@ -5793,10 +5714,6 @@ a.list-group-item.active:focus .list-group-item-text {
  border-top-color: #dddddd;
 }
-.panel-default > .panel-heading > .dropdown .caret {
-  border-color: #333333 transparent;
-}
 .panel-default > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #dddddd;
 }
@@ -5815,10 +5732,6 @@ a.list-group-item.active:focus .list-group-item-text {
  border-top-color: #428bca;
 }
-.panel-primary > .panel-heading > .dropdown .caret {
-  border-color: #ffffff transparent;
-}
 .panel-primary > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #428bca;
 }
@@ -5828,7 +5741,7 @@ a.list-group-item.active:focus .list-group-item-text {
 }
 .panel-success > .panel-heading {
-  color: #468847;
+  color: #3c763d;
  background-color: #dff0d8;
  border-color: #d6e9c6;
 }
@@ -5837,10 +5750,6 @@ a.list-group-item.active:focus .list-group-item-text {
  border-top-color: #d6e9c6;
 }
-.panel-success > .panel-heading > .dropdown .caret {
-  border-color: #468847 transparent;
-}
 .panel-success > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #d6e9c6;
 }
@@ -5850,7 +5759,7 @@ a.list-group-item.active:focus .list-group-item-text {
 }
 .panel-warning > .panel-heading {
-  color: #c09853;
+  color: #8a6d3b;
  background-color: #fcf8e3;
  border-color: #faebcc;
 }
@@ -5859,10 +5768,6 @@ a.list-group-item.active:focus .list-group-item-text {
  border-top-color: #faebcc;
 }
-.panel-warning > .panel-heading > .dropdown .caret {
-  border-color: #c09853 transparent;
-}
 .panel-warning > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #faebcc;
 }
@@ -5872,7 +5777,7 @@ a.list-group-item.active:focus .list-group-item-text {
 }
 .panel-danger > .panel-heading {
-  color: #b94a48;
+  color: #a94442;
  background-color: #f2dede;
  border-color: #ebccd1;
 }
@@ -5881,10 +5786,6 @@ a.list-group-item.active:focus .list-group-item-text {
  border-top-color: #ebccd1;
 }
-.panel-danger > .panel-heading > .dropdown .caret {
-  border-color: #b94a48 transparent;
-}
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #ebccd1;
 }
@@ -5894,7 +5795,7 @@ a.list-group-item.active:focus .list-group-item-text {
 }
 .panel-info > .panel-heading {
-  color: #3a87ad;
+  color: #31708f;
  background-color: #d9edf7;
  border-color: #bce8f1;
 }
@@ -5903,10 +5804,6 @@ a.list-group-item.active:focus .list-group-item-text {
  border-top-color: #bce8f1;
 }
-.panel-info > .panel-heading > .dropdown .caret {
-  border-color: #3a87ad transparent;
-}
 .panel-info > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #bce8f1;
 }
@@ -6001,7 +5898,7 @@ button.close {
  position: relative;
  z-index: 1050;
  width: auto;
-  padding: 10px;
+  margin: 10px;
  margin-right: auto;
  margin-left: auto;
 }
@@ -6101,8 +5998,8 @@ button.close {
 @media screen and (min-width: 768px) {
  .modal-dialog {
    width: 600px;
-    padding-top: 30px;
+    margin-top: 30px;
-    padding-bottom: 30px;
+    margin-bottom: 30px;
  }
  .modal-content {
    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
@@ -6462,6 +6359,7 @@ button.close {
 .carousel-control:focus {
  color: #ffffff;
  text-decoration: none;
+  outline: none;
  opacity: 0.9;
  filter: alpha(opacity=90);
 }

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -220,15 +220,21 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
  Button.prototype.toggle = function () {
    var $parent = this.$element.closest('[data-toggle="buttons"]')
+    var changed = true
    if ($parent.length) {
      var $input = this.$element.find('input')
-        .prop('checked', !this.$element.hasClass('active'))
+      if ($input.prop('type') === 'radio') {
-        .trigger('change')
+        // see if clicking on current one
-      if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
+        if ($input.prop('checked') && this.$element.hasClass('active'))
+          changed = false
+        else
+          $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
    }
-    this.$element.toggleClass('active')
+    if (changed) this.$element.toggleClass('active')
  }
@@ -345,7 +351,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
    if (pos > (this.$items.length - 1) || pos < 0) return
-    if (this.sliding)       return this.$element.one('slid', function () { that.to(pos) })
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
    if (activeIndex == pos) return this.pause().cycle()
    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@@ -397,7 +403,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
    if (this.$indicators.length) {
      this.$indicators.find('.active').removeClass('active')
-      this.$element.one('slid', function () {
+      this.$element.one('slid.bs.carousel', function () {
        var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
        $nextIndicator && $nextIndicator.addClass('active')
      })
@@ -415,7 +421,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
          $next.removeClass([type, direction].join(' ')).addClass('active')
          $active.removeClass(['active', direction].join(' '))
          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
+          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
        })
        .emulateTransitionEnd(600)
    } else {
@@ -424,7 +430,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
      $active.removeClass('active')
      $next.addClass('active')
      this.sliding = false
-      this.$element.trigger('slid')
+      this.$element.trigger('slid.bs.carousel')
    }
    isCycling && this.cycle()
@@ -715,7 +721,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
    if (!isActive) {
      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we we use a backdrop because click events don't delegate
+        // if mobile we use a backdrop because click events don't delegate
        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
      }
@@ -797,9 +803,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
  $.fn.dropdown = function (option) {
    return this.each(function () {
      var $this = $(this)
-      var data  = $this.data('dropdown')
+      var data  = $this.data('bs.dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
      if (typeof option == 'string') data[option].call($this)
    })
  }
@@ -1694,7 +1700,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
        .addClass('active')
    }
-    active.trigger('activate')
+    active.trigger('activate.bs.scrollspy')
  }

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -586,14 +586,14 @@ h1[id] {
  border-color: #faebcc;
 }
 .bs-callout-warning h4 {
-  color: #c09853;
+  color: #8a6d3b;
 }
 .bs-callout-info {
  background-color: #f4f8fa;
  border-color: #bce8f1;
 }
 .bs-callout-info h4 {
-  color: #3a87ad;
+  color: #34789a;
 }

--- a/docs-assets/js/application.js
+++ b/docs-assets/js/application.js
@@ -100,4 +100,4 @@
      })
 })
-}(window.jQuery)
+}(jQuery)
--- a/docs-assets/js/customizer.js
+++ b/docs-assets/js/customizer.js
@@ -231,7 +231,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
        }
        result = {
          'bootstrap.css'     : cw + tree.toCSS(),
-          'bootstrap.min.css' : cw + tree.toCSS({ compress: true })
+          'bootstrap.min.css' : cw + tree.toCSS({ compress: true }).replace(/\n/g, '')
        }
      })
    } catch (err) {

--- a/docs-assets/js/raw-files.js
+++ b/docs-assets/js/raw-files.js
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -40,7 +40,7 @@
          <a class="navbar-brand" href="#">Project name</a>
        </div>
        <div class="navbar-collapse collapse">
-          <form class="navbar-form navbar-right">
+          <form class="navbar-form navbar-right" role="form">
            <div class="form-group">
              <input type="text" placeholder="Email" class="form-control">
            </div>

--- a/examples/justified-nav/index.html
+++ b/examples/justified-nav/index.html
@@ -52,7 +52,8 @@
      <!-- Example row of columns -->
      <div class="row">
        <div class="col-lg-4">
-          <h2>Heading</h2>
+          <h2>Safari bug warning!</h2>
+          <p class="text-danger">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>

--- a/examples/signin/index.html
+++ b/examples/signin/index.html
@@ -30,7 +30,7 @@
    <div class="container">
-      <form class="form-signin">
+      <form class="form-signin" role="form">
        <h2 class="form-signin-heading">Please sign in</h2>
        <input type="text" class="form-control" placeholder="Email address" required autofocus>
        <input type="password" class="form-control" placeholder="Password" required>