From: Mark Otto <markotto@twitter.com>
Date: Sat, 18 Feb 2012 23:23:38 +0000 (-0800)
Subject: clarify forms in navbar per #2072
X-Git-Tag: v2.0.2~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29e6ef7c703c5a8eb6e19dea22f797c20e1e533e;p=thirdparty%2Fbootstrap.git

clarify forms in navbar per #2072
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 79dd29aee2..04d93735d0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index 41f5e5819b..b7e60df87e 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -830,8 +830,14 @@
   Project name
 &lt;/a&gt;
 </pre>
-      <h3>Search form</h3>
-      <p>Search forms receive custom styles in the navbar with the <code>.navbar-search</code> class. Include <code>.pull-left</code> or <code>.pull-right</code> on the <code>form</code> to align it.</p>
+      <h3>Forms in navbar</h3>
+      <p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p>
+<pre class="prettyprint linenums">
+&lt;form class="navbar-form pull-left"&gt;
+  &lt;input type="text" class="span2"&gt;
+&lt;/form&gt;
+</pre>
+      <p>For a more customized search form, add the <code>.navbar-search</code> class to receive specialized styles in the navbar.</p>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-search pull-left"&gt;
   &lt;input type="text" class="search-query" placeholder="Search"&gt;
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index a3df924876..39c9020d26 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -754,8 +754,14 @@
   {{_i}}Project name{{/i}}
 &lt;/a&gt;
 </pre>
-      <h3>{{_i}}Search form{{/i}}</h3>
-      <p>{{_i}}Search forms receive custom styles in the navbar with the <code>.navbar-search</code> class. Include <code>.pull-left</code> or <code>.pull-right</code> on the <code>form</code> to align it.{{/i}}</p>
+      <h3>{{_i}}Forms in navbar{{/i}}</h3>
+      <p>{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.{{/i}}</p>
+<pre class="prettyprint linenums">
+&lt;form class="navbar-form pull-left"&gt;
+  &lt;input type="text" class="span2"&gt;
+&lt;/form&gt;
+</pre>
+      <p>{{_i}}For a more customized search form, add the <code>.navbar-search</code> class to receive specialized styles in the navbar.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-search pull-left"&gt;
   &lt;input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}"&gt;