aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-02-19 16:09:18 -0800
committerMark Otto <[email protected]>2013-02-19 16:09:18 -0800
commitc6343a9d4a3445ab04a71761fae1f484cc6b9ec3 (patch)
tree20b4ed78dbc7374a437fb83c4f81faa18728119d /docs/components.html
parenta1913cbe7e969cb6763f12888a594666b2d28a65 (diff)
parent17808731738cb9de385950db54bb156786b6c705 (diff)
downloadbootstrap-c6343a9d4a3445ab04a71761fae1f484cc6b9ec3.tar.xz
bootstrap-c6343a9d4a3445ab04a71761fae1f484cc6b9ec3.zip
Merge pull request #6990 from acmetech/3.0.0-wip
Additional minor updates to the docs
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html30
1 files changed, 14 insertions, 16 deletions
diff --git a/docs/components.html b/docs/components.html
index b05d9c6e9..b60dd1621 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -819,16 +819,14 @@ title: Components
<p>You can easily add dividers to your nav links with an empty list item and a simple class. Just add the appropriate class to <code>&lt;li&gt;</code> elements between links. Dividers will be horizontal to start, but at resolutions above 768px they become vertical with the navigation.</p>
<div class="bs-docs-example">
<div class="navbar">
- <div class="navbar-inner">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li class="divider"></li>
- <li><a href="#">Link</a></li>
- <li class="divider"></li>
- <li><a href="#">Link</a></li>
- <li class="divider"></li>
- </ul>
- </div>
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Link</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Link</a></li>
+ <li class="divider"></li>
+ </ul>
</div>
</div><!-- /example -->
{% highlight html linenos %}
@@ -872,7 +870,7 @@ title: Components
<h3>Fixed to top</h3>
<p>Add <code>.navbar-fixed-top</code> and remember to account for the hidden area underneath it by adding at least 40px <code>padding</code> to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p>
<div class="bs-docs-example bs-navbar-top-example">
- <div class="navbar navbar-fixed-top" style="position: absolute;">
+ <div class="navbar navbar-fixed-top" style="position: absolute; top: -1px;">
<div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Title</a>
<ul class="nav">
@@ -892,7 +890,7 @@ title: Components
<h3>Fixed to bottom</h3>
<p>Add <code>.navbar-fixed-bottom</code> instead.</p>
<div class="bs-docs-example bs-navbar-bottom-example">
- <div class="navbar navbar-fixed-bottom" style="position: absolute;">
+ <div class="navbar navbar-fixed-bottom" style="position: absolute; bottom: -1px;">
<div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Title</a>
<ul class="nav">
@@ -959,8 +957,8 @@ title: Components
</ul>
</li>
</ul>
- <form class="navbar-search pull-left" action="">
- <input type="text" class="search-query span2" placeholder="Search">
+ <form class="navbar-form pull-left" action="">
+ <input type="text" class="span8" placeholder="Search">
</form>
<ul class="nav pull-right">
<li><a href="#">Link</a></li>
@@ -1036,8 +1034,8 @@ title: Components
</ul>
</li>
</ul>
- <form class="navbar-search pull-left" action="">
- <input type="text" class="search-query span2" placeholder="Search">
+ <form class="navbar-form pull-left" action="">
+ <input type="text" class="span8" placeholder="Search">
</form>
<ul class="nav pull-right">
<li><a href="#">Link</a></li>