Merge branch 'master' into derp

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

1 files changed, 30 insertions, 1 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 03ce95b82..305efb9bd 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1606,7 +1606,6 @@ table th[class*="col-"] {
     width: 100%;
     margin-bottom: 18px;
     overflow-y: hidden;
-    -webkit-overflow-scrolling: touch;
     -ms-overflow-style: -ms-autohiding-scrollbar;
     border: 1px solid #eceeef;
   }
@@ -1798,6 +1797,36 @@ input[type="month"].input-lg {
   line-height: 3.2625rem;
   line-height: 1.33 \0;
 }
+_:-ms-fullscreen,
+:root input[type="date"],
+_:-ms-fullscreen,
+:root input[type="time"],
+_:-ms-fullscreen,
+:root input[type="datetime-local"],
+_:-ms-fullscreen,
+:root input[type="month"] {
+  line-height: 1.5;
+}
+_:-ms-fullscreen.input-sm,
+:root input[type="date"].input-sm,
+_:-ms-fullscreen.input-sm,
+:root input[type="time"].input-sm,
+_:-ms-fullscreen.input-sm,
+:root input[type="datetime-local"].input-sm,
+_:-ms-fullscreen.input-sm,
+:root input[type="month"].input-sm {
+  line-height: 1.5;
+}
+_:-ms-fullscreen.input-lg,
+:root input[type="date"].input-lg,
+_:-ms-fullscreen.input-lg,
+:root input[type="time"].input-lg,
+_:-ms-fullscreen.input-lg,
+:root input[type="datetime-local"].input-lg,
+_:-ms-fullscreen.input-lg,
+:root input[type="month"].input-lg {
+  line-height: 1.33;
+}
 .form-group {
   margin-bottom: 15px;
 }