aboutsummaryrefslogtreecommitdiff
path: root/css.html
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-08-22 12:26:04 -0700
committerChris Rebert <[email protected]>2013-08-22 12:28:00 -0700
commit354e2ee4f90d8a561ac7c04f35249ca30fdd1e50 (patch)
treec9509fa75af5d68b2e41f4a4b07fcc6c3a1091a4 /css.html
parent0c0400633aaa3591254630bf120bf477cee4381d (diff)
downloadbootstrap-354e2ee4f90d8a561ac7c04f35249ca30fdd1e50.tar.xz
bootstrap-354e2ee4f90d8a561ac7c04f35249ca30fdd1e50.zip
add cross-reference to .navbar-left/right in .pull-left/right docs
Diffstat (limited to 'css.html')
-rw-r--r--css.html8
1 files changed, 8 insertions, 0 deletions
diff --git a/css.html b/css.html
index d705ca549..8aae2488d 100644
--- a/css.html
+++ b/css.html
@@ -2166,6 +2166,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>
@@ -2177,6 +2181,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>