1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-29 06:49:06 +02:00

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

Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html
This commit is contained in:
Jacob Thornton
2011-12-22 19:15:09 -08:00
17 changed files with 471 additions and 93 deletions

View File

@@ -4,6 +4,18 @@ $(function(){
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
// Hide the Mobile Safari address bar once loaded
// ==============================================
// Set a timeout...
setTimeout(function(){
// Hide the address bar!
window.scrollTo(0, 1);
}, 0);
// table sort example
// ==================
// make code pretty
prettyPrint && prettyPrint()
@@ -61,4 +73,4 @@ $(function(){
}
}
})
})