mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 16:50:00 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/less.html
This commit is contained in:
Mark Otto
2012-01-24 23:36:39 -08:00
parent 6ab56051fd 5d3175e84b
commit e555f38ae4
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/application.js
View File

@@ -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()