vendor/frameworks/twitter/bootstrap/modals.scss in anjlab-bootstrap-rails-2.1.1.1 vs vendor/frameworks/twitter/bootstrap/modals.scss in anjlab-bootstrap-rails-2.2.0.0
- old
+ new
@@ -1,19 +1,9 @@
//
// 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;
top: 0;
right: 0;
@@ -34,20 +24,22 @@
.modal {
position: fixed;
top: 50%;
left: 50%;
z-index: $zindexModal;
- overflow: auto;
width: 560px;
margin: -250px 0 0 -280px;
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 background-clip(padding-box);
+ // Remove focus outline from opened modal
+ outline: none;
+
&.fade {
@include transition(#{'opacity .3s linear, top .3s ease-out'});
top: -25%;
}
&.fade.in { top: 50%; }
@@ -92,7 +84,11 @@
margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
}
// but override that for button groups
.btn-group .btn + .btn {
margin-left: -1px;
+ }
+ // and override it for block buttons as well
+ .btn-block + .btn-block {
+ margin-left: 0;
}
}