Skip to content
GitLab
Commit 58cb7c63 authored by Mark Otto's avatar Mark Otto
Browse files

simplify code for input-prepend/append in inline and search forms

parent 91eef351
1 merge request!1952Tabulation navigation with Typeahead
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 11 deletions
+13 -11
docs/assets/bootstrap.zip
+ 0
- 0
View file @ 58cb7c63
No preview for this file type
docs/assets/css/bootstrap.css
+ 6
- 5
View file @ 58cb7c63
...@@ -982,6 +982,7 @@ select:focus:required:invalid:focus { ...@@ -982,6 +982,7 @@ select:focus:required:invalid:focus {
} }
.input-prepend, .input-prepend,
.input-append { .input-append {
display: inline-block;
margin-bottom: 5px; margin-bottom: 5px;
} }
.input-prepend input, .input-prepend input,
...@@ -1087,11 +1088,11 @@ select:focus:required:invalid:focus { ...@@ -1087,11 +1088,11 @@ select:focus:required:invalid:focus {
.form-inline .input-prepend { .form-inline .input-prepend {
display: inline-block; display: inline-block;
} }
.form-search .input-append .add-on, .form-search .input-append,
.form-search .input-prepend .add-on, .form-inline .input-append,
.form-inline .input-append .add-on, .form-search .input-prepend,
.form-inline .input-prepend .add-on { .form-inline .input-prepend {
vertical-align: middle; margin-bottom: 0;
} }
.form-search .radio, .form-search .radio,
.form-search .checkbox, .form-search .checkbox,
......
less/forms.less
+ 7
- 6
View file @ 58cb7c63
...@@ -361,6 +361,7 @@ select:focus:required:invalid { ...@@ -361,6 +361,7 @@ select:focus:required:invalid {
// Allow us to put symbols and text within the input field for a cleaner look // Allow us to put symbols and text within the input field for a cleaner look
.input-prepend, .input-prepend,
.input-append { .input-append {
display: inline-block;
margin-bottom: 5px; margin-bottom: 5px;
input, input,
select, select,
...@@ -456,12 +457,12 @@ select:focus:required:invalid { ...@@ -456,12 +457,12 @@ select:focus:required:invalid {
.form-inline .input-prepend { .form-inline .input-prepend {
display: inline-block; display: inline-block;
} }
// Make the prepend and append add-on vertical-align: middle; // Remove margin for input-prepend/-append
.form-search .input-append .add-on, .form-search .input-append,
.form-search .input-prepend .add-on, .form-inline .input-append,
.form-inline .input-append .add-on, .form-search .input-prepend,
.form-inline .input-prepend .add-on { .form-inline .input-prepend {
vertical-align: middle; margin-bottom: 0;
} }
// Inline checkbox/radio labels (remove padding on left) // Inline checkbox/radio labels (remove padding on left)
.form-search .radio, .form-search .radio,
......
Supports Markdown
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