From 143b3db2c9c97b281b0c4ede937d136e9f904651 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 20 Feb 2012 18:56:05 -0800
Subject: update inline forms to resolve checkbox label with space in it and
 overlapping content, per #1969

---
 docs/assets/bootstrap.zip              | Bin 53401 -> 53473 bytes
 docs/assets/css/bootstrap.css          |   9 +++++++++
 docs/base-css.html                     |   5 ++++-
 docs/templates/pages/base-css.mustache |   5 ++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2dcd38c33..f4a9241da 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 a74f461c2..1d12c816f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1001,9 +1001,18 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-search .checkbox,
 .form-inline .radio,
 .form-inline .checkbox {
+  padding-left: 0;
   margin-bottom: 0;
   vertical-align: middle;
 }
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: 0;
+  margin-right: 3px;
+}
 .control-group {
   margin-bottom: 9px;
 }
diff --git a/docs/base-css.html b/docs/base-css.html
index 5a2e12748..86ea85533 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -910,7 +910,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
         <input type="text" class="input-small" placeholder="Email">
         <input type="password" class="input-small" placeholder="Password">
         <label class="checkbox">
-          <input type="checkbox"> Remember?
+          <input type="checkbox"> Remember me
         </label>
         <button type="submit" class="btn">Sign in</button>
       </form>
@@ -918,6 +918,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
 &lt;form class="well form-inline"&gt;
   &lt;input type="text" class="input-small" placeholder="Email"&gt;
   &lt;input type="password" class="input-small" placeholder="Password"&gt;
+  &lt;label class="checkbox"&gt;
+    &lt;input type="checkbox"&gt; Remember me
+  &lt;/label&gt;
   &lt;button type="submit" class="btn"&gt;Go&lt;/button&gt;
 &lt;/form&gt;
 </pre>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 96036d6ee..519f07bfe 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -834,7 +834,7 @@
         <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
         <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
         <label class="checkbox">
-          <input type="checkbox"> {{_i}}Remember?{{/i}}
+          <input type="checkbox"> {{_i}}Remember me{{/i}}
         </label>
         <button type="submit" class="btn">{{_i}}Sign in{{/i}}</button>
       </form>
@@ -842,6 +842,9 @@
 &lt;form class="well form-inline"&gt;
   &lt;input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"&gt;
   &lt;input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"&gt;
+  &lt;label class="checkbox"&gt;
+    &lt;input type="checkbox"&gt; {{_i}}Remember me{{/i}}
+  &lt;/label&gt;
   &lt;button type="submit" class="btn"&gt;{{_i}}Go{{/i}}&lt;/button&gt;
 &lt;/form&gt;
 </pre>
-- 
cgit v1.2.3