From: Chris Rebert <code@rebertia.com>
Date: Thu, 24 Jul 2014 20:57:39 +0000 (-0700)
Subject: Update docs & add example for #14221
X-Git-Tag: v3.3.0~289^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14235%2Fhead;p=thirdparty%2Fbootstrap.git

Update docs & add example for #14221

[skip sauce]
---

diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index 483c0e5884..5bb99f00c2 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -375,7 +375,7 @@
 
 
   <h2 id="forms-controls-static">Static control</h2>
-  <p>When you need to place plain text next to a form label within a horizontal form, use the <code>.form-control-static</code> class on a <code>&lt;p&gt;</code>.</p>
+  <p>When you need to place plain text next to a form label within a form, use the <code>.form-control-static</code> class on a <code>&lt;p&gt;</code>.</p>
   <div class="bs-example">
     <form class="form-horizontal" role="form">
       <div class="form-group">
@@ -407,6 +407,32 @@
     </div>
   </div>
 </form>
+{% endhighlight %}
+  <div class="bs-example">
+    <form class="form-inline" role="form">
+      <div class="form-group">
+        <label class="sr-only">Email</label>
+        <p class="form-control-static">email@example.com</p>
+      </div>
+      <div class="form-group">
+        <label for="inputPassword2" class="sr-only">Password</label>
+        <input type="password" class="form-control" id="inputPassword2" placeholder="Password">
+      </div>
+      <button type="submit" class="btn btn-default">Confirm identity</button>
+    </form>
+  </div>
+{% highlight html %}
+<form class="form-inline" role="form">
+  <div class="form-group">
+    <label class="sr-only">Email</label>
+    <p class="form-control-static">email@example.com</p>
+  </div>
+  <div class="form-group">
+    <label for="inputPassword2" class="sr-only">Password</label>
+    <input type="password" class="form-control" id="inputPassword2" placeholder="Password">
+  </div>
+  <button type="submit" class="btn btn-default">Confirm identity</button>
+</form>
 {% endhighlight %}
 
   <h2 id="forms-control-focus">Input focus</h2>