2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

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

Conflicts:
	bootstrap.css
	docs/javascript.html
This commit is contained in:
Mark Otto
2011-12-21 18:39:02 -06:00
32 changed files with 9848 additions and 525 deletions
+1 -1
View File
@@ -68,7 +68,7 @@ $(function(){
// POSITION STATIC TWIPSIES
// ========================
$(window).bind( 'load resize', function () {
$(window).on('load resize', function () {
$(".twipsies a").each(function () {
$(this)
.twipsy({