mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Fixes #12486: Restore full width inputs for input groups in inline forms and navbars
This commit is contained in:
Vendored
+7
@@ -1723,6 +1723,7 @@ output {
|
|||||||
.form-control::-webkit-input-placeholder {
|
.form-control::-webkit-input-placeholder {
|
||||||
color: #999;
|
color: #999;
|
||||||
}
|
}
|
||||||
|
.form-control:disabled,
|
||||||
.form-control[disabled],
|
.form-control[disabled],
|
||||||
.form-control[readonly],
|
.form-control[readonly],
|
||||||
fieldset[disabled] .form-control {
|
fieldset[disabled] .form-control {
|
||||||
@@ -1939,6 +1940,9 @@ select[multiple].input-lg {
|
|||||||
width: auto;
|
width: auto;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
.form-inline .input-group > .form-control {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
.form-inline .control-label {
|
.form-inline .control-label {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
@@ -3854,6 +3858,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
|
|||||||
width: auto;
|
width: auto;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
.navbar-form .input-group > .form-control {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
.navbar-form .control-label {
|
.navbar-form .control-label {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
|||||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
+12
-3
@@ -133,9 +133,14 @@ output {
|
|||||||
.placeholder();
|
.placeholder();
|
||||||
|
|
||||||
// Disabled and read-only inputs
|
// 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,
|
// HTML5 says that controls under a fieldset > legend:first-child won't be
|
||||||
// we don't honor that edge case; we style them as disabled anyway.
|
// 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],
|
&[disabled],
|
||||||
&[readonly],
|
&[readonly],
|
||||||
fieldset[disabled] & {
|
fieldset[disabled] & {
|
||||||
@@ -348,6 +353,10 @@ input[type="checkbox"],
|
|||||||
width: auto; // Prevent labels from stacking above inputs in `.form-group`
|
width: auto; // Prevent labels from stacking above inputs in `.form-group`
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
// Input groups need that 100% width though
|
||||||
|
.input-group > .form-control {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.control-label {
|
.control-label {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user