Merge branch '2.1.2-wip' into box-sizing-exercise

This commit is contained in:
Mark Otto
2012-09-26 16:02:33 -07:00
14 changed files with 32 additions and 64 deletions

View File

@@ -2,16 +2,6 @@
// Modals
// --------------------------------------------------
// 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; }
.tooltip { z-index: @zindexTooltip + @zindexModal; }
}
// Background
.modal-backdrop {
position: fixed;