From 29e6ef7c703c5a8eb6e19dea22f797c20e1e533e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 18 Feb 2012 15:23:38 -0800
Subject: [PATCH] clarify forms in navbar per #2072

---
 docs/assets/bootstrap.zip                | Bin 53351 -> 53351 bytes
 docs/components.html                     |  10 ++++++++--
 docs/templates/pages/components.mustache |  10 ++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 79dd29aee2afb03d8e83440f4ad879e7e9c0d4d0..04d93735d041f2d6ed49ebfade82f2ea0a2df1ed 100644
GIT binary patch
delta 426
zcmaF9fcg0XX6^uQW)?065O_0@TS@7Sk%Rv`ATF)oW?*Fb%E-XLA_9~{sCqlmUybc8
zSk+|TsnU#ZCr-Bm^WPe6y#1Gh@$KZBoK9>YBi<TqR^+N?2a3!UGzKeqW3>62pr8>@
z<b|_2RMTcv7Xy99HxvD3`7?9V^+Q8A8JHoC02}{i^1NafHjn^N^NZq20me6zlUnRx
zBFkE;1%SpWO;rV3`OXO9rpcL84WR;?7fcmU1S;9M%@ii`X4?}HpfMLu8!){wn!Nv<
z_+)`|Y(OQ7XH1yhf&^rNoYFHs2+qSZ0Zc%%Au@qy9T75{&bmT45JTPo4UwH}a!wp#
lvMkV=>~lc~&fRl9sCIguH%6E|=e#|F^ZUFrh~scU9RQZsvMB%n

delta 426
zcmaF9fcg0XX6^uQW)?065YU*&t)x_A=-^)u#HAJ742&#a85tN@M1XP#Rhkq1)!6F5
zswVqRm1fkOINc7+uQS|u`!5Hh=H#24PEdi(id@y~K#{qE#%#4fEj5OluL%ko0YzRo
zn}gNV8g5o~G0<n!nCLIdpP8Gk9~#2RzzlH&*m#Y}^NL;AKmtI`FN!M#7&Rs*wb;Q#
zmbFw10F6_cs*2*K$(d6PVQyG3RX~wZYx2fzrfeXO)fsMnv+aop(3p#-4VY>SC+|Ne
zK3U)#8_*QRGbT)RAOTq*r}T^ug7ff90D=>E){&_erfkz$SBMP65DlOqvXf2Di9<}5
o1zMARE(pQ7d(H>dPS5kk2$ScWw})}GCjUO~%v5hU+2MjZ0Ax&$^#A|>

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;