Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment

Conflicts:
	bootstrap.css
	bootstrap.min.css

3 files changed, 11 insertions, 10 deletions

diff --git a/lib/buttons.less b/lib/buttons.less
index 2cbcc1d4f..d7f533783 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -66,9 +66,9 @@
 .btn {
   // Button Base
   display: inline-block;
-  padding: 5px 10px 6px;
+  padding: 4px 10px 4px;
   font-size: @baseFontSize;
-  line-height: normal;
+  line-height: @baseLineHeight;
   color: @grayDark;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
@@ -132,8 +132,9 @@
     margin-top: 1px;
   }
   &.small {
-    padding: 7px 9px 7px;
+    padding: 5px 9px 5px;
     font-size: @baseFontSize - 2px;
+    line-height: @baseLineHeight - 2px;
   }
   &.small .icon {
     margin-top: -2px;
diff --git a/lib/forms.less b/lib/forms.less
index 744649f90..4ee636683 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -87,6 +87,7 @@ input[type=radio] {
   line-height: normal;
   border: none;
   cursor: pointer;
+  .border-radius(0);
 }
 
 // Reset the file input to browser defaults
@@ -118,7 +119,6 @@ input[type=file] {
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  vertical-align: baseline;
   background-color: @white;
 }
 
@@ -162,7 +162,7 @@ input[type=hidden] {
 // Move the options list down to align with labels
 .controls > .radio:first-child,
 .controls > .checkbox:first-child {
-  padding-top: 6px; // has to be padding because margin collaspes
+  padding-top: 5px; // has to be padding because margin collaspes
 }
 
 // Radios and checkboxes on same line
@@ -376,9 +376,9 @@ select:focus:required:invalid {
 }
 
 .help-inline {
-  *position: relative; /* IE6-7 */
-  *top: -5px; /* IE6-7 */
-  display: inline;
+  display: inline-block;
+  margin-bottom: 9px;
+  vertical-align: middle;
   padding-left: 5px;
 }
 
@@ -468,6 +468,7 @@ select:focus:required:invalid {
   input,
   textarea,
   select,
+  .help-inline,
   .uneditable-input {
     display: inline-block;
     margin-bottom: 0;
diff --git a/lib/reset.less b/lib/reset.less
index 31e7160f2..ef4dc8af6 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -91,8 +91,7 @@ select,
 textarea {
   margin: 0;
   font-size: 100%;
-  vertical-align: baseline;
-  *vertical-align: middle;
+  vertical-align: middle;
 }
 button,
 input {