2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

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

Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
fat
2013-07-17 21:14:02 -07:00
4 changed files with 17 additions and 3 deletions
+1 -1
View File
@@ -1169,6 +1169,7 @@
$tip
.detach()
.css({ top: 0, left: 0, display: 'block' })
.addClass(placement)
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
@@ -1205,7 +1206,6 @@
$tip
.offset(offset)
.addClass(placement)
.addClass('in')
var actualWidth = $tip[0].offsetWidth
+1 -1
View File
File diff suppressed because one or more lines are too long