bootstrap-sass 2.0.1 → 2.0.2

data/vendor/assets/stylesheets/bootstrap/_alerts.scss

@@ -9,10 +9,11 @@
   background-color: $warningBackground;
   border: 1px solid $warningBorder;
   @include border-radius(4px);
-}
-.alert, .alert-heading {
   color: $warningText;
 }
+.alert-heading {
+  color: inherit;
+}
 
 // Adjust close link position
 .alert .close {
@@ -28,26 +29,19 @@
 .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/vendor/assets/stylesheets/bootstrap/_badges.scss

@@ -0,0 +1,36 @@
+// BADGES
+// ------
+
+// Base
+.badge {
+  padding: 1px 9px 2px;
+  font-size: $baseFontSize * .925;
+  font-weight: bold;
+  white-space: nowrap;
+  color: $white;
+  background-color: $grayLight;
+  @include border-radius(9px);
+}
+
+// Hover state
+.badge:hover {
+  color: $white;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+// Colors
+.badge-error            { background-color: $errorText; }
+.badge-error:hover      { background-color: darken($errorText, 10%); }
+
+.badge-warning          { background-color: $orange; }
+.badge-warning:hover    { background-color: darken($orange, 10%); }
+
+.badge-success          { background-color: $successText; }
+.badge-success:hover    { background-color: darken($successText, 10%); }
+
+.badge-info             { background-color: $infoText; }
+.badge-info:hover       { background-color: darken($infoText, 10%); }
+
+.badge-inverse          { background-color: $grayDark; }
+.badge-inverse:hover    { background-color: darken($grayDark, 10%); }

data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss

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

data/vendor/assets/stylesheets/bootstrap/_button-groups.scss

@@ -89,8 +89,22 @@
   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;
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+.btn-group .btn-mini.dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+.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 {
@@ -120,17 +134,25 @@
 .btn:hover .caret, .open.btn-group .caret {
   @include opacity(1);
 }
-
+// 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:  5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top:   5px solid $black;
+}
 
 // Account for other colors
-.btn-primary, .btn-danger, .btn-info, .btn-success, .btn-inverse {
+.btn-primary, .btn-warning, .btn-danger, .btn-info, .btn-success, .btn-inverse {
   .caret {
     border-top-color: $white;
+    border-bottom-color: $white;
     @include opacity(0.75);
   }
-}
-
-// Small button dropdowns
-.btn-small .caret {
-  margin-top: 4px;
-}
+}

data/vendor/assets/stylesheets/bootstrap/_buttons.scss

@@ -8,6 +8,7 @@
 // Core
 .btn {
   display: inline-block;
+  @include ie7-inline-block();
   padding: 4px 10px 4px;
   margin-bottom: 0; // For input.btn
   font-size: $baseFontSize;
@@ -16,16 +17,15 @@
   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 buttonBackground($btnBackground, $btnBackgroundHighlight);
+  border: 1px solid $btnBorder;
+  border-bottom-color: darken($btnBorder, 10%);
   @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();
 }
 
@@ -115,26 +115,26 @@
 // Set the backgrounds
 // -------------------------
 .btn-primary {
-  @include buttonBackground($primaryButtonBackground, adjust-hue($primaryButtonBackground, 20));
+  @include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
 }
 // Warning appears are orange
 .btn-warning {
-  @include buttonBackground(lighten($orange, 15%), $orange);
+  @include buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
 }
 // Danger and error appear as red
 .btn-danger {
-  @include buttonBackground(#ee5f5b, #bd362f);
+  @include buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
 }
 // Success appears as green
 .btn-success {
-  @include buttonBackground(#62c462, #51a351);
+  @include buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
 }
 // Info appears as a neutral blue
 .btn-info {
-  @include buttonBackground(#5bc0de, #2f96b4);
+  @include buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
 }
 .btn-inverse {
-  @include buttonBackground(#454545, #262626);
+  @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
 }
 
 
@@ -152,12 +152,16 @@ button.btn, 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;
+  }
 }

data/vendor/assets/stylesheets/bootstrap/_code.scss

@@ -13,7 +13,7 @@ code, pre {
 
 // Inline code
 code {
-  padding: 3px 4px;
+  padding: 2px 4px;
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
@@ -24,7 +24,7 @@ pre {
   display: block;
   padding: ($baseLineHeight - 1) / 2;
   margin: 0 0 $baseLineHeight / 2;
-  font-size: 12px;
+  font-size: $baseFontSize * .925; // 13px to 12px
   line-height: $baseLineHeight;
   background-color: #f5f5f5;
   border: 1px solid #ccc; // fallback for IE7-8

data/vendor/assets/stylesheets/bootstrap/_component-animations.scss

@@ -14,5 +14,7 @@
   position:relative;
   overflow:hidden;
   height: 0;
-  &.in { height: auto; }
+  &.in {
+    height: auto;
+  }
 }

data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss

@@ -12,22 +12,22 @@
 .dropdown-toggle:active, .open .dropdown-toggle {
   outline: 0;
 }
+
 // Dropdown arrow/caret
+// --------------------
 .caret {
   display: inline-block;
   width: 0;
   height: 0;
-  text-indent: -99999px;
-  // IE7 won't do the border trick if there's a text indent, but it doesn't
-  // do the content that text-indent is hiding, either, so we're ok.
-  *text-indent: 0;
   vertical-align: top;
   border-left:  4px solid transparent;
   border-right: 4px solid transparent;
   border-top:   4px solid $black;
   @include opacity(0.3);
-  content: "\2193";
+  content: "";
 }
+
+// Place the caret
 .dropdown .caret {
   margin-top: 8px;
   margin-left: 2px;
@@ -35,7 +35,9 @@
 .dropdown:hover .caret, .open.dropdown .caret {
   @include opacity(1);
 }
+
 // The dropdown menu (ul)
+// ----------------------
 .dropdown-menu {
   position: absolute;
   top: 100%;
@@ -44,11 +46,10 @@
   float: left;
   display: none; // none by default, but block on "open" of the menu
   min-width: 160px;
-  _width: 160px;
   padding: 4px 0;
   margin: 0; // override default ul
   list-style: none;
-  background-color: $white;
+  background-color: $dropdownBackground;
   border-color: #ccc;
   border-color: rgba(0,0,0,.2);
   border-style: solid;
@@ -61,27 +62,15 @@
   *border-right-width: 2px;
   *border-bottom-width: 2px;
 
-  // Allow for dropdowns to go bottom up (aka, dropup-menu)
-  &.bottom-up {
-    top: auto;
-    bottom: 100%;
-    margin-bottom: 2px;
+  // Aligns the dropdown menu to right
+  &.pull-right {
+    right: 0;
+    left: auto;
   }
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    height: 1px;
-    margin: 5px 1px;
-    overflow: hidden;
-    background-color: #e5e5e5;
-    border-bottom: 1px solid $white;
-
-    // IE7 needs a set width since we gave a height. Restricting just
-    // to IE7 to keep the 1px left/right space in other browsers.
-    // It is unclear where IE is getting the extra space that we need
-    // to negative-margin away, but so it goes.
-    *width: 100%;
-    *margin: -5px 0 5px;
+    @include nav-divider();
   }
 
   // Links within the dropdown menu
@@ -91,19 +80,21 @@
     clear: both;
     font-weight: normal;
     line-height: $baseLineHeight;
-    color: $gray;
+    color: $dropdownLinkColor;
     white-space: nowrap;
   }
 }
 
 // Hover state
+// -----------
 .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-  color: $white;
+  color: $dropdownLinkColorHover;
   text-decoration: none;
-  background-color: $linkColor;
+  background-color: $dropdownLinkBackgroundHover;
 }
 
 // Open state for the dropdown
+// ---------------------------
 .dropdown.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
@@ -119,7 +110,33 @@
   }
 }
 
+// Right aligned dropdowns
+.pull-right .dropdown-menu {
+  left: auto;
+  right: 0;
+}
+
+// Allow for dropdowns to go bottom up (aka, dropup-menu)
+// ------------------------------------------------------
+// Just add .dropup after the standard .dropdown class and you're set, bro.
+// TODO: abstract this so that the navbar fixed styles are not placed here?
+.dropup, .navbar-fixed-bottom .dropdown {
+  // Reverse the caret
+  .caret {
+    border-top: 0;
+    border-bottom: 4px solid $black;
+    content: "\2191";
+  }
+  // Different positioning for bottom up menu
+  .dropdown-menu {
+    top: auto;
+    bottom: 100%;
+    margin-bottom: 1px;
+  }
+}
+
 // Typeahead
+// ---------
 .typeahead {
   margin-top: 2px; // give it some space to breathe
   @include border-radius(4px);

data/vendor/assets/stylesheets/bootstrap/_forms.scss

@@ -42,7 +42,7 @@ label, input, button, select, textarea {
 }
 
 input, button, select, textarea {
-  @include font-family-sans-serif(); // And only set font-family here for those that need it (note the missing label element)
+  font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
 }
 
 // Identify controls by their labels
@@ -62,7 +62,7 @@ input, textarea, select, .uneditable-input {
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $gray;
-  border: 1px solid #ccc;
+  border: 1px solid $inputBorder;
   @include border-radius(3px);
 }
 .uneditable-textarea {
@@ -97,7 +97,7 @@ input[type="file"] {
   padding: initial;
   line-height: initial;
   border: initial;
-  background-color: $white;
+  background-color: $inputBackground;
   background-color: initial;
   @include box-shadow(none);
 }
@@ -123,7 +123,7 @@ input[type="file"] {
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  background-color: $white;
+  background-color: $inputBackground;
 }
 
 // Make multiple select elements height not fixed
@@ -223,7 +223,7 @@ input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditabl
 // GRID SIZING FOR INPUTS
 // ----------------------
 
-@include inputGridSystemGenerate($gridColumns, $gridColumnWidth, $gridGutterWidth);
+@include gridInput($gridColumnWidth, $gridGutterWidth);
 
 
 
@@ -233,7 +233,7 @@ input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditabl
 
 // Disabled and read-only inputs
 input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
-  background-color: #f5f5f5;
+  background-color: $inputDisabledBackground;
   border-color: #ddd;
   cursor: not-allowed;
 }
@@ -277,14 +277,15 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
   padding: ($baseLineHeight - 1) 20px $baseLineHeight;
   margin-top: $baseLineHeight;
   margin-bottom: $baseLineHeight;
-  background-color: #f5f5f5;
+  background-color: $grayLighter;
   border-top: 1px solid #ddd;
+  @include clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
 
 // For text that needs to appear as an input but should not be an input
 .uneditable-input {
   display: block;
-  background-color: $white;
+  background-color: $inputBackground;
   border-color: #eee;
   @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
   cursor: not-allowed;
@@ -298,17 +299,18 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 // HELP TEXT
 // ---------
 
+.help-block, .help-inline {
+  color: $gray; // lighten the text for some contrast
+}
+
 .help-block {
   display: block; // account for any element using help-block
-  margin-top: 5px;
-  margin-bottom: 0;
-  color: $grayLight;
+  margin-bottom: $baseLineHeight / 2;
 }
 
 .help-inline {
   display: inline-block;
   @include ie7-inline-block();
-  margin-bottom: 9px;
   vertical-align: middle;
   padding-left: 5px;
 }
@@ -321,8 +323,8 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend, .input-append {
   margin-bottom: 5px;
-  @include clearfix(); // Clear the float to prevent wrapping
-  input, .uneditable-input {
+  input, select, .uneditable-input {
+    *margin-left: 0;
     @include border-radius(0 3px 3px 0);
     &:focus {
       position: relative;
@@ -334,20 +336,20 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
     border-right-color: #ccc;
   }
   .add-on {
-    float: left;
-    display: block;
+    display: inline-block;
     width: auto;
     min-width: 16px;
     height: $baseLineHeight;
-    margin-right: -1px;
     padding: 4px 5px;
     font-weight: normal;
     line-height: $baseLineHeight;
-    color: $grayLight;
     text-align: center;
     text-shadow: 0 1px 0 $white;
-    background-color: #f5f5f5;
+    vertical-align: middle;
+    background-color: $grayLighter;
     border: 1px solid #ccc;
+  }
+  .add-on, .btn {
     @include border-radius(3px 0 0 3px);
   }
   .active {
@@ -356,31 +358,34 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
   }
 }
 .input-prepend {
-  .add-on {
-    *margin-top: 1px; /* IE6-7 */
+  .add-on, .btn {
+    margin-right: -1px;
   }
 }
 .input-append {
-  input, .uneditable-input {
-    float: left;
+  input, select, .uneditable-input {
     @include border-radius(3px 0 0 3px);
   }
   .uneditable-input {
     border-right-color: #ccc;
   }
-  .add-on {
-    margin-right: 0;
+  .add-on, .btn {
     margin-left: -1px;
     @include border-radius(0 3px 3px 0);
   }
-  input:first-child {
-    // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input
-    // inherit the sum of its ancestors' margins.
-    *margin-left: -160px;
-
-    &+.add-on {
-      *margin-left: -21px;
-    }
+}
+// Remove all border-radius for inputs with both prepend and append
+.input-prepend.input-append {
+  input, select, .uneditable-input {
+    @include border-radius(0);
+  }
+  .add-on:first-child, .btn:first-child {
+    margin-right: -1px;
+    @include border-radius(3px 0 0 3px);
+  }
+  .add-on:last-child, .btn:last-child {
+    margin-left: -1px;
+    @include border-radius(0 3px 3px 0);
   }
 }
 
@@ -405,25 +410,34 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 // -----------------
 
 .form-search, .form-inline, .form-horizontal {
-  input, textarea, select, .help-inline, .uneditable-input {
+  input, textarea, select, .help-inline, .uneditable-input, .input-prepend, .input-append {
     display: inline-block;
     margin-bottom: 0;
   }
   // Re-hide elemnts due to specifity
   .hide { display: none; }
 }
-.form-search label, .form-inline label, .form-search .input-append, .form-inline .input-append, .form-search .input-prepend, .form-inline .input-prepend {
+.form-search label, .form-inline label {
   display: inline-block;
 }
-// Make the prepend and append add-on vertical-align: middle;
-.form-search .input-append .add-on, .form-inline .input-prepend .add-on, .form-search .input-append .add-on, .form-inline .input-prepend .add-on {
-  vertical-align: middle;
+// Remove margin for input-prepend/-append
+.form-search .input-append, .form-inline .input-append, .form-search .input-prepend, .form-inline .input-prepend {
+  margin-bottom: 0;
 }
-// Inline checkbox/radio labels
-.form-search .radio, .form-inline .radio, .form-search .checkbox, .form-inline .checkbox {
+// Inline checkbox/radio labels (remove padding on left)
+.form-search .radio, .form-search .checkbox, .form-inline .radio, .form-inline .checkbox {
+  padding-left: 0;
   margin-bottom: 0;
   vertical-align: middle;
 }
+// Remove float and margin, set to inline-block
+.form-search .radio input[type="radio"], .form-search .checkbox input[type="checkbox"], .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: 0;
+  margin-right: 3px;
+}
+
+
 
 // Margin to space out fieldsets
 .control-group {
@@ -455,6 +469,15 @@ legend + .control-group {
   // Move over all input controls and content
   .controls {
     margin-left: 160px;
+    /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
+    *display: inline-block;
+    *margin-left: 0;
+    *padding-left: 20px;
+  }
+  // Remove bottom margin on block level help text since that's accounted for on .control-group
+  .help-block {
+    margin-top: $baseLineHeight / 2;
+    margin-bottom: 0;
   }
   // Move over buttons in .form-actions to align with .controls
   .form-actions {