From c459c657f8e10ae1af6378114f4943104597c590 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 7 May 2013 21:56:55 -0700
Subject: Update forms

* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
---
 docs/assets/css/bootstrap.css | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e8ddf5bb1..6b904d6e8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1249,9 +1249,10 @@ input[type="url"],
 input[type="search"],
 input[type="tel"],
 input[type="color"] {
-  display: inline-block;
+  display: block;
   min-height: 34px;
   padding: 6px 9px;
+  margin-bottom: 10px;
   font-size: 14px;
   line-height: 20px;
   color: #555555;
@@ -1374,6 +1375,7 @@ textarea::-webkit-input-placeholder {
   min-height: 20px;
   padding-left: 20px;
   margin-bottom: 10px;
+  vertical-align: middle;
 }
 
 .radio label,
@@ -1619,21 +1621,24 @@ select:focus:invalid:focus {
   display: table;
 }
 
-.input-group[class*="span"] {
+.input-group.col {
   float: none;
-  padding: 0;
+  padding-right: 0;
+  padding-left: 0;
 }
 
 .input-group input,
 .input-group select {
   width: 100%;
+  margin-bottom: 0;
 }
 
 .input-group-addon,
 .input-group-btn,
 .input-group input {
   display: table-cell;
-  margin: 0;
+  /*margin: 0;*/
+
   border-radius: 0;
 }
 
@@ -1779,6 +1784,15 @@ select:focus:invalid:focus {
   border-bottom-right-radius: 3px;
 }
 
+.form-inline input,
+.form-inline select,
+.form-inline textarea,
+.form-inline .radio,
+.form-inline .checkbox {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
 @media screen and (min-width: 768px) {
   .form-horizontal .control-group {
     position: relative;
-- 
cgit v1.2.3