rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Fixes #14221: Make .form-control-static work in inline forms as well

Browse Source
This commit is contained in:
Mark Otto 2014-07-23 20:54:07 -07:00
parent abbb4d64e1
commit 078aafe7fd
8 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/css/bootstrap.css vendored
View File

@ -2671,6 +2671,9 @@ select[multiple].form-group-lg .form-control {
width: auto; width: auto;
vertical-align: middle; vertical-align: middle;
} }
.form-inline .form-control-static {
display: inline-block;
}
.form-inline .input-group { .form-inline .input-group {
display: inline-table; display: inline-table;
vertical-align: middle; vertical-align: middle;
@ -4045,6 +4048,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
width: auto; width: auto;
vertical-align: middle; vertical-align: middle;
} }
.navbar-form .form-control-static {
display: inline-block;
}
.navbar-form .input-group { .navbar-form .input-group {
display: inline-table; display: inline-table;
vertical-align: middle; vertical-align: middle;

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
docs/assets/css/docs.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
docs/dist/css/bootstrap.css vendored
View File

@ -2671,6 +2671,9 @@ select[multiple].form-group-lg .form-control {
width: auto; width: auto;
vertical-align: middle; vertical-align: middle;
} }
.form-inline .form-control-static {
display: inline-block;
}
.form-inline .input-group { .form-inline .input-group {
display: inline-table; display: inline-table;
vertical-align: middle; vertical-align: middle;
@ -4045,6 +4048,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
width: auto; width: auto;
vertical-align: middle; vertical-align: middle;
} }
.navbar-form .form-control-static {
display: inline-block;
}
.navbar-form .input-group { .navbar-form .input-group {
display: inline-table; display: inline-table;
vertical-align: middle; vertical-align: middle;

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

5
less/forms.less
View File

@ -421,6 +421,11 @@ input[type="checkbox"] {
vertical-align: middle; vertical-align: middle;
} }
// Make static controls behave like regular ones
.form-control-static {
display: inline-block;
}
.input-group { .input-group {
display: inline-table; display: inline-table;
vertical-align: middle; vertical-align: middle;