Merge branch 'master' into pr/11648

Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less

10 files changed, 48 insertions, 52 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 0a07a4bc8..87f643d74 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -147,7 +147,8 @@
 
 .btn-group-vertical {
   > .btn,
-  > .btn-group {
+  > .btn-group,
+  > .btn-group > .btn {
     display: block;
     float: none;
     width: 100%;
diff --git a/less/grid.less b/less/grid.less
index e1f134e6d..279d80368 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -28,8 +28,8 @@
 
 // Extra small grid
 //
-// Grid classes for extra small devices like smartphones. No offset, push, or
-// pull classes are present here due to the size of the target.
+// Columns, offsets, pushes, and pulls for extra small devices like
+// smartphones.
 
 .make-grid-columns-float(xs);
 .make-grid(@grid-columns, xs, width);
diff --git a/less/input-groups.less b/less/input-groups.less
index 8516a79e9..d19c4c64a 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -10,7 +10,7 @@
   border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
 
   // Undo padding and float of grid classes
-  &.col {
+  &[class*="col-"] {
     float: none;
     padding-left: 0;
     padding-right: 0;
diff --git a/less/jumbotron.less b/less/jumbotron.less
index 22c29780a..0460b69d4 100644
--- a/less/jumbotron.less
+++ b/less/jumbotron.less
@@ -12,7 +12,8 @@
   color: @jumbotron-color;
   background-color: @jumbotron-bg;
 
-  h1 {
+  h1,
+  .h1 {
     line-height: 1;
     color: @jumbotron-heading-color;
   }
@@ -24,6 +25,10 @@
     border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
   }
 
+  .container {
+    max-width: 100%;
+  }
+
   @media screen and (min-width: @screen-sm-min) {
     padding-top:    (@jumbotron-padding * 1.6);
     padding-bottom: (@jumbotron-padding * 1.6);
@@ -33,7 +38,8 @@
       padding-right: (@jumbotron-padding * 2);
     }
 
-    h1 {
+    h1,
+    .h1 {
       font-size: (@font-size-base * 4.5);
     }
   }
diff --git a/less/mixins.less b/less/mixins.less
index f74d22b29..51a4cc5a4 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -19,8 +19,8 @@
 .clearfix() {
   &:before,
   &:after {
-    content: " "; /* 1 */
-    display: table; /* 2 */
+    content: " "; // 1
+    display: table; // 2
   }
   &:after {
     clear: both;
@@ -428,27 +428,27 @@
 
 // Tables
 // -------------------------
-.table-row-variant(@state; @background; @border) {
+.table-row-variant(@state; @background) {
   // Exact selectors below required to override `.table-striped` and prevent
   // inheritance to nested tables.
-  .table > thead > tr,
-  .table > tbody > tr,
-  .table > tfoot > tr {
-    > td.@{state},
-    > th.@{state},
-    &.@{state} > td,
-    &.@{state} > th {
-      background-color: @background;
+  .table {
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr > .@{state},
+      > .@{state} > td,
+      > .@{state} > th {
+        background-color: @background;
+      }
     }
   }
 
   // Hover states for `.table-hover`
   // Note: this is not available for cells or rows within `thead` or `tfoot`.
-  .table-hover > tbody > tr {
-    > td.@{state}:hover,
-    > th.@{state}:hover,
-    &.@{state}:hover > td,
-    &.@{state}:hover > th {
+  .table-hover > tbody {
+    > tr > .@{state}:hover,
+    > .@{state}:hover > td,
+    > .@{state}:hover > th {
       background-color: darken(@background, 5%);
     }
   }
diff --git a/less/modals.less b/less/modals.less
index 99cf76469..e65dbf7f1 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -35,10 +35,8 @@
 // Shell div to position the modal with bottom padding
 .modal-dialog {
   position: relative;
-  margin-left: auto;
-  margin-right: auto;
   width: auto;
-  padding: 10px;
+  margin: 10px;
   z-index: (@zindex-modal-background + 10);
 }
 
@@ -122,8 +120,7 @@
 
   .modal-dialog {
     width: 600px;
-    padding-top: 30px;
-    padding-bottom: 30px;
+    margin: 30px auto;
   }
   .modal-content {
     .box-shadow(0 5px 15px rgba(0,0,0,.5));
diff --git a/less/navbar.less b/less/navbar.less
index a1d3bddb7..bae180be7 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -180,6 +180,7 @@
   padding: 9px 10px;
   .navbar-vertical-align(34px);
   background-color: transparent;
+  background-image: none; // Fix for at least Firefox on Android, per #11468
   border: 1px solid transparent;
   border-radius: @border-radius-base;
 
diff --git a/less/tables.less b/less/tables.less
index 4c4284cb1..7192c4d5e 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -152,25 +152,11 @@ table {
 // Exact selectors below required to override `.table-striped` and prevent
 // inheritance to nested tables.
 
-.table {
-  > thead,
-  > tbody,
-  > tfoot {
-    > tr {
-      > td.active,
-      > th.active,
-      &.active > td,
-      &.active > th  {
-        background-color: @table-bg-active;
-      }
-    }
-  }
-}
-
 // Generate the contextual variants
-.table-row-variant(success; @state-success-bg; @state-success-border);
-.table-row-variant(danger; @state-danger-bg; @state-danger-border);
-.table-row-variant(warning; @state-warning-bg; @state-warning-border);
+.table-row-variant(active; @table-bg-active);
+.table-row-variant(success; @state-success-bg);
+.table-row-variant(danger; @state-danger-bg);
+.table-row-variant(warning; @state-warning-bg);
 
 
 // Responsive tables
diff --git a/less/thumbnails.less b/less/thumbnails.less
index bc4178bbf..43e7d1d26 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -5,9 +5,14 @@
 
 // Mixin and adjust the regular image class
 .thumbnail {
-  .img-thumbnail();
-  display: block; // Override the inline-block from `.img-thumbnail`
+  display: block;
+  padding: @thumbnail-padding;
   margin-bottom: @line-height-computed;
+  line-height: @line-height-base;
+  background-color: @thumbnail-bg;
+  border: 1px solid @thumbnail-border;
+  border-radius: @thumbnail-border-radius;
+  .transition(all .2s ease-in-out);
 
   > img {
     .img-responsive();
diff --git a/less/variables.less b/less/variables.less
index cf217b366..120a65e06 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -157,7 +157,7 @@
 @input-color-placeholder:        @gray-light;
 
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large:             (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
 @input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
 
 @legend-color:                   @gray-dark;
@@ -372,19 +372,19 @@
 // Form states and alerts
 // -------------------------
 
-@state-success-text:             #468847;
+@state-success-text:             #3c763d;
 @state-success-bg:               #dff0d8;
 @state-success-border:           darken(spin(@state-success-bg, -10), 5%);
 
-@state-info-text:                #3a87ad;
+@state-info-text:                #31708f;
 @state-info-bg:                  #d9edf7;
 @state-info-border:              darken(spin(@state-info-bg, -10), 7%);
 
-@state-warning-text:             #c09853;
+@state-warning-text:             #8a6d3b;
 @state-warning-bg:               #fcf8e3;
 @state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);
 
-@state-danger-text:              #b94a48;
+@state-danger-text:              #a94442;
 @state-danger-bg:                #f2dede;
 @state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);