Fixes #8175: Update input min-height vars to fix FF21 input rendering

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index f9f1fb93208e3b220530fd3b55e9c2bfc15d045f..33833789ca47f655db992ac181dea694c66b7ef4 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1292,7 +1292,7 @@ input[type="search"],
 input[type="tel"],
 input[type="color"] {
   display: block;
-  min-height: 36px;
+  min-height: 38px;
   padding: 8px 12px;
   font-size: 14px;
   line-height: 1.428571429;
@@ -1368,10 +1368,10 @@ input[type="checkbox"] {
 
 select,
 input[type="file"] {
-  height: 36px;
+  height: 38px;
   /* In IE7, the height of the select element cannot be changed by height, only font-size. TODO: Check if this is still needed when dropping IE7 support */
 
-  line-height: 36px;
+  line-height: 38px;
 }
 
 select[multiple],
@@ -1505,7 +1505,7 @@ input[type="url"].input-small,
 input[type="search"].input-small,
 input[type="tel"].input-small,
 input[type="color"].input-small {
-  min-height: 30px;
+  min-height: 32px;
   padding: 5px 10px;
   font-size: 12px;
   border-radius: 3px;
@@ -3532,8 +3532,8 @@ button.close {
 }
 
 .navbar-form {
-  margin-top: 7px;
-  margin-bottom: 7px;
+  margin-top: 6px;
+  margin-bottom: 6px;
 }
 
 .navbar-form input,
@@ -3704,7 +3704,7 @@ button.close {
 }
 
 .navbar-btn {
-  margin-top: 7px;
+  margin-top: 6px;
 }
 
 .navbar-text {

diff --git a/less/variables.less b/less/variables.less
index f9c32c14844b8eb4fcb925fc2464cf164daa8e95..765dff6a0ca50e795bdc4b35ea8a0b3450401bb9 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -127,9 +127,9 @@
 
 @input-color-placeholder:        @gray-light;
 
-@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2));
-@input-height-large:             (@line-height-computed + (@padding-large-vertical * 2));
-@input-height-small:             (@line-height-computed + (@padding-small-vertical * 2));
+@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+@input-height-large:             (@line-height-computed + (@padding-large-vertical * 2) + 2);
+@input-height-small:             (@line-height-computed + (@padding-small-vertical * 2) + 2);
 
 
 // Dropdowns