From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 08:11:21 +0000 (-0800)
Subject: #1702: add callout to navbar for component alignment
X-Git-Tag: v2.0.1~1^2~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdb1ad1a52a9f55c63003b7b62ef8b1e9c6fcfaf;p=thirdparty%2Fbootstrap.git

#1702: add callout to navbar for component alignment
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d43ca5f9aa..3c655b03a1 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 f0559e5fa1..1c5bc5abe2 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -864,6 +864,8 @@
   &lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
+      <h3>Component alignment</h3>
+      <p>To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p>
       <h3>Adding dropdowns</h3>
       <p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.</p>
 <pre class="prettyprint linenums">
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1bf6b11d49..1f466aa5dd 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -788,6 +788,8 @@
   &lt;li&gt;&lt;a href="#"&gt;{{_i}}Link{{/i}}&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
+      <h3>{{_i}}Component alignment{{/i}}</h3>
+      <p>{{_i}}To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.{{/i}}</p>
       <h3>{{_i}}Adding dropdowns{{/i}}</h3>
       <p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.{{/i}}</p>
 <pre class="prettyprint linenums">