mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
This commit is contained in:
Mark Otto
2013-01-31 17:57:31 -08:00
parent d30f47efb2 baadc33c88
commit 83e5c01856
8 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/js/application.js
+6 -6
View File
@@ -34,12 +34,12 @@
})
// add tipsies to grid for scaffolding
// if ($('#gridSystem').length) {
// $('#gridSystem').tooltip({
// selector: '.show-grid > div:not(.tooltip)'
// , title: function () { return $(this).width() + 'px' }
// })
// }
if ($('#gridSystem').length) {
$('#gridSystem').tooltip({
selector: '.show-grid > [class*="span"]'
, title: function () { return $(this).width() + 'px' }
})
}
// tooltip demo
$('.tooltip-demo').tooltip({