From c17673dc6139de37ecb5d075231e426d1b238706 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 13:59:09 -0600
Subject: Restore .form-horizontal

---
 less/forms.less | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index dc4e7ffd9..cc0f49b34 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -428,7 +428,6 @@ select:focus:invalid {
 
 
 
-
 // Input groups
 // --------------------------------------------------
 
@@ -537,3 +536,31 @@ select:focus:invalid {
     border-radius: 0 @border-radius-base @border-radius-base 0;
   }
 }
+
+
+
+// Horizontal forms
+// --------------------------------------------------
+
+.form-horizontal {
+
+  // Increase spacing between groups
+  .control-group {
+    margin-bottom: @line-height-base / 2;
+    .clearfix();
+  }
+
+  // Float the labels left
+  .control-group > .control-label {
+    float: left;
+    width: @component-offset-horizontal - 20;
+    padding-top: 5px;
+    text-align: right;
+  }
+
+  // Move over all input controls and content over
+  .control-group > .controls {
+    margin-left: @component-offset-horizontal;
+  }
+
+}
-- 
cgit v1.2.3


From 070109abc1624808873e6e172ff97d27eb05c406 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 14:09:36 -0600
Subject: Remove .controls-row; instead, folks should use .row and .span* for
 all their grid input sizing needs when multiple inputs per line are required

---
 less/forms.less | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index cc0f49b34..ca7060b0a 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -291,10 +291,6 @@ textarea[class*="span"],
   margin-right: 0;
 }
 
-.controls-row {
-  #grid > .input(@grid-column-width, @grid-gutter-width, @grid-row-width);
-}
-
 // Ensure input-prepend/append never wraps
 .input-append input[class*="span"],
 .input-append .uneditable-input[class*="span"],
@@ -309,21 +305,6 @@ textarea[class*="span"],
 .uneditable-input[class*="span"] {
   height: @input-height;
 }
-// Control row for multiple inputs per line
-.controls-row {
-  .clearfix(); // Clear the float from controls
-}
-
-// Float to collapse white-space for proper grid alignment
-.controls-row [class*="span"] {
-  float: left;
-}
-// Explicity set top padding on all checkboxes/radios, not just first-child
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
 
 
 
-- 
cgit v1.2.3


From d0baa99aed07b6643d649350f3988b3d8a07a4ac Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 14:59:58 -0600
Subject: Remove .text-info and .info form validation states

---
 less/forms.less | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index ca7060b0a..4abb7874a 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -353,10 +353,6 @@ input[type="checkbox"] {
 .control-group.success {
   .formFieldState(@state-success-text, @state-success-text, @state-success-background);
 }
-// Success
-.control-group.info {
-  .formFieldState(@state-info-text, @state-info-text, @state-info-background);
-}
 
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
-- 
cgit v1.2.3


From dc5c6d6be8e46e36aa8a2e1d35f6ed8c8e3cd8cb Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 15:57:52 -0600
Subject: Simplify form validation states while enabling them to be applied to
 one field at a time.

---
 less/forms.less | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'less/forms.less')

diff --git a/less/forms.less b/less/forms.less
index 4abb7874a..de814a915 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -342,15 +342,15 @@ input[type="checkbox"] {
 // --------------------------
 
 // Warning
-.control-group.warning {
+.has-warning {
   .formFieldState(@state-warning-text, @state-warning-text, @state-warning-background);
 }
 // Error
-.control-group.error {
+.has-error {
   .formFieldState(@state-error-text, @state-error-text, @state-error-background);
 }
 // Success
-.control-group.success {
+.has-success {
   .formFieldState(@state-success-text, @state-success-text, @state-success-background);
 }
 
@@ -523,15 +523,23 @@ select:focus:invalid {
 
   // Increase spacing between groups
   .control-group {
-    margin-bottom: @line-height-base / 2;
+    position: relative;
+    margin-bottom: @line-height-base;
     .clearfix();
+
+    input,
+    select,
+    textarea,
+    .uneditable-input {
+      margin-bottom: 0;
+    }
   }
 
   // Float the labels left
   .control-group > .control-label {
     float: left;
     width: @component-offset-horizontal - 20;
-    padding-top: 5px;
+    padding-top: 6px;
     text-align: right;
   }
 
-- 
cgit v1.2.3