aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-27 21:06:29 -0700
committerMark Otto <[email protected]>2012-08-27 21:06:29 -0700
commit55982664d01686612facdfa09ad63ffabcbf28fe (patch)
tree592f6e43dba364ff3651dd2372591e81fed2c690 /less
parent1eaf1cf418c4b3595898346aeb32e0a1e5b31ea1 (diff)
parent601e252074eedf89de9cb080db9c463a4b67ba77 (diff)
downloadbootstrap-55982664d01686612facdfa09ad63ffabcbf28fe.tar.xz
bootstrap-55982664d01686612facdfa09ad63ffabcbf28fe.zip
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
Diffstat (limited to 'less')
-rw-r--r--less/modals.less5
1 files changed, 3 insertions, 2 deletions
diff --git a/less/modals.less b/less/modals.less
index e515bb796..81cacb7ab 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -3,8 +3,9 @@
// --------------------------------------------------
-// Recalculate z-index where appropriate
-.modal-open {
+// Recalculate z-index where appropriate,
+// but only apply to elements within modal
+.modal-open .modal {
.dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
.dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
.popover { z-index: @zindexPopover + @zindexModal; }