aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-05 00:11:21 -0800
committerMark Otto <[email protected]>2012-02-05 00:11:21 -0800
commitcdb1ad1a52a9f55c63003b7b62ef8b1e9c6fcfaf (patch)
tree4d02de4cae992039be08a3f5fe1a854130b8df57 /docs
parent31abeec0f2d84b3861d0c80c56c3112546bf0bfd (diff)
downloadbootstrap-cdb1ad1a52a9f55c63003b7b62ef8b1e9c6fcfaf.tar.xz
bootstrap-cdb1ad1a52a9f55c63003b7b62ef8b1e9c6fcfaf.zip
#1702: add callout to navbar for component alignment
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin52391 -> 52391 bytes
-rw-r--r--docs/components.html2
-rw-r--r--docs/templates/pages/components.mustache2
3 files changed, 4 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d43ca5f9a..3c655b03a 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/components.html b/docs/components.html
index f0559e5fa..1c5bc5abe 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 1bf6b11d4..1f466aa5d 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">