1 files changed, 22 insertions, 26 deletions
diff --git a/less/forms.less b/less/forms.less
index 7e9036a6a..0e656cc1d 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -265,42 +265,33 @@ textarea {
 .input-xlarge     { width: 270px; }
 .input-xxlarge    { width: 530px; }
 
+
+
+// GRID SIZING FOR INPUTS
+// ----------------------
+
 // Grid style input sizes
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input[class*="span"],
-// Redeclare since the fluid row class is more specific
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  xfloat: none;
-  xmargin-left: 0;
+.uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+.controls-row {
+  #grid > .input(@gridColumnWidth, @gridGutterWidth, @gridRowWidth);
 }
+
 // Ensure input-prepend/append never wraps
 .input-append input[class*="span"],
 .input-append .uneditable-input[class*="span"],
 .input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
+.input-prepend .uneditable-input[class*="span"] {
   display: inline-block;
 }
 
-
-
-// GRID SIZING FOR INPUTS
-// ----------------------
-
-.controls-row {
-  #grid > .input(@gridColumnWidth, @gridGutterWidth, @gridRowWidth);
-}
-
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
@@ -427,8 +418,8 @@ select:focus:required:invalid {
   select,
   .uneditable-input {
     position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
-    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
-    *margin-left: 0;
+    float: none; // Undo the float from grid sizing
+    margin: 0; // Prevent bottom margin from screwing up alignment in stacked forms
     font-size: @baseFontSize;
     vertical-align: top;
     .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
@@ -437,6 +428,11 @@ select:focus:required:invalid {
       z-index: 2;
     }
   }
+  input[class*="span"],
+  select[class*="span"],
+  .uneditable-input[class*="span"] {
+    margin: 0;
+  }
   .add-on {
     display: inline-block;
     width: auto;