vendor/assets/stylesheets/bootstrap/_modals.scss in bootstrap-sass-2.0.0 vs vendor/assets/stylesheets/bootstrap/_modals.scss in bootstrap-sass-2.0.1

- old
+ new

@@ -1,15 +1,17 @@ // MODALS // ------ +// Recalculate z-index where appropriate .modal-open { .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; top: 0; right: 0; bottom: 0; @@ -19,13 +21,14 @@ // Fade for backdrop &.fade { opacity: 0; } } .modal-backdrop, .modal-backdrop.fade.in { - @include opacity(80); + @include opacity(0.8); } +// Base modal .modal { position: fixed; top: 50%; left: 50%; z-index: $zindexModal; @@ -51,13 +54,21 @@ padding: 9px 15px; border-bottom: 1px solid #eee; // Close icon .close { margin-top: 2px; } } + +// Body (where all modal content resides) .modal-body { padding: 15px; } +// Remove bottom margin if need be +.modal-body .modal-form { + margin-bottom: 0; +} + +// Footer (for actions) .modal-footer { padding: 14px 15px 15px; margin-bottom: 0; background-color: #f5f5f5; border-top: 1px solid #ddd; @@ -67,6 +78,6 @@ .btn { float: right; margin-left: 5px; margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs } -} \ No newline at end of file +}