Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip

This commit is contained in:
Mark Otto
2012-08-27 21:06:29 -07:00
8 changed files with 38 additions and 18 deletions

View File

@@ -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; }