root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs

This commit is contained in:
Mark Otto 2013-12-08 01:59:44 -08:00
parent f4087df47e
commit b5008ebf9c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/css/bootstrap.css vendored
View File

@ -2177,6 +2177,7 @@ textarea.input-lg {
}
.form-inline .form-control {
display: inline-block;
vertical-align: middle;
}
.form-inline select.form-control {
width: auto;
@ -2187,6 +2188,7 @@ textarea.input-lg {
padding-left: 0;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .radio input[type="radio"],
.form-inline .checkbox input[type="checkbox"] {
@ -4609,6 +4611,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-form .form-control {
display: inline-block;
vertical-align: middle;
}
.navbar-form select.form-control {
width: auto;
@ -4619,6 +4622,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
padding-left: 0;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.navbar-form .radio input[type="radio"],
.navbar-form .checkbox input[type="checkbox"] {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/forms.less
View File

@ -303,6 +303,7 @@ input[type="checkbox"],
// In navbar-form, allow folks to *not* use `.form-group`
.form-control {
display: inline-block;
vertical-align: middle;
}
// Override `width: 100%;` when not within a `.form-group`
@ -319,6 +320,7 @@ input[type="checkbox"],
margin-top: 0;
margin-bottom: 0;
padding-left: 0;
vertical-align: middle;
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {