aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/js/application.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-27 22:52:56 -0800
committerMark Otto <[email protected]>2012-01-27 22:52:56 -0800
commit1d44f37fc9fb604ed88641c911639207b51d1008 (patch)
tree6bb780a0f4806b43bbfeb0af519b9787d51fc7b5 /docs/assets/js/application.js
parentcb8606f2c84adb57c82dd7bd401574a2376ff952 (diff)
parent7cbb5868259ef95aacbd16812c25ac73ea76ca2d (diff)
downloadbootstrap-1d44f37fc9fb604ed88641c911639207b51d1008.tar.xz
bootstrap-1d44f37fc9fb604ed88641c911639207b51d1008.zip
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/assets/js/application.js')
-rw-r--r--docs/assets/js/application.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 02cc730bd..a071a855b 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -106,7 +106,14 @@ $(function () {
$('.tooltip-demo.well').tooltip({
selector: "a[rel=tooltip]"
})
- $('.tooltip-test').tooltip()
+
+ $('.tooltip-test').tooltip({
+ 'z-index': 3000
+ })
+
+ $('.popover-test').popover({
+ 'z-index': 3000
+ })
// popover demo
$("a[rel=popover]")