_modals.scss in bootstrapped-rails-2.0.7.9

- old
+ new

@@ -1,14 +1,14 @@
 // MODALS
 // ------
 
 // Recalculate z-index where appropriate
 .modal-open {
-  .dropdown-menu {  z-index: $zindexDropdown + $zindexModal; }
+  .dropdown-menu { z-index: $zindexDropdown + $zindexModal; }
   .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
-  .popover       {  z-index: $zindexPopover  + $zindexModal; }
-  .tooltip       {  z-index: $zindexTooltip  + $zindexModal; }
+  .popover { z-index: $zindexPopover + $zindexModal; }
+  .tooltip { z-index: $zindexTooltip + $zindexModal; }
 }
 
 // Background
 .modal-backdrop {
   position: fixed;
@@ -20,21 +20,21 @@
   background-color: $black;
   // Fade for backdrop
   &.fade { opacity: 0; }
 }
 
-.modal-backdrop, .modal-backdrop.fade.in {
-  @include opacity(0.8);
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  @include opacity(80);
 }
 
 // Base modal
 .modal {
   position: fixed;
   top: 50%;
   left: 50%;
   z-index: $zindexModal;
-  max-height: 500px;
   overflow: auto;
   width: 560px;
   margin: -250px 0 0 -280px;
   background-color: $white;
   border: 1px solid #999;
@@ -42,12 +42,11 @@
   *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);
   &.fade {
-    $transition: opacity .3s linear, top .3s ease-out;
-    @include transition($transition);
+    @include transition(e('opacity .3s linear, top .3s ease-out'));
     top: -25%;
   }
   &.fade.in { top: 50%; }
 }
 .modal-header {
@@ -55,29 +54,37 @@
   border-bottom: 1px solid #eee;
   // Close icon
   .close { margin-top: 2px; }
 }
 
-// Body (where all modal content resides)
+// Body (where all modal content resises)
 .modal-body {
+  overflow-y: auto;
+  max-height: 400px;
   padding: 15px;
 }
 // Remove bottom margin if need be
-.modal-body .modal-form {
+.modal-form {
   margin-bottom: 0;
 }
 
 // Footer (for actions)
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;
+  text-align: right;
   background-color: #f5f5f5;
   border-top: 1px solid #ddd;
   @include border-radius(0 0 6px 6px);
   @include box-shadow(inset 0 1px 0 $white);
-  @include clearfix();
-  .btn {
-    float: right;
+  @include clearfix(); // clear it in case folks use .pull-* classes on buttons
+
+  // Properly space out buttons
+  .btn + .btn {
     margin-left: 5px;
     margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
   }
-}
+  // but override tht for button groups
+  .btn-group .btn + .btn {
+    margin-left: -1px;
+  }
+}
\ No newline at end of file