diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:47:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:47:29 -0700 |
| commit | c240460f0b38ab2a2bc4f542695a4ca4e1748487 (patch) | |
| tree | 35641cecac7a46779c1c996ffcc5048a14700740 /javascript.html | |
| parent | fa7cc6cafda4f5a9363d17507bf91cba22777749 (diff) | |
| parent | 638db635d7b0c2bd6406d5ff891e92985e4b839b (diff) | |
| download | bootstrap-c240460f0b38ab2a2bc4f542695a4ca4e1748487.tar.xz bootstrap-c240460f0b38ab2a2bc4f542695a4ca4e1748487.zip | |
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javascript.html b/javascript.html index 883bbb929..9e85c7742 100644 --- a/javascript.html +++ b/javascript.html @@ -355,7 +355,7 @@ $('#myModal').on('hidden.bs.modal', function () { <h3>Within a navbar</h3> <div class="bs-example"> - <nav id="navbar-example" class="navbar navbar-static" role="navigation"> + <nav id="navbar-example" class="navbar navbar-default navbar-static" role="navigation"> <div class="navbar-header"> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-js-navbar-collapse"> <span class="sr-only">Toggle navigation</span> @@ -526,7 +526,7 @@ $('#myDropdown').on('show.bs.dropdown', function () { <h2 id="scrollspy-examples">Example in navbar</h2> <p>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.</p> <div class="bs-example"> - <nav id="navbar-example2" class="navbar navbar-static" role="navigation"> + <nav id="navbar-example2" class="navbar navbar-default navbar-static" role="navigation"> <div class="navbar-header"> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-js-navbar-scrollspy"> <span class="sr-only">Toggle navigation</span> |