mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

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

Browse Source 
Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html
This commit is contained in:
fat
2013-05-16 11:08:46 -07:00
parent 14651035de f3d8577734
commit a4c16155a2
45 changed files with 8055 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/js/application.js
+9 -9
View File
@@ -14,17 +14,17 @@
})
// back to top
// setTimeout(function () {
// $('.bs-docs-sidenav').affix({
// offset: {
// top: function () { return $window.width() <= 980 ? 290 : 210 }
// , bottom: 270
// }
// })
// }, 100)
setTimeout(function () {
$('.bs-sidebar').affix({
offset: {
top: function () { return $window.width() <= 980 ? 290 : 210 }
, bottom: 270
}
})
}, 100)
setTimeout(function () {
$('.bs-docs-top').affix()
$('.bs-top').affix()
}, 100)
// make code pretty