aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-28 23:40:52 -0800
committerMark Otto <[email protected]>2012-01-28 23:40:52 -0800
commitbca269299b242c55a2511e752429c07d7639f7d2 (patch)
treef5932ba1ba7bca96eda158374985a52b6bae57d6 /docs/components.html
parent62f4a1571a3801c867b80c228464cc9c695f1d13 (diff)
downloadbootstrap-bca269299b242c55a2511e752429c07d7639f7d2.tar.xz
bootstrap-bca269299b242c55a2511e752429c07d7639f7d2.zip
removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/components.html b/docs/components.html
index 7ba72f34d..63a4b3dd0 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -659,7 +659,7 @@
</div>
<h2>Static navbar example</h2>
<p>An example of a static (not fixed to the top) navbar with project name, navigation, and search form.</p>
- <div class="navbar navbar-static">
+ <div class="navbar">
<div class="navbar-inner">
<div class="container" style="width: auto;">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -712,7 +712,7 @@
<h3>Navbar scaffolding</h3>
<p>The navbar requires only a few divs to structure it well for static or fixed display.</p>
<pre class="prettyprint linenums">
-&lt;div class="navbar navbar-static"&gt;
+&lt;div class="navbar"&gt;
&lt;div class="navbar-inner"&gt;
&lt;div class="container"&gt;
...
@@ -720,7 +720,7 @@
&lt;/div&gt;
&lt;/div&gt;
</pre>
- <p>To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed-top</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
+ <p>To make the navbar fixed to the top of the viewport, add <code>.navbar-fixed-top</code> to the outermost div, <code>.navbar</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
<pre class="prettyprint linenums">
&lt;div class="navbar navbar-fixed-top"&gt;
...
@@ -743,7 +743,7 @@
<h3>Optional responsive variation</h3>
<p>Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, <code>.nav-collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p>
<pre class="prettyprint linenums">
-&lt;div class="navbar navbar-static"&gt;
+&lt;div class="navbar"&gt;
&lt;div class="navbar-inner"&gt;
&lt;div class="container"&gt;