From 12d3c2fe74bbe2570e47a2c8d7154a3011bd0770 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 12:08:41 -0800 Subject: fix z-index issue with modals for popovers,tooltips,and dropdowns --- docs/assets/css/bootstrap.css | 12 ++++++++++++ docs/assets/js/application.js | 9 ++------- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'docs/assets') 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]") -- cgit v1.2.3