aboutsummaryrefslogtreecommitdiff
path: root/docs/components
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2015-08-12 20:00:33 -0700
committerJacob Thornton <[email protected]>2015-08-12 20:00:33 -0700
commit9bdb6d13f606ec18d808a30e5ebc28ec3eb82a4b (patch)
tree62c79b44c622145f6f0083a9dd0fb0ab7b823165 /docs/components
parent23d05f1585846752ea58ed5ffad2ad8e574d6d77 (diff)
parenta7e36a1f1b432229e8be2599bffd32e90e72a64e (diff)
downloadbootstrap-9bdb6d13f606ec18d808a30e5ebc28ec3eb82a4b.tar.xz
bootstrap-9bdb6d13f606ec18d808a30e5ebc28ec3eb82a4b.zip
Merge branch 'v4' of github.com:twbs/derpstrap into v4
Diffstat (limited to 'docs/components')
-rw-r--r--docs/components/scrollspy.md42
1 files changed, 14 insertions, 28 deletions
diff --git a/docs/components/scrollspy.md b/docs/components/scrollspy.md
index 610756323..023d31c61 100644
--- a/docs/components/scrollspy.md
+++ b/docs/components/scrollspy.md
@@ -14,35 +14,21 @@ group: components
The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.
<div class="bd-example">
- <nav id="navbar-example2" class="navbar navbar-default navbar-static" role="navigation">
- <div class="container-fluid">
- <div class="navbar-header">
- <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".bd-example-js-navbar-scrollspy">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">Project Name</a>
- </div>
- <div class="collapse navbar-collapse bd-example-js-navbar-scrollspy">
- <ul class="nav navbar-nav">
- <li><a href="#fat">@fat</a></li>
- <li><a href="#mdo">@mdo</a></li>
- <li class="dropdown">
- <a href="#" id="navbarDrop1" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- Dropdown
- </a>
- <ul class="dropdown-menu" aria-labelledby="navbarDrop1">
- <li><a href="#one">one</a></li>
- <li><a href="#two">two</a></li>
- <li role="separator" class="divider"></li>
- <li><a href="#three">three</a></li>
- </ul>
- </li>
+ <nav id="navbar-example2" class="navbar navbar-default" role="navigation">
+ <h3 class="navbar-brand">Project Name</h3>
+ <ul class="nav nav-pills">
+ <li class="nav-item"><a class="nav-link" href="#fat">@fat</a></li>
+ <li class="nav-item"><a class="nav-link" href="#mdo">@mdo</a></li>
+ <li class="nav-item">
+ <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Dropdown</a>
+ <ul class="dropdown-menu">
+ <li><a href="#one">one</a></li>
+ <li><a href="#two">two</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="#three">three</a></li>
</ul>
- </div>
- </div>
+ </li>
+ </ul>
</nav>
<div data-spy="scroll" data-target="#navbar-example2" data-offset="0" class="scrollspy-example">
<h4 id="fat">@fat</h4>