From 8f1db4321a35851d5b726290b2d99e7ea1ec7239 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 11 Feb 2012 00:24:06 -0800
Subject: fix inline form checkbox/radios

---
 docs/assets/bootstrap.zip              | Bin 52641 -> 52675 bytes
 docs/assets/css/bootstrap.css          |   7 +++++++
 docs/base-css.html                     |   5 ++++-
 docs/templates/pages/base-css.mustache |   5 ++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e8ca60a6d..3097692de 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 09688778b..1391ad41e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -964,6 +964,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-inline .input-prepend .add-on {
   vertical-align: middle;
 }
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
 .control-group {
   margin-bottom: 9px;
 }
diff --git a/docs/base-css.html b/docs/base-css.html
index c0ad882a5..09614af2a 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -907,7 +907,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
       <form class="well form-inline">
         <input type="text" class="input-small" placeholder="Email">
         <input type="password" class="input-small" placeholder="Password">
-        <button type="submit" class="btn">Go</button>
+        <label class="checkbox">
+          <input type="checkbox"> Remember?
+        </label>
+        <button type="submit" class="btn">Sign in</button>
       </form>
 <pre class="prettyprint linenums">
 &lt;form class="well form-inline"&gt;
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 750957beb..5e20aae2c 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -831,7 +831,10 @@
       <form class="well form-inline">
         <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
         <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
-        <button type="submit" class="btn">{{_i}}Go{{/i}}</button>
+        <label class="checkbox">
+          <input type="checkbox"> {{_i}}Remember?{{/i}}
+        </label>
+        <button type="submit" class="btn">{{_i}}Sign in{{/i}}</button>
       </form>
 <pre class="prettyprint linenums">
 &lt;form class="well form-inline"&gt;
-- 
cgit v1.2.3