Fixes #12669: Properly reset line-height on date inputs for all sizes…

…; Fix IE8+'s misaslignment of text within date inputs
twbs · Mar 10, 2014 · 2f95590 · 2f95590
1 parent 37b342b
commit 2f95590
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 8 deletions.
diff --git a/dist/css/bootstrap-rtl.css b/dist/css/bootstrap-rtl.css
diff --git a/dist/css/bootstrap-rtl.min.css b/dist/css/bootstrap-rtl.min.css
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/docs/assets/js/customize.min.js b/docs/assets/js/customize.min.js
diff --git a/docs/dist/css/bootstrap-rtl.min.css b/docs/dist/css/bootstrap-rtl.min.css
diff --git a/docs/dist/css/bootstrap.css.map b/docs/dist/css/bootstrap.css.map
diff --git a/docs/dist/css/bootstrap.min.css b/docs/dist/css/bootstrap.min.css
diff --git a/less/forms.less b/less/forms.less
@@ -167,10 +167,20 @@ input[type="search"] {
 // Special styles for iOS date input
 //
 // In Mobile Safari, date inputs require a pixel line-height that matches the
-// given height of the input.
+// given height of the input. Since this fucks up everything else, we have to
+// appropriately reset it for Internet Explorer and the size variations.
 
 input[type="date"] {
   line-height: @input-height-base;
+  // IE8+ misaligns the text within date inputs, so we reset
+  line-height: @line-height-base ~"\0";
+
+  &.input-sm {
+    line-height: @input-height-small;
+  }
+  &.input-lg {
+    line-height: @input-height-large;
+  }
 }