mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 19:06:40 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-06-15 11:46:13 -07:00
parent 258e1d62fb
commit 6ce154c7ed
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/assets/css/bootstrap.css vendored
View File

@@ -1292,7 +1292,7 @@ input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"] { input[type="color"] {
display: block; display: block;
min-height: 36px; min-height: 38px;
padding: 8px 12px; padding: 8px 12px;
font-size: 14px; font-size: 14px;
line-height: 1.428571429; line-height: 1.428571429;
@@ -1368,10 +1368,10 @@ input[type="checkbox"] {
select, select,
input[type="file"] { 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 */ /* 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], select[multiple],
@@ -1505,7 +1505,7 @@ input[type="url"].input-small,
input[type="search"].input-small, input[type="search"].input-small,
input[type="tel"].input-small, input[type="tel"].input-small,
input[type="color"].input-small { input[type="color"].input-small {
min-height: 30px; min-height: 32px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
border-radius: 3px; border-radius: 3px;
@@ -3532,8 +3532,8 @@ button.close {
} }
.navbar-form { .navbar-form {
margin-top: 7px; margin-top: 6px;
margin-bottom: 7px; margin-bottom: 6px;
} }
.navbar-form input, .navbar-form input,
@@ -3704,7 +3704,7 @@ button.close {
} }
.navbar-btn { .navbar-btn {
margin-top: 7px; margin-top: 6px;
} }
.navbar-text { .navbar-text {

6
less/variables.less
View File

@@ -127,9 +127,9 @@
@input-color-placeholder: @gray-light; @input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2)); @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (@line-height-computed + (@padding-large-vertical * 2)); @input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 2);
@input-height-small: (@line-height-computed + (@padding-small-vertical * 2)); @input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2);
// Dropdowns // Dropdowns