From 9af88380c440f35387292946b2e18ad7b2ab84b2 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 14 May 2013 22:31:15 +0200
Subject: [PATCH 1/2] .navbar docs: update -fixed-* callouts, fix -link

* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
---
 docs/components.html | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/docs/components.html b/docs/components.html
index 23c20d94d3..bcf3ad7a1c 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1197,13 +1197,13 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
     <div class="bs-example">
       <div class="navbar">
         <a href="#" class="navbar-brand">Brand</a>
-        <p class="pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
+        <p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
       </div>
     </div>
 {% highlight html %}
 <div class="navbar">
   <a href="#" class="navbar-brand">Brand</a>
-  <p class="pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
+  <p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
 </div>
 {% endhighlight %}
 
@@ -1236,16 +1236,9 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
 
     <div class="bs-callout">
       <h4>Body padding required</h4>
-      <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the top of the <code>&lt;body&gt;</code>. The navbar itself has a height of 54px by default. At 768px and above, its height shrinks to 50px. Try out your own values or use our snippet below:</p>
+      <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the top of the <code>&lt;body&gt;</code>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.</p>
 {% highlight css %}
-body {
-  padding-top: 64px;
-}
-@media screen and (min-width: 768px) {
-  body {
-    padding-top: 60px;
-  }
-}
+body { padding-top: 70px; }
 {% endhighlight %}
       <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p>
     </div>
@@ -1272,16 +1265,9 @@ body {
 
     <div class="bs-callout">
       <h4>Body padding required</h4>
-      <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the bottom of the <code>&lt;body&gt;</code>. The navbar itself has a height of 54px by default. At 768px and above, its height shrinks to 50px. Try out your own values or use our snippet below:</p>
+      <p>The fixed navbar will overlay your other content, unless you add <code>padding</code> to the bottom of the <code>&lt;body&gt;</code>. Try out your own values or use our snippet below. Tip: By default, the navbar is 50px high.</p>
 {% highlight css %}
-body {
-  padding-bottom: 64px;
-}
-@media screen and (min-width: 768px) {
-  body {
-    padding-bottom: 60px;
-  }
-}
+body { padding-bottom: 70px; }
 {% endhighlight %}
       <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p>
     </div>

From cd2d7b5d1738aed211bf257de9094b192d0ac56f Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 14 May 2013 22:42:06 +0200
Subject: [PATCH 2/2] add detail to navbar component alignment section

* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
---
 docs/components.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/components.html b/docs/components.html
index bcf3ad7a1c..27106650c0 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1208,7 +1208,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
 {% endhighlight %}
 
     <h3 id="navbar-component-alignment">Component alignment</h3>
-    <p>Align nav links, 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>
+    <p>Align nav links, forms, buttons, or text, using the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction. To align nav links, put them in a separate <code>&lt;ul&gt;</code> with the respective utility class applied.</p>
 
 
     <h2>Optional display variations</h2>