vendor/assets/stylesheets/bootstrap/_modals.scss in bootstrap-sass-2.1.0.1 vs vendor/assets/stylesheets/bootstrap/_modals.scss in bootstrap-sass-2.1.1.0
- old
+ new
@@ -1,12 +1,13 @@
//
// Modals
// --------------------------------------------------
-// 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; }
.tooltip { z-index: $zindexTooltip + $zindexModal; }
}
@@ -41,11 +42,11 @@
background-color: $white;
border: 1px solid #999;
border: 1px solid rgba(0,0,0,.3);
*border: 1px solid #999; /* IE6-7 */
@include border-radius(6px);
- @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
+ @include box-shadow(#{0 3px 7px rgba(0,0,0,0.3)});
@include background-clip(padding-box);
&.fade {
@include transition(#{opacity .3s linear, top .3s ease-out});
top: -25%;
}
@@ -80,10 +81,10 @@
margin-bottom: 0;
text-align: right; // right align buttons
background-color: #f5f5f5;
border-top: 1px solid #ddd;
@include border-radius(0 0 6px 6px);
- @include box-shadow(inset 0 1px 0 $white);
+ @include box-shadow(#{inset 0 1px 0 $white});
@include clearfix(); // clear it in case folks use .pull-* classes on buttons
// Properly space out buttons
.btn + .btn {
margin-left: 5px;
\ No newline at end of file