diff options
| author | Jacob Thornton <[email protected]> | 2012-01-24 22:33:33 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-24 22:33:33 -0800 |
| commit | 5e5e87fbd0f577256d8a2b479bb9ed2187ff7f91 (patch) | |
| tree | 6b8ad5b9f7af6303a6316c41747eed32d2050311 /docs | |
| parent | f2fe2b1798380ab65e88281ab4db47965cd5aaf8 (diff) | |
| download | bootstrap-5e5e87fbd0f577256d8a2b479bb9ed2187ff7f91.tar.xz bootstrap-5e5e87fbd0f577256d8a2b479bb9ed2187ff7f91.zip | |
scrollspy working for sub navs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/js/application.js | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 0252d75e9..84227f555 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -119,7 +119,7 @@ $(function(){ // fix sub nav playa var $win = $(window) , $nav = $('.subnav') - , navTop = $('.subnav').offset().top - 40 + , navTop = $('.subnav').length && $('.subnav').offset().top - 40 , isFixed = 0 processScroll() diff --git a/docs/javascript.html b/docs/javascript.html index 425d347cb..8cf95c815 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -24,7 +24,7 @@ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> </head> - <body> + <body data-spy="scroll" data-target=".subnav" data-offset="0"> <!-- Navbar ================================================== --> @@ -65,18 +65,18 @@ <p class="lead">Bring Bootstrap's components to life—now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins. <div class="subnav"> <ul class="nav pills"> - <li><a href="./javascript.html#javascript">Overview</a></li> - <li><a href="./javascript.html#modals">Modal</a></li> - <li><a href="./javascript.html#dropdowns">Dropdown</a></li> - <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tabs">Tab</a></li> - <li><a href="./javascript.html#tooltips">Tooltip</a></li> - <li><a href="./javascript.html#popovers">Popover</a></li> - <li><a href="./javascript.html#alerts">Alert</a></li> - <li><a href="./javascript.html#buttons">Button</a></li> - <li><a href="./javascript.html#collapse">Collapse</a></li> - <li><a href="./javascript.html#carousel">Carousel</a></li> - <li><a href="./javascript.html#typeahead">Typeahead</a></li> + <li class="active"><a href="#javascript">Overview</a></li> + <li><a href="#modals">Modal</a></li> + <li><a href="#dropdowns">Dropdown</a></li> + <li><a href="#scrollspy">Scrollspy</a></li> + <li><a href="#tabs">Tab</a></li> + <li><a href="#tooltips">Tooltip</a></li> + <li><a href="#popovers">Popover</a></li> + <li><a href="#alerts">Alert</a></li> + <li><a href="#buttons">Button</a></li> + <li><a href="#collapse">Collapse</a></li> + <li><a href="#carousel">Carousel</a></li> + <li><a href="#typeahead">Typeahead</a></li> </ul> </div> </header> |