kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Fixes #12486: Restore full width inputs for input groups in inline forms and navbars

This commit is contained in:
Mark Otto 2014-02-07 02:58:10 -08:00
parent cae76171d0
commit 4d7b2ddba9
6 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/css/bootstrap.css vendored
View File

@ -1723,6 +1723,7 @@ output {
.form-control::-webkit-input-placeholder {
color: #999;
}
.form-control:disabled,
.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
@ -1939,6 +1940,9 @@ select[multiple].input-lg {
width: auto;
vertical-align: middle;
}
.form-inline .input-group > .form-control {
width: 100%;
}
.form-inline .control-label {
margin-bottom: 0;
vertical-align: middle;
@ -3854,6 +3858,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
width: auto;
vertical-align: middle;
}
.navbar-form .input-group > .form-control {
width: 100%;
}
.navbar-form .control-label {
margin-bottom: 0;
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/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

15
less/forms.less
View File

@ -133,9 +133,14 @@ output {
.placeholder();
// Disabled and read-only inputs
// Note: HTML5 says that controls under a fieldset > legend:first-child won't
// be disabled if the fieldset is disabled. Due to implementation difficulty,
// we don't honor that edge case; we style them as disabled anyway.
//
// HTML5 says that controls under a fieldset > legend:first-child won't be
// disabled if the fieldset is disabled. Due to implementation difficulty, we
// don't honor that edge case; we style them as disabled anyway.
//
// Also note that we include `[disabled]` for IE8. All other browsers take the
// `:disabled` selector.
&:disabled,
&[disabled],
&[readonly],
fieldset[disabled] & {
@ -348,6 +353,10 @@ input[type="checkbox"],
width: auto; // Prevent labels from stacking above inputs in `.form-group`
vertical-align: middle;
}
// Input groups need that 100% width though
.input-group > .form-control {
width: 100%;
}
.control-label {
margin-bottom: 0;