Merge branch 'master' of github.com:twbs/bootstrap

1 files changed, 8 insertions, 0 deletions

diff --git a/css.html b/css.html
index 3ea6a84c7..a07567620 100644
--- a/css.html
+++ b/css.html
@@ -2198,6 +2198,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   float: left !important;
 }
 {% endhighlight %}
+    <div class="bs-callout bs-callout-warning">
+      <h4>Not for use in navbars</h4>
+      <p>To left-align components in navbars, use <code>.navbar-left</code> instead. <a href="../components/#navbar-component-alignment">See the navbar docs</a> for details.</p>
+    </div>
 
     <h3>.pull-right</h3>
     <p>Float an element right with a class. Can also be used as a mixin.</p>
@@ -2209,6 +2213,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   float: right !important;
 }
 {% endhighlight %}
+    <div class="bs-callout bs-callout-warning">
+      <h4>Not for use in navbars</h4>
+      <p>To right-align components in navbars, use <code>.navbar-right</code> instead. <a href="../components/#navbar-component-alignment">See the navbar docs</a> for details.</p>
+    </div>
 
     <h3>.clearfix</h3>
     <p>Clear the <code>float</code> on any element. Utilizes <a href="http://nicolasgallagher.com/micro-clearfix-hack/">the micro clearfix</a> as popularized by Nicolas Gallagher. Can also be used as a mixin.</p>