aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-28 12:08:41 -0800
committerJacob Thornton <[email protected]>2012-01-28 12:08:41 -0800
commit12d3c2fe74bbe2570e47a2c8d7154a3011bd0770 (patch)
tree8805a449345adbee6ac434a45bc8b4c2882c959b /docs/assets
parentc2c02d104c5e5a96330cf00a727d62687d863e02 (diff)
downloadbootstrap-12d3c2fe74bbe2570e47a2c8d7154a3011bd0770.tar.xz
bootstrap-12d3c2fe74bbe2570e47a2c8d7154a3011bd0770.zip
fix z-index issue with modals for popovers,tooltips,and dropdowns
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/css/bootstrap.css12
-rw-r--r--docs/assets/js/application.js9
2 files changed, 14 insertions, 7 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index cd0d620bf..1cce5e9df 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2238,6 +2238,18 @@ table .span12 {
.pager .previous a {
float: left;
}
+.modal-open .dropdown-menu {
+ z-index: 2050;
+}
+.modal-open .dropdown.open {
+ *z-index: 2050;
+}
+.modal-open .popover {
+ z-index: 2060;
+}
+.modal-open .tooltip {
+ z-index: 2070;
+}
.modal-backdrop {
position: fixed;
top: 0;
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 8fd672bb3..585700f8e 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -69,13 +69,8 @@
selector: "a[rel=tooltip]"
})
- $('.tooltip-test').tooltip({
- 'z-index': 3000
- })
-
- $('.popover-test').popover({
- 'z-index': 3000
- })
+ $('.tooltip-test').tooltip()
+ $('.popover-test').popover()
// popover demo
$("a[rel=popover]")