Commit 078aafe7 authored by Mark Otto's avatar Mark Otto

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

parent abbb4d64
...@@ -2671,6 +2671,9 @@ select[multiple].form-group-lg .form-control { ...@@ -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 { ...@@ -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;
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -2671,6 +2671,9 @@ select[multiple].form-group-lg .form-control { ...@@ -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 { ...@@ -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;
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -421,6 +421,11 @@ input[type="checkbox"] { ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment