mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2013-02-07 22:18:53 -08:00
parent a9729c5fd0 8c7f9c66a7
commit 2aa1a4dc70
12 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/bootstrap-tooltip.js vendored
View File

@@ -245,7 +245,7 @@
, fixTitle: function () {
var $e = this.$element
if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
$e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
}
}