sass-twitter-bootstrap 2.1.1 → 2.2.1

data/vendor/assets/stylesheets/twitter/_progress-bars.scss

@@ -48,7 +48,7 @@
   margin-bottom: $baseLineHeight;
   @include gradient-vertical(#f5f5f5, #f9f9f9);
   @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
 }
 
 // Bar of progress
@@ -66,7 +66,7 @@
   @include transition(width .6s ease);
 }
 .progress .bar + .bar {
-  @include box-shadow(#{inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)});
+  @include box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15));
 }
 
 // Striped bars

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

@@ -3,6 +3,7 @@
 // Adapted from http://github.com/necolas/normalize.css
 // --------------------------------------------------
 
+
 // Display in IE6-9 and FF3
 // -------------------------
 
@@ -87,7 +88,8 @@ img {
 }
 
 // Prevent max-width from affecting Google Maps
-#map_canvas img {
+#map_canvas img,
+.google-maps img {
   max-width: none;
 }
 
@@ -114,11 +116,11 @@ input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
   border: 0;
 }
 button,
-input[type="button"],
+html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
 input[type="reset"],
 input[type="submit"] {
-  cursor: pointer; // Cursors on all buttons applied consistently
-  -webkit-appearance: button; // Style clickable inputs in iOS
+    -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
+    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
 }
 input[type="search"] { // Appearance in Safari/Chrome
   -webkit-box-sizing: content-box;

data/vendor/assets/stylesheets/twitter/_responsive-767px-max.scss

@@ -58,6 +58,7 @@
   }
   // Make all grid-sized elements block level again
   [class*="span"],
+  .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
   .row-fluid [class*="span"] {
     float: none;
     display: block;
@@ -70,6 +71,9 @@
     width: 100%;
     @include box-sizing(border-box);
   }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
 
   // FORM FIELDS
   // -----------
@@ -103,7 +107,8 @@
     right: 20px;
     width: auto;
     margin: 0;
-    &.fade.in { top: auto; }
+    &.fade  { top: -100px; }
+    &.fade.in { top: 20px; }
   }
 
 }
@@ -155,6 +160,20 @@
     }
   }
 
+  // Medias
+  // Reset float and spacing to stack
+  .media .pull-left,
+  .media .pull-right  {
+    float: none;
+    display: block;
+    margin-bottom: 10px;
+  }
+  // Remove side margins since we stack instead of indent
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+
   // Modals
   .modal {
     top:   10px;

data/vendor/assets/stylesheets/twitter/_responsive-navbar.scss

@@ -75,7 +75,7 @@
   .nav-collapse .btn {
     padding: 4px 10px 4px;
     font-weight: normal;
-    @include border-radius(4px);
+    @include border-radius($baseBorderRadius);
   }
   .nav-collapse .dropdown-menu li + li a {
     margin-bottom: 2px;
@@ -84,6 +84,10 @@
   .nav-collapse .dropdown-menu a:hover {
     background-color: $navbarBackground;
   }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: $navbarInverseLinkColor;
+  }
   .navbar-inverse .nav-collapse .nav > li > a:hover,
   .navbar-inverse .nav-collapse .dropdown-menu a:hover {
     background-color: $navbarInverseBackground;
@@ -99,7 +103,7 @@
     top: auto;
     left: auto;
     float: none;
-    display: block;
+    display: none;
     max-width: none;
     margin: 0 15px;
     padding: 0;
@@ -108,6 +112,10 @@
     @include border-radius(0);
     @include box-shadow(none);
   }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+
   .nav-collapse .dropdown-menu:before,
   .nav-collapse .dropdown-menu:after {
     display: none;
@@ -129,7 +137,7 @@
     margin: ($baseLineHeight / 2) 0;
     border-top: 1px solid $navbarBackground;
     border-bottom: 1px solid $navbarBackground;
-    @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)});
+    @include box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1));
   }
   .navbar-inverse .nav-collapse .navbar-form,
   .navbar-inverse .nav-collapse .navbar-search {
@@ -166,7 +174,7 @@
 // DEFAULT DESKTOP
 // ---------------
 
-@media (min-width: 980px) {
+@media (min-width: $navbarCollapseDesktopWidth) {
 
   // Required to make the collapsing navbar work on regular desktops
   .nav-collapse.collapse {

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

@@ -43,9 +43,7 @@ a:hover {
   background-color: #fff;
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.2);
-  -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.1);
-     -moz-box-shadow: 0 1px 3px rgba(0,0,0,.1);
-          box-shadow: 0 1px 3px rgba(0,0,0,.1);
+  @include box-shadow(0 1px 3px rgba(0,0,0,.1));
 }
 
 // Perfect circle

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

@@ -30,8 +30,6 @@
 
 /* White icons with optional class, or on hover/active states of certain elements */
 .icon-white,
-.nav-tabs > .active > a > [class^="icon-"],
-.nav-tabs > .active > a > [class*=" icon-"],
 .nav-pills > .active > a > [class^="icon-"],
 .nav-pills > .active > a > [class*=" icon-"],
 .nav-list > .active > a > [class^="icon-"],
@@ -41,7 +39,9 @@
 .dropdown-menu > li > a:hover > [class^="icon-"],
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"] {
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"] {
   background-image: url($iconWhiteSpritePath);
 }
 

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

@@ -71,7 +71,7 @@ table {
   border-collapse: separate; // Done so we can round those corners!
   *border-collapse: collapse; // IE7 can't round corners anyway
   border-left: 0;
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
   th,
   td {
     border-left: 1px solid $tableBorder;
@@ -133,12 +133,14 @@ table {
   colgroup + tbody tr:first-child td:last-child {
     -webkit-border-top-right-radius: 4px;
             border-top-right-radius: 4px;
-         -moz-border-radius-topleft: 4px;
+         -moz-border-radius-topright: 4px;
   }
 
 }
 
 
+
+
 // ZEBRA-STRIPING
 // --------------
 
@@ -170,17 +172,20 @@ table {
 // -----------------
 
 // Reset default grid behavior
-table [class*=span],
-.row-fluid table [class*=span] {
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
   display: table-cell;
   float: none; // undo default grid column styles
   margin-left: 0; // undo default grid column styles
 }
 
 // Change the column widths to account for td/th padding
-.table {
-  @for $i from 1 through 24 {
-    .span#{$i} { @include tableColumns($i); }
+.table td,
+.table th {
+  @for $i from 1 through 12 {
+    &.span#{$i} { @include tableColumns($i); }
   }
 }
 
@@ -205,7 +210,6 @@ table [class*=span],
   }
 }
 
-
 // Hover states for .table-hover
 .table-hover tbody tr {
   &.success:hover td {

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

@@ -29,7 +29,7 @@
   padding: 4px;
   line-height: $baseLineHeight;
   border: 1px solid #ddd;
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
   @include box-shadow(0 1px 3px rgba(0,0,0,.055));
   @include transition(all .2s ease-in-out);
 }

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

@@ -27,7 +27,7 @@
   text-align: center;
   text-decoration: none;
   background-color: $tooltipBackground;
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
 }
 
 // Arrows

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

@@ -37,18 +37,17 @@ cite {
 .muted {
   color: $grayLight;
 }
-.text-warning {
-  color: $warningText;
-}
-.text-error {
-  color: $errorText;
-}
-.text-info {
-  color: $infoText;
-}
-.text-success {
-  color: $successText;
-}
+.text-warning { color: $warningText; }
+a.text-warning:hover { color: darken($warningText, 10%); }
+
+.text-error { color: $errorText; }
+a.text-error:hover { color: darken($errorText, 10%); }
+
+.text-info { color: $infoText; }
+a.text-info:hover { color: darken($infoText, 10%); }
+
+.text-success { color: $successText; }
+a.text-success:hover { color: darken($successText, 10%); }
 
 
 // Headings
@@ -58,7 +57,7 @@ h1, h2, h3, h4, h5, h6 {
   margin: ($baseLineHeight / 2) 0;
   font-family: $headingsFontFamily;
   font-weight: $headingsFontWeight;
-  line-height: 1;
+  line-height: $baseLineHeight;
   color: $headingsColor;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
@@ -67,17 +66,22 @@ h1, h2, h3, h4, h5, h6 {
     color: $grayLight;
   }
 }
-h1 { font-size: 36px; line-height: 40px; }
-h2 { font-size: 30px; line-height: 40px; }
-h3 { font-size: 24px; line-height: 40px; }
-h4 { font-size: 18px; line-height: 20px; }
-h5 { font-size: 14px; line-height: 20px; }
-h6 { font-size: 12px; line-height: 20px; }
 
-h1 small { font-size: 24px; }
-h2 small { font-size: 18px; }
-h3 small { font-size: 14px; }
-h4 small { font-size: 14px; }
+h1,
+h2,
+h3 { line-height: $baseLineHeight * 2; }
+
+h1 { font-size: $baseFontSize * 2.75; } // ~38px
+h2 { font-size: $baseFontSize * 2.25; } // ~32px
+h3 { font-size: $baseFontSize * 1.75; } // ~24px
+h4 { font-size: $baseFontSize * 1.25; } // ~18px
+h5 { font-size: $baseFontSize; }
+h6 { font-size: $baseFontSize * 0.85; } // ~12px
+
+h1 small { font-size: $baseFontSize * 1.75; } // ~24px
+h2 small { font-size: $baseFontSize * 1.25; } // ~18px
+h3 small { font-size: $baseFontSize; }
+h4 small { font-size: $baseFontSize; }
 
 
 // Page header
@@ -155,7 +159,9 @@ hr {
 }
 
 // Abbreviations and acronyms
-abbr[title] {
+abbr[title],
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted $grayLight;
 }

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

@@ -57,6 +57,24 @@ $headingsFontFamily:    inherit !default; // empty to use BS default, $baseFontF
 $headingsFontWeight:    bold !default;    // instead of browser default, bold
 $headingsColor:         inherit !default; // empty to use BS default, $textColor
 
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+$fontSizeLarge:         $baseFontSize * 1.25; // ~18px
+$fontSizeSmall:         $baseFontSize * 0.85; // ~12px
+$fontSizeMini:          $baseFontSize * 0.75; // ~11px
+
+$paddingLarge:          11px 19px; // 44px
+$paddingSmall:          2px 10px;  // 26px
+$paddingMini:           1px 6px;   // 24px
+
+$baseBorderRadius:      4px;
+$borderRadiusLarge:     6px;
+$borderRadiusSmall:     3px;
+
+
 // Tables
 // -------------------------
 $tableBackground:                   transparent !default; // overall background-color
@@ -93,9 +111,11 @@ $btnInverseBackgroundHighlight:     $grayDarker !default;
 // -------------------------
 $inputBackground:               $white !default;
 $inputBorder:                   #ccc !default;
-$inputBorderRadius:             3px !default;
+$inputBorderRadius:             $baseBorderRadius !default;
 $inputDisabledBackground:       $grayLighter !default;
 $formActionsBackground:         #f5f5f5 !default;
+$inputHeight:                   $baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
 
 // Dropdowns
 // -------------------------
@@ -116,6 +136,7 @@ $dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive !default;
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
+
 // Z-index master list
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
@@ -157,6 +178,7 @@ $wellBackground:                  #f5f5f5 !default;
 // Navbar
 // -------------------------
 $navbarCollapseWidth:             979px !default;
+$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1;
 
 $navbarHeight:                    40px !default;
 $navbarBackgroundHighlight:       #ffffff !default;
@@ -168,7 +190,7 @@ $navbarLinkColor:                 #777 !default;
 $navbarLinkColorHover:            $grayDark !default;
 $navbarLinkColorActive:           $gray !default;
 $navbarLinkBackgroundHover:       transparent !default;
-$navbarLinkBackgroundActive:      darken($navbarBackground, 5.25%) !default;
+$navbarLinkBackgroundActive:      darken($navbarBackground, 5%) !default;
 
 $navbarBrandColor:                $navbarLinkColor !default;
 
@@ -246,6 +268,7 @@ $popoverArrowOuterColor:  rgba(0,0,0,.25) !default;
 // GRID
 // --------------------------------------------------
 
+
 // Default 940px grid
 // -------------------------
 $gridColumns:             12 !default;

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

@@ -10,7 +10,7 @@
   margin-bottom: 20px;
   background-color: $wellBackground;
   border: 1px solid darken($wellBackground, 7%);
-  @include border-radius(4px);
+  @include border-radius($baseBorderRadius);
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
@@ -21,9 +21,9 @@
 // Sizes
 .well-large {
   padding: 24px;
-  @include border-radius(6px);
+  @include border-radius($borderRadiusLarge);
 }
 .well-small {
   padding: 9px;
-  @include border-radius(3px);
+  @include border-radius($borderRadiusSmall);
 }

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

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.1.0
+ * Bootstrap v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -52,6 +52,7 @@
 
 // Components: Misc
 @import "thumbnails";
+@import "media";
 @import "labels-badges";
 @import "progress-bars";
 @import "accordion";