From 6115f01adb0e5db407e09077972c3e3e1f82a54e Mon Sep 17 00:00:00 2001
From: James Holland <james@turnupworks.com>
Date: Fri, 26 Jul 2013 08:58:47 -0400
Subject: [PATCH 1/2] Update css.html in .form-horizontal

to use .row.form-group for horizontal spacing instead of .form-horizontal .row + .row
---
 css.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/css.html b/css.html
index 3319de61a9..25d73ea659 100644
--- a/css.html
+++ b/css.html
@@ -1254,13 +1254,13 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h3 id="forms-horizontal">Horizontal form</h3>
     <p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout.</p>
     <form class="bs-example form-horizontal">
-      <div class="row">
+      <div class="row form-group">
         <label for="inputEmail" class="col-lg-2 control-label">Email</label>
         <div class="col-lg-10">
           <input type="text" class="form-control" id="inputEmail" placeholder="Email">
         </div>
       </div>
-      <div class="row">
+      <div class="row form-group">
         <label for="inputPassword" class="col-lg-2 control-label">Password</label>
         <div class="col-lg-10">
           <input type="password" class="form-control" id="inputPassword" placeholder="Password">
@@ -1277,13 +1277,13 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     </form>
 {% highlight html %}
 <form class="form-horizontal">
-  <div class="row">
+  <div class="row form-group">
     <label for="inputEmail" class="form-control" class="col-lg-2 control-label">Email</label>
     <div class="col-lg-10">
       <input type="text" id="inputEmail" placeholder="Email">
     </div>
   </div>
-  <div class="row">
+  <div class="row form-group">
     <label for="inputPassword" class="col-lg-2 control-label">Password</label>
     <div class="col-lg-10">
       <input type="password" class="form-control" id="inputPassword" placeholder="Password">

From 2e7593a40dfc6149e81044325c6ad866dcbfa8a8 Mon Sep 17 00:00:00 2001
From: James Holland <james@turnupworks.com>
Date: Fri, 26 Jul 2013 09:04:39 -0400
Subject: [PATCH 2/2] Update forms.less to remove .form-horizontal .row + .row

use .form-group to apply consistent vertical spacing on form rows
---
 less/forms.less | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/less/forms.less b/less/forms.less
index 7040b17d66..21475a6d07 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -422,13 +422,8 @@ select {
 // --------------------------------------------------
 // Horizontal forms are built on grid classes.
 
-.form-horizontal {
-  .row + .row {
-    margin-top: 15px;
-  }
-  .control-label {
+.form-horizontal .control-label {
     padding-top: 6px;
-  }
 }
 
 // Only right align form labels here when the columns stop stacking