Merge branch 'master' into derp

Conflicts:
	Gruntfile.js
	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/dropdowns.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/less.html
	docs/_includes/css/overview.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/getting-started.html
	docs/_layouts/default.html
	docs/about.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/components.html
	docs/components/navbar.md
	docs/css.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/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/grid/index.html
	docs/examples/jumbotron-narrow/index.html
	docs/examples/jumbotron/index.html
	docs/examples/justified-nav/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/offcanvas/index.html
	docs/examples/signin/index.html
	docs/examples/starter-template/index.html
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/sticky-footer/index.html
	docs/examples/theme/index.html
	docs/examples/tooltip-viewport/index.html
	docs/getting-started.html
	docs/javascript.html
	docs/migration.html
	less/_animation.less
	less/_modal.less
	less/_navbar.less
	less/_variables.less
	less/glyphicons.less
	less/navs.less
	less/panels.less
	less/progress-bars.less

14 files changed, 196 insertions, 190 deletions

diff --git a/less/_animation.less b/less/_animation.less
index ac48e8514..2b3e765fa 100644
--- a/less/_animation.less
+++ b/less/_animation.less
@@ -12,8 +12,9 @@
 
 .collapse {
   display: none;
+  visibility: hidden;
 
-  &.in      { display: block; }
+  &.in      { display: block; visibility: visible; }
   tr&.in    { display: table-row; }
   tbody&.in { display: table-row-group; }
 }
@@ -23,4 +24,7 @@
   height: 0;
   overflow: hidden;
   transition: height .35s ease;
+  transition-property: height, visibility;
+  transition-duration: .35s;
+  transition-timing-function: ease;
 }
diff --git a/less/_media.less b/less/_media.less
index 5ad22cd6d..292e98dbd 100644
--- a/less/_media.less
+++ b/less/_media.less
@@ -1,54 +1,45 @@
-// Media objects
-// Source: http://stubbornella.org/content/?p=497
-// --------------------------------------------------
+.media {
+  // Proper spacing between instances of .media
+  margin-top: 15px;
+
+  &:first-child {
+    margin-top: 0;
+  }
+}
 
+.media-right,
+.media > .pull-right {
+  padding-left: 10px;
+}
 
-// Common styles
-// -------------------------
+.media-left,
+.media > .pull-left {
+  padding-right: 10px;
+}
 
-// Clear the floats
-.media,
+.media-left,
+.media-right,
 .media-body {
-  overflow: hidden;
-  zoom: 1;
+  display: table-cell;
+  vertical-align: top;
 }
 
-// Proper spacing between instances of .media
-.media,
-.media .media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
+.media-middle {
+  vertical-align: middle;
 }
 
-// For images and videos, set to block
-.media-object {
-  display: block;
+.media-bottom {
+  vertical-align: bottom;
 }
 
 // Reset margins on headings for tighter default spacing
 .media-heading {
-  margin: 0 0 5px;
-}
-
-
-// Media image alignment
-// -------------------------
-
-.media {
-  > .pull-left {
-    margin-right: 10px;
-  }
-  > .pull-right {
-    margin-left: 10px;
-  }
+  margin-top: 0;
+  margin-bottom: 5px;
 }
 
-
 // Media list variation
-// -------------------------
-
+//
 // Undo default ul/ol styles
 .media-list {
   padding-left: 0;
diff --git a/less/_modal.less b/less/_modal.less
index ed1ea48d6..542a8dd2a 100644
--- a/less/_modal.less
+++ b/less/_modal.less
@@ -30,10 +30,10 @@
 
   // When fading in the modal, animate it to slide down
   &.fade .modal-dialog {
-    transform: translate3d(0, -25%, 0);
+    transform: translate(0, -25%);
     transform: transition .3s ease-out;
   }
-  &.in .modal-dialog { transform: translate3d(0, 0, 0) }
+  &.in .modal-dialog { .translate(0, 0) }
 }
 .modal-open .modal {
   overflow-x: hidden;
@@ -51,8 +51,9 @@
 .modal-content {
   position: relative;
   background-color: @modal-content-bg;
+  border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
   border: 1px solid @modal-content-border-color;
-  .border-radius(@border-radius-lg);
+  border-radius: @border-radius-large;
   .box-shadow(0 3px 9px rgba(0,0,0,.5));
   background-clip: padding-box;
   // Remove focus outline from opened modal
@@ -66,11 +67,10 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: @zindex-modal-background;
   background-color: @modal-backdrop-bg;
   // Fade for backdrop
-  &.fade { opacity: 0; }
-  &.in { opacity: @modal-backdrop-opacity; }
+  &.fade { .opacity(0); }
+  &.in { .opacity(@modal-backdrop-opacity); }
 }
 
 // Modal header
@@ -130,8 +130,8 @@
 }
 
 // Scale up the modal
-.media-sm({
-  // Automatically set modal width for larger viewports
+@media (min-width: @screen-sm-min) {
+  // Automatically set modal's width for larger viewports
   .modal-dialog {
     width: @modal-md;
     margin: 30px auto;
@@ -142,8 +142,8 @@
 
   // Modal sizes
   .modal-sm { width: @modal-sm; }
-});
+}
 
-.media-sm({
+@media (min-width: @screen-md-min) {
   .modal-lg { width: @modal-lg; }
-});
+}
diff --git a/less/_nav.less b/less/_nav.less
index 07c319ab7..fa87fec25 100644
--- a/less/_nav.less
+++ b/less/_nav.less
@@ -147,9 +147,11 @@
 .tab-content {
   > .tab-pane {
     display: none;
+    visibility: hidden;
   }
   > .active {
     display: block;
+    visibility: visible;
   }
 }
 
diff --git a/less/_navbar.less b/less/_navbar.less
index 1df0aa8e4..0967ff95c 100644
--- a/less/_navbar.less
+++ b/less/_navbar.less
@@ -68,6 +68,7 @@
 
     &.collapse {
       display: block !important;
+      visibility: visible !important;
       height: auto !important;
       padding-bottom: 0; // Override default setting
       overflow: visible !important;
@@ -142,7 +143,6 @@
   right: 0;
   left: 0;
   z-index: @zindex-navbar-fixed;
-  transform: translate3d(0, 0, 0);
 
   // Undo the rounded corners
   @media (min-width: @grid-float-breakpoint) {
diff --git a/less/_normalize.less b/less/_normalize.less
index ce04b6a2f..62a085a48 100644
--- a/less/_normalize.less
+++ b/less/_normalize.less
@@ -1,4 +1,4 @@
-/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
 
 //
 // 1. Set default font family to sans-serif.
@@ -25,7 +25,8 @@ body {
 
 //
 // Correct `block` display not defined for any HTML5 element in IE 8/9.
-// Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
+// Correct `block` display not defined for `details` or `summary` in IE 10/11
+// and Firefox.
 // Correct `block` display not defined for `main` in IE 11.
 //
 
@@ -38,6 +39,7 @@ footer,
 header,
 hgroup,
 main,
+menu,
 nav,
 section,
 summary {
@@ -85,7 +87,7 @@ template {
 //
 
 a {
-  background: transparent;
+  background-color: transparent;
 }
 
 //
diff --git a/less/_print.less b/less/_print.less
index a5acd82d4..94ca58f12 100644
--- a/less/_print.less
+++ b/less/_print.less
@@ -1,99 +1,107 @@
-//
-// Basic print styles
-// --------------------------------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+
+// ==========================================================================
+// Print styles.
+// Inlined to avoid the additional HTTP request: h5bp.com/r
+// ==========================================================================
 
 @media print {
-  * {
-    background: transparent !important;
-    color: #000 !important; // Black prints faster: h5bp.com/s
-    box-shadow: none !important;
-    text-shadow: none !important;
-  }
-
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-
-  // Don't show links that are fragment identifiers,
-  // or use the `javascript:` pseudo protocol
-  a[href^="#"]:after,
-  a[href^="javascript:"]:after {
-    content: "";
-  }
-
-  pre,
-  blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-  }
-
-  thead {
-    display: table-header-group; // h5bp.com/t
-  }
-
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-
-  img {
-    max-width: 100% !important;
-  }
-
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-
-  // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
-  // Once fixed, we can just straight up remove this.
-  select {
-    background: #fff !important;
-  }
-
-  // Bootstrap components
-  .navbar {
-    display: none;
-  }
-  .btn,
-  .dropup > .btn {
-    > .caret {
-      border-top-color: #000 !important;
-    }
-  }
-  .label {
-    border: 1px solid #000;
-  }
-
-  .table {
-    border-collapse: collapse !important;
-
-    td,
-    th {
-      background-color: #fff !important;
-    }
-  }
-  .table-bordered {
-    th,
-    td {
-      border: 1px solid #ddd !important;
-    }
-  }
+    *,
+    *:before,
+    *:after {
+        background: transparent !important;
+        color: #000 !important; // Black prints faster: h5bp.com/s
+        box-shadow: none !important;
+        text-shadow: none !important;
+    }
+
+    a,
+    a:visited {
+        text-decoration: underline;
+    }
+
+    a[href]:after {
+        content: " (" attr(href) ")";
+    }
+
+    abbr[title]:after {
+        content: " (" attr(title) ")";
+    }
+
+    // Don't show links that are fragment identifiers,
+    // or use the `javascript:` pseudo protocol
+    a[href^="#"]:after,
+    a[href^="javascript:"]:after {
+        content: "";
+    }
+
+    pre,
+    blockquote {
+        border: 1px solid #999;
+        page-break-inside: avoid;
+    }
+
+    thead {
+        display: table-header-group; // h5bp.com/t
+    }
+
+    tr,
+    img {
+        page-break-inside: avoid;
+    }
+
+    img {
+        max-width: 100% !important;
+    }
+
+    p,
+    h2,
+    h3 {
+        orphans: 3;
+        widows: 3;
+    }
+
+    h2,
+    h3 {
+        page-break-after: avoid;
+    }
+
+    // Bootstrap specific changes start
+    //
+    // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
+    // Once fixed, we can just straight up remove this.
+    select {
+        background: #fff !important;
+    }
+
+    // Bootstrap components
+    .navbar {
+        display: none;
+    }
+    .btn,
+    .dropup > .btn {
+        > .caret {
+            border-top-color: #000 !important;
+        }
+    }
+    .label {
+        border: 1px solid #000;
+    }
+
+    .table {
+        border-collapse: collapse !important;
+
+        td,
+        th {
+            background-color: #fff !important;
+        }
+    }
+    .table-bordered {
+        th,
+        td {
+            border: 1px solid #ddd !important;
+        }
+    }
+
+    // Bootstrap specific changes end
 }
diff --git a/less/_progress.less b/less/_progress.less
index 4c34dbee9..93038a199 100644
--- a/less/_progress.less
+++ b/less/_progress.less
@@ -51,42 +51,38 @@
   border-top-left-radius: @border-radius-base;
   border-bottom-left-radius: @border-radius-base;
 }
-.progress[value="0"]::-webkit-progress-value {
-  color: @gray-light;
-  min-width: 2rem;
-  background-color: transparent;
-  background-image: none;
-}
 .progress[value="100"]::-webkit-progress-value {
   border-top-right-radius: @border-radius-base;
   border-bottom-right-radius: @border-radius-base;
 }
 
 // Firefox styles must be entirely separate or it busts Webkit styles.
-/* Commented out for now because linter.
-@-moz-document url-prefix() {
-  .progress[value] {
-    background-color: #eee;
-    .border-radius(@border-radius-base);
-    .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
-  }
-  .progress[value]::-moz-progress-bar {
-    background-color: #0074d9;
-    border-top-left-radius: @border-radius-base;
-    border-bottom-left-radius: @border-radius-base;
-  }
-  .progress[value="0"]::-moz-progress-bar {
-    color: @gray-light;
-    min-width: 2rem;
-    background-color: transparent;
-    background-image: none;
-  }
-  .progress[value="100"]::-moz-progress-bar {
-    border-top-right-radius: @border-radius-base;
-    border-bottom-right-radius: @border-radius-base;
-  }
-}
-*/
+//
+// Commented out for now because linter.
+//
+// @-moz-document url-prefix() {
+//   .progress[value] {
+//     background-color: #eee;
+//     .border-radius(@border-radius-base);
+//     .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
+//   }
+//   .progress[value]::-moz-progress-bar {
+//     background-color: #0074d9;
+//     border-top-left-radius: @border-radius-base;
+//     border-bottom-left-radius: @border-radius-base;
+//   }
+//   .progress[value="0"]::-moz-progress-bar {
+//     color: @gray-light;
+//     min-width: 2rem;
+//     background-color: transparent;
+//     background-image: none;
+//   }
+//   .progress[value="100"]::-moz-progress-bar {
+//     border-top-right-radius: @border-radius-base;
+//     border-bottom-right-radius: @border-radius-base;
+//   }
+// }
+
 // IE9 hacks to accompany custom markup. We don't need to scope this via media queries, but I feel better doing it anyway.
 @media screen and (~"min-width:0\0") {
   .progress {
diff --git a/less/_responsive-embed.less b/less/_responsive-embed.less
index a884d49fe..c1fa8f848 100644
--- a/less/_responsive-embed.less
+++ b/less/_responsive-embed.less
@@ -12,7 +12,8 @@
   .embed-responsive-item,
   iframe,
   embed,
-  object {
+  object,
+  video {
     position: absolute;
     top: 0;
     left: 0;
diff --git a/less/_scaffolding.less b/less/_scaffolding.less
index 4a5db6ab2..1d9cbc690 100644
--- a/less/_scaffolding.less
+++ b/less/_scaffolding.less
@@ -50,7 +50,7 @@ a {
   &:hover,
   &:focus {
     color: @link-hover-color;
-    text-decoration: underline;
+    text-decoration: @link-hover-decoration;
   }
 
   &:focus {
diff --git a/less/_tables.less b/less/_tables.less
index ee5d8d145..4cff0ea43 100644
--- a/less/_tables.less
+++ b/less/_tables.less
@@ -170,6 +170,7 @@ table {
 
 .table-responsive {
   overflow-x: auto;
+  min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
 
   @media screen and (max-width: @screen-xs-max) {
     width: 100%;
diff --git a/less/_type.less b/less/_type.less
index 1bc498a3a..6385a6b82 100644
--- a/less/_type.less
+++ b/less/_type.less
@@ -225,12 +225,6 @@ blockquote {
   }
 }
 
-// Quotes
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
 // Addresses
 address {
   margin-bottom: @line-height-computed;
diff --git a/less/_variables.less b/less/_variables.less
index b2abec319..81da2b739 100644
--- a/less/_variables.less
+++ b/less/_variables.less
@@ -34,6 +34,8 @@
 @link-color:                 @brand-primary;
 //** Link hover color set via `darken()` function.
 @link-hover-color:           darken(@link-color, 15%);
+//** Link hover decoration.
+@link-hover-decoration:      underline;
 
 
 //== Global settings
@@ -260,8 +262,7 @@
 @zindex-popover:           1060;
 @zindex-tooltip:           1070;
 @zindex-navbar-fixed:      1030;
-@zindex-modal-background:  1040;
-@zindex-modal:             1050;
+@zindex-modal:             1040;
 
 
 //== Media queries breakpoints
@@ -606,6 +607,8 @@
 @progress-bg:                 #f5f5f5;
 //** Progress bar text color
 @progress-bar-color:          #fff;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      @border-radius-base;
 
 //** Default progress bar color
 @progress-bar-bg:             @brand-primary;
diff --git a/less/theme.less b/less/theme.less
index 2be79186d..ad341fe40 100644
--- a/less/theme.less
+++ b/less/theme.less
@@ -27,6 +27,10 @@
   &.active {
     .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
+
+  .badge {
+    text-shadow: none;
+  }
 }
 
 // Mixin for generating new styles
@@ -116,7 +120,7 @@
 
   .navbar-nav > .open > a,
   .navbar-nav > .active > a {
-    #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
+    #gradient > .vertical(@start-color: darken(@navbar-default-link-active-bg, 5%); @end-color: darken(@navbar-default-link-active-bg, 2%));
     .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
   }
 }
@@ -132,7 +136,7 @@
 
   .navbar-nav > .open > a,
   .navbar-nav > .active > a {
-    #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
+    #gradient > .vertical(@start-color: @navbar-inverse-link-active-bg; @end-color: lighten(@navbar-inverse-link-active-bg, 2.5%));
     .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
   }