Merge branch 'master' into v4

Conflicts:
	_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
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	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/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss

6 files changed, 23 insertions, 6 deletions

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index 7c17faf38..839ce2587 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -75,13 +75,13 @@
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group > .btn-group:first-child {
+.btn-group > .btn-group:first-child:not(:last-child) {
   > .btn:last-child,
   > .dropdown-toggle {
     @include border-right-radius(0);
   }
 }
-.btn-group > .btn-group:last-child > .btn:first-child {
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
   @include border-left-radius(0);
 }
 
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 8f75cbec1..41485acd3 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -102,7 +102,7 @@
   &:hover,
   &:focus {
     color: $link-hover-color;
-    text-decoration: underline;
+    text-decoration: $link-hover-decoration;
     background-color: transparent;
   }
   &:disabled,
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index bd96d8f22..8abea3c41 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -3,6 +3,7 @@
 // --------------------------------------------------
 
 // The dropdown wrapper (div)
+.dropup,
 .dropdown {
   position: relative;
 }
diff --git a/scss/_forms.scss b/scss/_forms.scss
index f385c152f..60338b646 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -121,8 +121,9 @@ output {
   line-height: $line-height-base;
   color: $input-color;
   background-color: $input-bg;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid $input-border;
-  @include border-radius($input-border-radius);
+  @include border-radius($input-border-radius); // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 
@@ -319,12 +320,27 @@ input[type="checkbox"] {
 
 .form-group-sm {
   @include input-size('.form-control', $input-height-sm, $padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $input-border-radius-sm);
+
+  .form-control-static {
+    height: $input-height-sm;
+    padding: $padding-sm-vertical $padding-sm-horizontal;
+    font-size: $font-size-sm;
+    line-height: $line-height-sm;
+  }
+}
 }
 
 @include input-size('.input-lg', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg);
 
 .form-group-lg {
   @include input-size('.form-control', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg);
+
+  .form-control-static {
+    height: $input-height-lg;
+    padding: $padding-lg-vertical $padding-lg-horizontal;
+    font-size: $font-size-lg;
+    line-height: $line-height-lg;
+  }
 }
 
 
diff --git a/scss/_tables.scss b/scss/_tables.scss
index 8de4e4c5e..149723736 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -88,7 +88,7 @@ th {
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
 .table-striped {
-  tbody tr:nth-child(odd) {
+  tbody tr:nth-of-type(odd) {
     background-color: $table-bg-accent;
   }
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 4b515d3a4..518affebf 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -103,7 +103,7 @@ $padding-sm-horizontal:  .75rem !default;
 $padding-xs-vertical:       .2rem !default;
 $padding-xs-horizontal:     .5rem !default;
 
-$line-height-lg:         1.33 !default;
+$line-height-lg:         1.3333333 !default;
 $line-height-sm:         1.5 !default;
 
 $border-radius-base:        .25rem !default;