compass_twitter_bootstrap 2.0.1.2 → 2.0.3

data/stylesheets/compass_twitter_bootstrap/_accordion.scss

@@ -11,7 +11,7 @@
 .accordion-group {
   margin-bottom: 2px;
   border: 1px solid #e5e5e5;
-  @include border-radius(4px);
+  @include bootstrap-border-radius(4px);
 }
 .accordion-heading {
   border-bottom: 0;
@@ -21,6 +21,11 @@
   padding: 8px 15px;
 }
 
+// General toggle styles
+.accordion-toggle {
+  cursor: pointer;
+}
+
 // Inner needs the styles because you can't animate properly with any styles on the element
 .accordion-inner {
   padding: 9px 15px;

data/stylesheets/compass_twitter_bootstrap/_alerts.scss

@@ -8,11 +8,11 @@
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
   background-color: $warningBackground;
   border: 1px solid $warningBorder;
-  @include border-radius(4px);
+  @include bootstrap-border-radius(4px);
+  color: $warningText;
 }
-.alert,
 .alert-heading {
-  color: $warningText;
+  color: inherit;
 }
 
 // Adjust close link position
@@ -29,32 +29,20 @@
 .alert-success {
   background-color: $successBackground;
   border-color: $successBorder;  
-}
-.alert-success,
-.alert-success .alert-heading {
   color: $successText;
 }
 .alert-danger,
 .alert-error {
   background-color: $errorBackground;
   border-color: $errorBorder;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
   color: $errorText;
 }
 .alert-info {
   background-color: $infoBackground;
   border-color: $infoBorder;
-}
-.alert-info,
-.alert-info .alert-heading {
   color: $infoText;
 }
 
-
 // Block alerts
 // ------------------------
 .alert-block {

data/stylesheets/compass_twitter_bootstrap/_breadcrumbs.scss

@@ -4,12 +4,14 @@
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 $baseLineHeight;
-  @include gradient-vertical($white, #f5f5f5);
+  list-style: none;
+  @include bootstrap-gradient-vertical($white, #f5f5f5);
   border: 1px solid #ddd;
-  @include border-radius(3px);
-  @include box-shadow(inset 0 1px 0 $white);
+  @include bootstrap-border-radius(3px);
+  @include bootstrap-box-shadow(inset 0 1px 0 $white);
   li {
     display: inline-block;
+    @include bootstrap-ie7-inline-block();
     text-shadow: 0 1px 0 $white;
   }
   .divider {

data/stylesheets/compass_twitter_bootstrap/_button-groups.scss

@@ -5,8 +5,8 @@
 // Make the div behave like a button
 .btn-group {
   position: relative;
-  @include clearfix(); // clears the floated buttons
-  @include ie7-restore-left-whitespace();
+  @include bootstrap-clearfix(); // clears the floated buttons
+  @include bootstrap-ie7-restore-left-whitespace();
 }
 
 // Space out series of button groups
@@ -20,19 +20,19 @@
   margin-bottom: $baseLineHeight / 2;
   .btn-group {
     display: inline-block;
-    @include ie7-inline-block();
+    @include bootstrap-ie7-inline-block();
   }
 }
 
 // Float them, remove border radius, then re-add to first and last elements
-.btn-group .btn {
+.btn-group > .btn {
   position: relative;
   float: left;
   margin-left: -1px;
-  @include border-radius(0);
+  @include bootstrap-border-radius(0);
 }
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group .btn:first-child {
+.btn-group > .btn:first-child {
   margin-left: 0;
      -webkit-border-top-left-radius: 4px;
          -moz-border-radius-topleft: 4px;
@@ -41,8 +41,9 @@
       -moz-border-radius-bottomleft: 4px;
           border-bottom-left-radius: 4px;
 }
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
      -webkit-border-top-right-radius: 4px;
          -moz-border-radius-topright: 4px;
              border-top-right-radius: 4px;
@@ -51,7 +52,7 @@
           border-bottom-right-radius: 4px;
 }
 // Reset corners for large buttons
-.btn-group .btn.large:first-child {
+.btn-group > .btn.large:first-child {
   margin-left: 0;
      -webkit-border-top-left-radius: 6px;
          -moz-border-radius-topleft: 6px;
@@ -60,8 +61,8 @@
       -moz-border-radius-bottomleft: 6px;
           border-bottom-left-radius: 6px;
 }
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle {
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
      -webkit-border-top-right-radius: 6px;
          -moz-border-radius-topright: 6px;
              border-top-right-radius: 6px;
@@ -71,10 +72,10 @@
 }
 
 // On hover/focus/active, bring the proper btn to front
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active {
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
   z-index: 2;
 }
 
@@ -90,34 +91,60 @@
 // ----------------------
 
 // Give the line between buttons some depth
-.btn-group .dropdown-toggle {
+.btn-group > .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  $shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  @include box-shadow($shadow);
-  *padding-top: 5px;
-  *padding-bottom: 5px;
+  @include bootstrap-box-shadow("inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+  *padding-top: 4px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-mini.dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+.btn-group > .btn-small.dropdown-toggle {
+  *padding-top: 4px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-large.dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
 }
 
 .btn-group.open {
-  // IE7's z-index only goes to the nearest positioned ancestor, which would
-  // make the menu appear below buttons that appeared later on the page
-  *z-index: $zindexDropdown;
-
-  // Reposition menu on open and round all corners
-  .dropdown-menu {
-    display: block;
-    margin-top: 1px;
-    @include border-radius(5px);
-  }
 
+  // The clickable button for toggling the menu
+  // Remove the gradient and set the same inset shadow as the :active state
   .dropdown-toggle {
     background-image: none;
-    $shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-    @include box-shadow($shadow);
+    @include bootstrap-box-shadow("inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
+
+  // Keep the hover's background when dropdown is open
+  .btn.dropdown-toggle {
+    background-color: $btnBackgroundHighlight;
+  }
+  .btn-primary.dropdown-toggle {
+    background-color: $btnPrimaryBackgroundHighlight;
+  }
+  .btn-warning.dropdown-toggle {
+    background-color: $btnWarningBackgroundHighlight;
+  }
+  .btn-danger.dropdown-toggle {
+    background-color: $btnDangerBackgroundHighlight;
+  }
+  .btn-success.dropdown-toggle {
+    background-color: $btnSuccessBackgroundHighlight;
+  }
+  .btn-info.dropdown-toggle {
+    background-color: $btnInfoBackgroundHighlight;
+  }
+  .btn-inverse.dropdown-toggle {
+    background-color: $btnInverseBackgroundHighlight;
   }
 }
 
+
 // Reposition the caret
 .btn .caret {
   margin-top: 7px;
@@ -125,24 +152,40 @@
 }
 .btn:hover .caret,
 .open.btn-group .caret {
-  @include opacity(1.0);
+  @include bootstrap-opacity(100);
+}
+// Carets in other button sizes
+.btn-mini .caret {
+  margin-top: 5px;
+}
+.btn-small .caret {
+  margin-top: 6px;
+}
+.btn-large .caret {
+  margin-top: 6px;
+  border-left-width:  5px;
+  border-right-width: 5px;
+  border-top-width:   5px;
 }
+// Upside down carets for .dropup
+.dropup .btn-large .caret {
+  border-bottom: 5px solid $black;
+  border-top: 0;
+}
+
 
 
 // Account for other colors
 .btn-primary,
+.btn-warning,
 .btn-danger,
 .btn-info,
 .btn-success,
 .btn-inverse {
   .caret {
     border-top-color: $white;
-    @include opacity(0.75);
+    border-bottom-color: $white;
+    @include bootstrap-opacity(75);
   }
 }
 
-// Small button dropdowns
-.btn-small .caret {
-  margin-top: 4px;
-}
-

data/stylesheets/compass_twitter_bootstrap/_buttons.scss

@@ -8,25 +8,24 @@
 // Core
 .btn {
   display: inline-block;
+  @include bootstrap-ie7-inline-block();
   padding: 4px 10px 4px;
   margin-bottom: 0; // For input.btn
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
+  *line-height: 20px;
   color: $grayDark;
   text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   vertical-align: middle;
-  @include buttonBackground($white, darken($white, 10%));
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
-  @include border-radius(4px);
-  $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  @include box-shadow($shadow);
   cursor: pointer;
-
-  // Give IE7 some love
-  @include reset-filter();
-  @include ie7-restore-left-whitespace();
+  @include bootstrap-buttonBackground($btnBackground, $btnBackgroundHighlight);
+  border: 1px solid $btnBorder;
+  *border: 0; // Remove the border to prevent IE7's black border on input:focus
+  border-bottom-color: darken($btnBorder, 10%);
+  @include bootstrap-border-radius(4px);
+  @include bootstrap-ie7-restore-left-whitespace(); // Give IE7 some love
+  @include bootstrap-box-shadow("inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
 }
 
 // Hover state
@@ -34,37 +33,37 @@
   color: $grayDark;
   text-decoration: none;
   background-color: darken($white, 10%);
+  *background-color: darken($white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
   background-position: 0 -15px;
 
   // transition is only when going to hover, otherwise the background
   // behind the gradient (there for IE<=9 fallback) gets mismatched
-  @include transition(background-position .1s linear);
+  @include bootstrap-transition(background-position .1s linear);
 }
 
 // Focus state for keyboard and accessibility
 .btn:focus {
-  @include tab-focus();
+  @include bootstrap-tab-focus();
 }
 
 // Active state
 .btn.active,
 .btn:active {
-  background-image: none;
-  $shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-  @include box-shadow($shadow);
   background-color: darken($white, 10%);
-  background-color: darken($white, 15%) e("\9");
+  background-color: darken($white, 15%)\9;
+  background-image: none;
   outline: 0;
+  @include bootstrap-box-shadow("inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
 }
 
 // Disabled state
 .btn.disabled,
 .btn[disabled] {
   cursor: default;
-  background-image: none;
   background-color: darken($white, 10%);
-  @include opacity(0.65);
-  @include box-shadow(none);
+  background-image: none;
+  @include bootstrap-opacity(65);
+  @include bootstrap-box-shadow(none);
 }
 
 
@@ -76,7 +75,7 @@
   padding: 9px 14px;
   font-size: $baseFontSize + 2px;
   line-height: normal;
-  @include border-radius(5px);
+  @include bootstrap-border-radius(5px);
 }
 .btn-large [class^="icon-"] {
   margin-top: 1px;
@@ -117,8 +116,8 @@
 .btn-info:hover,
 .btn-inverse,
 .btn-inverse:hover {
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   color: $white;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }
 // Provide *some* extra contrast for those who can get it
 .btn-primary.active,
@@ -126,34 +125,39 @@
 .btn-danger.active,
 .btn-success.active,
 .btn-info.active,
-.btn-dark.active {
+.btn-inverse.active {
   color: rgba(255,255,255,.75);
 }
 
 // Set the backgrounds
 // -------------------------
+.btn {
+  // reset here as of 2.0.3 due to Recess property order
+  border-color: #ccc;
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
+}
 .btn-primary {
-  @include buttonBackground($primaryButtonBackground, adjust-hue($primaryButtonBackground, 20));
+  @include bootstrap-buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
 }
 // Warning appears are orange
 .btn-warning {
-  @include buttonBackground(lighten($orange, 15%), $orange);
+  @include bootstrap-buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
 }
 // Danger and error appear as red
 .btn-danger {
-  @include buttonBackground(#ee5f5b, #bd362f);
+  @include bootstrap-buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
 }
 // Success appears as green
 .btn-success {
-  @include buttonBackground(#62c462, #51a351);
+  @include bootstrap-buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
 }
 // Info appears as a neutral blue
 .btn-info {
-  @include buttonBackground(#5bc0de, #2f96b4);
+  @include bootstrap-buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
 }
 // Inverse appears as dark gray
 .btn-inverse {
-  @include buttonBackground(#454545, #262626);
+  @include bootstrap-buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
 }
 
 
@@ -172,12 +176,16 @@ input[type="submit"].btn {
   // IE7 has some default padding on button controls
   *padding-top: 2px;
   *padding-bottom: 2px;
-  &.large {
+  &.btn-large {
     *padding-top: 7px;
     *padding-bottom: 7px;
   }
-  &.small {
+  &.btn-small {
     *padding-top: 3px;
     *padding-bottom: 3px;
   }
+  &.btn-mini {
+    *padding-top: 1px;
+    *padding-bottom: 1px;
+  }
 }