Merge branch 'master' into v4

16 files changed, 74 insertions, 57 deletions

diff --git a/scss/_badge.scss b/scss/_badge.scss
index 53781160a..5646da722 100644
--- a/scss/_badge.scss
+++ b/scss/_badge.scss
@@ -14,6 +14,7 @@
   color: $badge-color;
   line-height: $line-height-base;
   text-align: center;
+  vertical-align: middle;
   white-space: nowrap;
   background-color: $badge-bg;
   @include border-radius($badge-border-radius);
diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index 187166b00..96c3cc565 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -183,11 +183,11 @@
     border-radius: 0;
   }
   &:first-child:not(:last-child) {
-    border-top-right-radius: $border-radius-base;
+    border-top-right-radius: $btn-border-radius-base;
     @include border-bottom-radius(0);
   }
   &:last-child:not(:first-child) {
-    border-bottom-left-radius: $border-radius-base;
+    border-bottom-left-radius: $btn-border-radius-base;
     @include border-top-radius(0);
   }
 }
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index addc7b246..23a5b8a77 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -17,7 +17,7 @@
   cursor: pointer;
   user-select: none;
   border: $border-width solid transparent;
-  @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
+  @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
   transition: all .2s ease-in-out;
 
   &,
@@ -130,14 +130,14 @@ fieldset[disabled] a.btn {
 
 .btn-lg {
   // line-height: ensure even-numbered height of button next to large input
-  @include button-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $border-radius-lg);
+  @include button-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
 }
 .btn-sm {
   // line-height: ensure proper height of button next to small input
-  @include button-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $border-radius-sm);
+  @include button-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
 }
 .btn-xs {
-  @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-sm, $border-radius-sm);
+  @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-sm, $btn-border-radius-sm);
 }
 
 
diff --git a/scss/_carousel.scss b/scss/_carousel.scss
index 25d0650cf..39a779f85 100644
--- a/scss/_carousel.scss
+++ b/scss/_carousel.scss
@@ -29,7 +29,7 @@
     @media all and (transform-3d), (-webkit-transform-3d) {
       transition: transform .6s ease-in-out;
       backface-visibility: hidden;
-      perspective: 1000;
+      perspective: 1000px;
 
       &.next,
       &.active.right {
@@ -128,6 +128,7 @@
   .icon-next {
     position: absolute;
     top: 50%;
+    margin-top: -10px;
     z-index: 5;
     display: inline-block;
     width: 20px;
@@ -144,6 +145,7 @@
     right: 50%;
     margin-right: -10px;
   }
+
   .icon-prev {
     &:before {
       content: "\2039";// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 78ca70295..e3959d7d4 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -33,6 +33,12 @@
     height: $input-height-base;
   }
 
+  // Unstyle the caret on `<select>`s in IE10+.
+  &::-ms-expand {
+    border: 0;
+    background-color: transparent;
+  }
+
   // Customize the `:focus` state to imitate native WebKit styles.
   @include form-control-focus();
 
@@ -91,24 +97,26 @@
 // set a pixel line-height that matches the given height of the input, but only
 // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
 
-// @media screen and (-webkit-min-device-pixel-ratio: 0) {
-//   input[type="date"],
-//   input[type="time"],
-//   input[type="datetime-local"],
-//   input[type="month"] {
-//     line-height: $input-height-base;
-
-//     &.input-sm,
-//     .input-group-sm & {
-//       line-height: $input-height-sm;
-//     }
-
-//     &.input-lg,
-//     .input-group-lg & {
-//       line-height: $input-height-lg;
-//     }
-//   }
-// }
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  input[type="date"],
+  input[type="time"],
+  input[type="datetime-local"],
+  input[type="month"] {
+    &.form-control {
+      line-height: $input-height-base;
+    }
+
+    &.input-sm,
+    .input-group-sm &.form-control {
+      line-height: $input-height-sm;
+    }
+
+    &.input-lg,
+    .input-group-lg &.form-control {
+      line-height: $input-height-lg;
+    }
+  }
+}
 
 
 // Static form control text
diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 30786ae01..8d1a238c7 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -179,6 +179,7 @@
   &:last-child {
     > .btn,
     > .btn-group {
+      z-index: 2;
       margin-left: -1px;
     }
   }
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index 0dd7afb82..a6c133729 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -45,12 +45,13 @@
 }
 
 
-// Linked list items
+// Interactive list items
 //
-// Use anchor elements instead of `li`s or `div`s to create linked list items.
-// Includes an extra `.active` modifier class for showing selected items.
+// Use anchor or button elements instead of `li`s or `div`s to create interactive
+// list items. Includes an extra `.active` modifier class for selected items.
 
-a.list-group-item {
+a.list-group-item,
+button.list-group-item {
   color: $list-group-link-color;
 
   .list-group-item-heading {
diff --git a/scss/_media.scss b/scss/_media.scss
index afa50b9b3..f4093f138 100644
--- a/scss/_media.scss
+++ b/scss/_media.scss
@@ -47,6 +47,11 @@
 
 .media-object {
   display: block;
+  
+  // Fix collapse in webkit from max-width: 100% and display: table-cell.
+  &.img-thumbnail {
+    max-width: none;
+  }
 }
 
 
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 57450eeb2..41ddd122c 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -35,6 +35,7 @@
 @import "mixins/screen-reader";
 @import "mixins/size";
 @import "mixins/tab-focus";
+@import "mixins/reset-text";
 @import "mixins/text-emphasis";
 @import "mixins/text-truncate";
 
diff --git a/scss/_normalize.scss b/scss/_normalize.scss
index 135fe2a3a..ef23245cb 100644
--- a/scss/_normalize.scss
+++ b/scss/_normalize.scss
@@ -1,9 +1,9 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 
 //
 // 1. Set default font family to sans-serif.
-// 2. Prevent iOS text size adjust after orientation change, without disabling
-//    user zoom.
+// 2. Prevent iOS and IE text size adjust after device orientation change,
+//    without disabling user zoom.
 //
 
 html {
@@ -71,7 +71,7 @@ audio:not([controls]) {
 
 //
 // Address `[hidden]` styling not present in IE 8/9/10.
-// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+// Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
 //
 
 [hidden],
@@ -91,7 +91,8 @@ a {
 }
 
 //
-// Improve readability when focused and also mouse hovered in all browsers.
+// Improve readability of focused elements when they are also in an
+// active/hover state.
 //
 
 a {
@@ -213,7 +214,6 @@ figure {
 //
 
 hr {
-  -moz-box-sizing: content-box;
   box-sizing: content-box;
   height: 0;
 }
@@ -354,15 +354,12 @@ input[type="number"]::-webkit-outer-spin-button {
 
 //
 // 1. Address `appearance` set to `searchfield` in Safari and Chrome.
-// 2. Address `box-sizing` set to `border-box` in Safari and Chrome
-//    (include `-moz` to future-proof).
+// 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
 //
 
 input[type="search"] {
   -webkit-appearance: textfield; // 1
-  -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box; // 2
-  box-sizing: content-box;
+  box-sizing: content-box; //2
 }
 
 //
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 381ffe6d6..d52bda41b 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -79,9 +79,9 @@
 //
 
 .pagination-lg {
-  @include pagination-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $border-radius-lg);
+  @include pagination-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $border-radius-lg);
 }
 
 .pagination-sm {
-  @include pagination-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $border-radius-sm);
+  @include pagination-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $border-radius-sm);
 }
diff --git a/scss/_popover.scss b/scss/_popover.scss
index f0152ccf6..0439a1cf1 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -11,14 +11,10 @@
   display: block;
   max-width: $popover-max-width;
   padding: 1px;
-  // Reset font and text properties given new insertion method
-  font-family: $font-family-base;
-  font-size: $font-size-base;
-  font-weight: normal;
-  line-height: $line-height-base;
-  text-align: left;
-  // Overrides for proper insertion
-  white-space: normal;
+  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
+  // So reset our font and text properties to avoid inheriting weird values.
+  @include reset-text();
+  font-size: $font-size-sm;
   background-color: $popover-bg;
   background-clip: padding-box;
   border: 1px solid $popover-border-color;
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
index 7b15fe5a3..7093f956c 100644
--- a/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@ -8,11 +8,10 @@
   position: absolute;
   z-index: $zindex-tooltip;
   display: block;
-  // Reset font and text properties given new insertion method
-  font-family: $font-family-base;
+  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
+  // So reset our font and text properties to avoid inheriting weird values.
+  @include reset-text();
   font-size: $font-size-sm;
-  font-weight: normal;
-  line-height: 1.4;
   opacity: 0;
 
   &.in { opacity: $tooltip-opacity; }
@@ -77,7 +76,6 @@
   padding: 3px 8px;
   color: $tooltip-color;
   text-align: center;
-  text-decoration: none;
   background-color: $tooltip-bg;
   @include border-radius($border-radius-base);
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 346c3c184..103599f68 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -169,6 +169,11 @@ $btn-danger-border:              darken($btn-danger-bg, 5%) !default;
 
 $btn-link-disabled-color:        $gray-light !default;
 
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius-base:         $border-radius-base;
+$btn-border-radius-large:        $border-radius-large;
+$btn-border-radius-small:        $border-radius-small;
+
 
 // Forms
 
diff --git a/scss/mixins/_list-group.scss b/scss/mixins/_list-group.scss
index 1f17729b0..a40dda96d 100644
--- a/scss/mixins/_list-group.scss
+++ b/scss/mixins/_list-group.scss
@@ -6,7 +6,8 @@
     background-color: $background;
   }
 
-  a.list-group-item-#{state} {
+  a.list-group-item-#{state},
+  button.list-group-item-#{state} {
     color: $color;
 
     .list-group-item-heading {
diff --git a/scss/mixins/_pagination.scss b/scss/mixins/_pagination.scss
index 43fff6863..d4a5404fc 100644
--- a/scss/mixins/_pagination.scss
+++ b/scss/mixins/_pagination.scss
@@ -1,11 +1,12 @@
 // Pagination
 
-@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
+@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
   > li {
     > a,
     > span {
       padding: $padding-vertical $padding-horizontal;
       font-size: $font-size;
+      line-height: $line-height;
     }
     &:first-child {
       > a,