mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-10-01 15:56:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into document_popover_focus

Browse Source 
Conflicts:
	docs/assets/js/docs.min.js
This commit is contained in:
Mark Otto
2014-03-07 01:30:28 -08:00
parent 642fd51002 1f148427de
commit 0143e38a67
125 changed files with 12970 additions and 6441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@
var navHeight = $('.navbar').outerHeight(true) + 10
$body.scrollspy({
target: '.bs-sidebar',
target: '.bs-docs-sidebar',
// offset: navHeight
})
@@ -48,7 +48,7 @@
// back to top
setTimeout(function () {
var $sideBar = $('.bs-sidebar')
var $sideBar = $('.bs-docs-sidebar')
$sideBar.affix({
offset: {
@@ -60,7 +60,7 @@
return (this.top = offsetTop - navOuterHeight - sideBarMargin)
},
bottom: function () {
return (this.bottom = $('.bs-footer').outerHeight(true))
return (this.bottom = $('.bs-docs-footer').outerHeight(true))
}
}
})