diff options
| author | Mark Otto <[email protected]> | 2012-01-24 23:36:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 23:36:39 -0800 |
| commit | e555f38ae4b1a2503b8bd3599894bb6011e0adbd (patch) | |
| tree | 1f74fdfa4472bfd71ae42f6af6b46bf3218ea847 /docs | |
| parent | 6ab56051fdf916f03efb8aa6675e50bdd1cc3155 (diff) | |
| parent | 5d3175e84b2ada0978aca7dbbe2ec532e99c869a (diff) | |
| download | bootstrap-e555f38ae4b1a2503b8bd3599894bb6011e0adbd.tar.xz bootstrap-e555f38ae4b1a2503b8bd3599894bb6011e0adbd.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/less.html
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/js/application.js | 2 |
1 files changed, 1 insertions, 1 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() |