sass-twitter-bootstrap 0.1.0 → 2.0.1

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

@@ -4,14 +4,12 @@
 .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/twitter/_button-groups.scss

@@ -25,14 +25,14 @@
 }
 
 // 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);
 }
 // 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,9 +41,8 @@
       -moz-border-radius-bottomleft: 4px;
           border-bottom-left-radius: 4px;
 }
-// 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 {
+.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;
@@ -52,7 +51,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;
@@ -61,8 +60,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;
@@ -72,10 +71,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;
 }
 
@@ -91,60 +90,34 @@
 // ----------------------
 
 // Give the line between buttons some depth
-.btn-group > .dropdown-toggle {
+.btn-group .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  @include 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;
+  $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;
 }
 
 .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;
-    @include 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;
+    $shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+    @include box-shadow($shadow);
   }
 }
 
-
 // Reposition the caret
 .btn .caret {
   margin-top: 7px;
@@ -154,38 +127,21 @@
 .open.btn-group .caret {
   @include 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;
-    border-bottom-color: $white;
     @include opacity(75);
   }
 }
 
+// Small button dropdowns
+.btn-small .caret {
+  margin-top: 4px;
+}

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

@@ -8,24 +8,25 @@
 // Core
 .btn {
   display: inline-block;
-  @include 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;
-  cursor: pointer;
-  @include 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 buttonBackground($white, darken($white, 10%));
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
   @include border-radius(4px);
-  @include ie7-restore-left-whitespace(); // Give IE7 some love
-  @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)});
+  $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();
 }
 
 // Hover state
@@ -33,7 +34,6 @@
   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
@@ -49,19 +49,20 @@
 // Active state
 .btn.active,
 .btn:active {
-  background-color: darken($white, 10%);
-  background-color: darken($white, 15%) \9;
   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%) #{"\9"};
   outline: 0;
-  @include 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-color: darken($white, 10%);
   background-image: none;
+  background-color: darken($white, 10%);
   @include opacity(65);
   @include box-shadow(none);
 }
@@ -116,8 +117,8 @@
 .btn-info:hover,
 .btn-inverse,
 .btn-inverse:hover {
-  color: $white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  color: $white;
 }
 // Provide *some* extra contrast for those who can get it
 .btn-primary.active,
@@ -125,39 +126,34 @@
 .btn-danger.active,
 .btn-success.active,
 .btn-info.active,
-.btn-inverse.active {
+.btn-dark.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($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
+  @include buttonBackground($primaryButtonBackground, adjust-hue($primaryButtonBackground, 20));
 }
 // Warning appears are orange
 .btn-warning {
-  @include buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
+  @include buttonBackground(lighten($orange, 15%), $orange);
 }
 // Danger and error appear as red
 .btn-danger {
-  @include buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
+  @include buttonBackground(#ee5f5b, #bd362f);
 }
 // Success appears as green
 .btn-success {
-  @include buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
+  @include buttonBackground(#62c462, #51a351);
 }
 // Info appears as a neutral blue
 .btn-info {
-  @include buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
+  @include buttonBackground(#5bc0de, #2f96b4);
 }
 // Inverse appears as dark gray
 .btn-inverse {
-  @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
+  @include buttonBackground(#454545, #262626);
 }
 
 
@@ -176,16 +172,12 @@ input[type="submit"].btn {
   // IE7 has some default padding on button controls
   *padding-top: 2px;
   *padding-bottom: 2px;
-  &.btn-large {
+  &.large {
     *padding-top: 7px;
     *padding-bottom: 7px;
   }
-  &.btn-small {
+  &.small {
     *padding-top: 3px;
     *padding-bottom: 3px;
   }
-  &.btn-mini {
-    *padding-top: 1px;
-    *padding-bottom: 1px;
-  }
 }

data/vendor/assets/stylesheets/twitter/_close.scss

@@ -12,18 +12,7 @@
   &:hover {
     color: $black;
     text-decoration: none;
-    cursor: pointer;
     @include opacity(40);
+    cursor: pointer;
   }
 }
-
-// Additional properties for button version
-// iOS requires the button element instead of an anchor tag.
-// If you want the anchor version, it requires `href="#"`.
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}

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

@@ -1,4 +1,4 @@
-// Code
+// Code.scss
 // Code typography styles for the <code> and <pre> elements
 // --------------------------------------------------------
 
@@ -14,7 +14,7 @@ pre {
 
 // Inline code
 code {
-  padding: 2px 4px;
+  padding: 3px 4px;
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
@@ -25,16 +25,16 @@ pre {
   display: block;
   padding: ($baseLineHeight - 1) / 2;
   margin: 0 0 $baseLineHeight / 2;
-  font-size: $baseFontSize * .925; // 13px to 12px
+  font-size: 12px;
   line-height: $baseLineHeight;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
   background-color: #f5f5f5;
   border: 1px solid #ccc; // fallback for IE7-8
   border: 1px solid rgba(0,0,0,.15);
   @include border-radius(4px);
+  white-space: pre;
+  white-space: pre-wrap;
+  word-break: break-all;
+  word-wrap: break-word;
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
@@ -54,4 +54,4 @@ pre {
 .pre-scrollable {
   max-height: 340px;
   overflow-y: scroll;
-}
+}

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

@@ -2,19 +2,17 @@
 // --------------------
 
 .fade {
-  @include opacity(0);
   @include transition(opacity .15s linear);
+  opacity: 0;
   &.in {
-    @include opacity(100);
+    opacity: 1;
   }
 }
 
 .collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
   @include transition(height .35s ease);
-  &.in {
-    height: auto;
-  }
-}
+  position:relative;
+  overflow:hidden;
+  height: 0;
+  &.in { height: auto; }
+}

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

@@ -2,7 +2,6 @@
 // --------------
 
 // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
-.dropup,
 .dropdown {
   position: relative;
 }
@@ -14,64 +13,77 @@
 .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-top:   4px solid $black;
-  border-right: 4px solid transparent;
   border-left:  4px solid transparent;
-  content: "";
+  border-right: 4px solid transparent;
+  border-top:   4px solid $black;
   @include opacity(30);
+  content: "\2193";
 }
-
-// Place the caret
 .dropdown .caret {
   margin-top: 8px;
   margin-left: 2px;
 }
 .dropdown:hover .caret,
-.open .caret {
+.open.dropdown .caret {
   @include opacity(100);
 }
-
 // The dropdown menu (ul)
-// ----------------------
 .dropdown-menu {
   position: absolute;
   top: 100%;
   left: 0;
   z-index: $zindexDropdown;
-  display: none; // none by default, but block on "open" of the menu
   float: left;
+  display: none; // none by default, but block on "open" of the menu
   min-width: 160px;
+  _width: 160px;
   padding: 4px 0;
-  margin: 1px 0 0; // override default ul
+  margin: 0; // override default ul
   list-style: none;
-  background-color: $dropdownBackground;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  @include border-radius(5px);
+  background-color: $white;
+  border-color: #ccc;
+  border-color: rgba(0,0,0,.2);
+  border-style: solid;
+  border-width: 1px;
+  @include border-radius(0 0 5px 5px);
   @include box-shadow(0 5px 10px rgba(0,0,0,.2));
   -webkit-background-clip: padding-box;
      -moz-background-clip: padding;
           background-clip: padding-box;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
 
-  // Aligns the dropdown menu to right
-  &.pull-right {
-    right: 0;
-    left: auto;
+  // Allow for dropdowns to go bottom up (aka, dropup-menu)
+  &.bottom-up {
+    top: auto;
+    bottom: 100%;
+    margin-bottom: 2px;
   }
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    @include nav-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;
   }
 
   // Links within the dropdown menu
@@ -81,62 +93,37 @@
     clear: both;
     font-weight: normal;
     line-height: $baseLineHeight;
-    color: $dropdownLinkColor;
+    color: $gray;
     white-space: nowrap;
   }
 }
 
 // Hover state
-// -----------
 .dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
-  color: $dropdownLinkColorHover;
+  color: $white;
   text-decoration: none;
-  background-color: $dropdownLinkBackgroundHover;
+  background-color: $linkColor;
 }
 
 // Open state for the dropdown
-// ---------------------------
-.open {
+.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
   *z-index: $zindexDropdown;
 
-  .dropdown-menu {
-    display: block;
+  .dropdown-toggle {
+    color: $white;
+    background: #ccc;
+    background: rgba(0,0,0,.3);
   }
-}
-
-// Right aligned dropdowns
-// ---------------------------
-.pull-right .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-
-// 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;
+    display: block;
   }
 }
 
 // Typeahead
-// ---------
 .typeahead {
   margin-top: 2px; // give it some space to breathe
   @include border-radius(4px);