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

mdo · mdo · commit 58cb7c631ddd · 2012-03-11T23:12:45.000-07:00
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
@@ -982,6 +982,7 @@ select:focus:required:invalid:focus {
 }
 .input-prepend,
 .input-append {
+  display: inline-block;
   margin-bottom: 5px;
 }
 .input-prepend input,
@@ -1087,11 +1088,11 @@ select:focus:required:invalid:focus {
 .form-inline .input-prepend {
   display: inline-block;
 }
-.form-search .input-append .add-on,
-.form-search .input-prepend .add-on,
-.form-inline .input-append .add-on,
-.form-inline .input-prepend .add-on {
-  vertical-align: middle;
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
 }
 .form-search .radio,
 .form-search .checkbox,
diff --git a/less/forms.less b/less/forms.less
@@ -361,6 +361,7 @@ select:focus:required:invalid {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
+  display: inline-block;
   margin-bottom: 5px;
   input,
   select,
@@ -456,12 +457,12 @@ select:focus:required:invalid {
 .form-inline .input-prepend {
   display: inline-block;
 }
-// Make the prepend and append add-on vertical-align: middle;
-.form-search .input-append .add-on,
-.form-search .input-prepend .add-on,
-.form-inline .input-append .add-on,
-.form-inline .input-prepend .add-on {
-  vertical-align: middle;
+// Remove margin for input-prepend/-append
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
 }
 // Inline checkbox/radio labels (remove padding on left)
 .form-search .radio,

Original file line number	Diff line number	Diff line change
`@@ -982,6 +982,7 @@ select:focus:required:invalid:focus {`
`982`	`982`	`}`
`983`	`983`	`.input-prepend,`
`984`	`984`	`.input-append {`
	`985`	`+ display: inline-block;`
`985`	`986`	`margin-bottom: 5px;`
`986`	`987`	`}`
`987`	`988`	`.input-prepend input,`
`@@ -1087,11 +1088,11 @@ select:focus:required:invalid:focus {`
`1087`	`1088`	`.form-inline .input-prepend {`
`1088`	`1089`	`display: inline-block;`
`1089`	`1090`	`}`
`1090`		`-.form-search .input-append .add-on,`
`1091`		`-.form-search .input-prepend .add-on,`
`1092`		`-.form-inline .input-append .add-on,`
`1093`		`-.form-inline .input-prepend .add-on {`
`1094`		`- vertical-align: middle;`
	`1091`	`+.form-search .input-append,`
	`1092`	`+.form-inline .input-append,`
	`1093`	`+.form-search .input-prepend,`
	`1094`	`+.form-inline .input-prepend {`
	`1095`	`+ margin-bottom: 0;`
`1095`	`1096`	`}`
`1096`	`1097`	`.form-search .radio,`
`1097`	`1098`	`.form-search .checkbox,`