mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 10:34:07 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
fat
2013-07-17 21:14:02 -07:00
parent bf38241f0d 55fa1acbd6
commit 102df4ff33
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/bootstrap.js vendored
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

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long