sass-twitter-bootstrap 0.1.0 → 2.0.1

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

@@ -28,9 +28,3 @@
 .pager .previous a {
   float: left;
 }
-.pager .disabled a,
-.pager .disabled a:hover {
-  color: $grayLight;
-  background-color: #fff;
-  cursor: default;
-}

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

@@ -32,7 +32,6 @@
   color: $grayLight;
   cursor: default;
 }
-.pagination .disabled span,
 .pagination .disabled a,
 .pagination .disabled a:hover {
   color: $grayLight;

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

@@ -7,32 +7,20 @@
 
 // Webkit
 @-webkit-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
 }
 
 // Firefox
 @-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// IE9
-@-ms-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Opera
-@-o-keyframes progress-bar-stripes {
   from  { background-position: 0 0; }
   to    { background-position: 40px 0; }
 }
 
 // Spec
 @keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
 }
 
 
@@ -66,7 +54,7 @@
 
 // Striped bars
 .progress-striped .bar {
-  @include gradient-striped(#149bdf);
+  @include gradient-striped(#62c462);
   @include background-size(40px 40px);
 }
 
@@ -74,8 +62,6 @@
 .progress.active .bar {
   -webkit-animation: progress-bar-stripes 2s linear infinite;
      -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
           animation: progress-bar-stripes 2s linear infinite;
 }
 
@@ -101,17 +87,9 @@
 }
 
 // Info (teal)
-.progress-info .bar {
+.progress.info .bar {
   @include gradient-vertical(#5bc0de, #339bb9);
 }
 .progress-info.progress-striped .bar {
   @include gradient-striped(#5bc0de);
 }
-
-// Warning (orange)
-.progress-warning .bar {
-  @include gradient-vertical(lighten($orange, 15%), $orange);
-}
-.progress-warning.progress-striped .bar {
-  @include gradient-striped(lighten($orange, 15%));
-}

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

@@ -1,4 +1,4 @@
-// Reset
+// Reset.scss
 // Adapted from Normalize.css http://github.com/necolas/normalize.css
 // ------------------------------------------------------------------------
 
@@ -75,17 +75,12 @@ sub {
 // -------------------------
 
 img {
-  max-width: 100%; // Make images inherently responsive
-  vertical-align: middle;
+  max-width: 100%;
+  height: auto;
   border: 0;
   -ms-interpolation-mode: bicubic;
 }
 
-// Prevent max-width from affecting Google Maps
-#map_canvas img {
-  max-width: none;
-}
-
 // Forms
 // -------------------------
 
@@ -116,10 +111,10 @@ input[type="submit"] {
   -webkit-appearance: button; // Style clickable inputs in iOS
 }
 input[type="search"] { // Appearance in Safari/Chrome
+  -webkit-appearance: textfield;
   -webkit-box-sizing: content-box;
      -moz-box-sizing: content-box;
           box-sizing: content-box;
-  -webkit-appearance: textfield;
 }
 input[type="search"]::-webkit-search-decoration,
 input[type="search"]::-webkit-search-cancel-button {

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

@@ -3,8 +3,12 @@
 // -------------------------------------------------------------------------------------------
 
 
-// Body reset
-// ----------
+// STRUCTURAL LAYOUT
+// -----------------
+
+.clearfix {
+  @include clearfix();
+}
 
 body {
   margin: 0;
@@ -12,11 +16,11 @@ body {
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $textColor;
-  background-color: $bodyBackground;
+  background-color: $white;
 }
 
 
-// Links
+// LINKS
 // -----
 
 a {

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

@@ -6,12 +6,12 @@
 // ICONS
 // -----
 
-// All icons receive the styles of the <i> tag with a base class
-// of .i and are then given a unique class to add width, height,
+// All icons receive the styles of the <i> tag with a base class 
+// of .i and are then given a unique class to add width, height, 
 // and background-position. Your resulting HTML will look like
 // <i class="icon-inbox"></i>.
 
-// For the white version of the icons, just add the .icon-white class:
+// For the white version of the  icons, just add the .icon-white class:
 // <i class="icon-inbox icon-white"></i>
 
 [class^="icon-"],
@@ -19,13 +19,13 @@
   display: inline-block;
   width: 14px;
   height: 14px;
-  @include ie7-restore-right-whitespace();
   line-height: 14px;
   vertical-align: text-top;
   background-image: url($iconSpritePath);
   background-position: 14px 14px;
   background-repeat: no-repeat;
 
+  @include ie7-restore-right-whitespace();
 }
 .icon-white {
   background-image: url($iconWhiteSpritePath);
@@ -149,43 +149,10 @@
 .icon-comment            { background-position: -240px -120px; }
 .icon-magnet             { background-position: -264px -120px; }
 .icon-chevron-up         { background-position: -288px -120px; }
-.icon-chevron-down       { background-position: -313px -119px; } // 1px, 1px off
+.icon-chevron-down       { background-position: -313px -119px; } // 1px off
 .icon-retweet            { background-position: -336px -120px; }
 .icon-shopping-cart      { background-position: -360px -120px; }
 .icon-folder-close       { background-position: -384px -120px; }
 .icon-folder-open        { background-position: -408px -120px; }
-.icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
-.icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off
-
-.icon-hdd                     { background-position: 0      -144px; }
-.icon-bullhorn                { background-position: -24px  -144px; }
-.icon-bell                    { background-position: -48px  -144px; }
-.icon-certificate             { background-position: -72px  -144px; }
-.icon-thumbs-up               { background-position: -96px  -144px; }
-.icon-thumbs-down             { background-position: -120px -144px; }
-.icon-hand-right              { background-position: -144px -144px; }
-.icon-hand-left               { background-position: -168px -144px; }
-.icon-hand-up                 { background-position: -192px -144px; }
-.icon-hand-down               { background-position: -216px -144px; }
-.icon-circle-arrow-right      { background-position: -240px -144px; }
-.icon-circle-arrow-left       { background-position: -264px -144px; }
-.icon-circle-arrow-up         { background-position: -288px -144px; }
-.icon-circle-arrow-down       { background-position: -312px -144px; }
-.icon-globe                   { background-position: -336px -144px; }
-.icon-wrench                  { background-position: -360px -144px; }
-.icon-tasks                   { background-position: -384px -144px; }
-.icon-filter                  { background-position: -408px -144px; }
-.icon-briefcase               { background-position: -432px -144px; }
-.icon-fullscreen              { background-position: -456px -144px; }
-
-
-
-
-
-
-
-
-
-
-
-
+.icon-resize-vertical    { background-position: -432px -119px; }
+.icon-resize-horizontal  { background-position: -456px -118px; }

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

@@ -1,5 +1,5 @@
 //
-// Tables
+// Tables.scss
 // Tables for, you guessed it, tabular data
 // ----------------------------------------
 
@@ -9,7 +9,6 @@
 
 table {
   max-width: 100%;
-  background-color: $tableBackground;
   border-collapse: collapse;
   border-spacing: 0;
 }
@@ -27,7 +26,7 @@ table {
     line-height: $baseLineHeight;
     text-align: left;
     vertical-align: top;
-    border-top: 1px solid $tableBorder;
+    border-top: 1px solid #ddd;
   }
   th {
     font-weight: bold;
@@ -37,17 +36,13 @@ table {
     vertical-align: bottom;
   }
   // Remove top border from thead by default
-  caption + thead tr:first-child th,
-  caption + thead tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + thead tr:first-child td,
-  thead:first-child tr:first-child th,
-  thead:first-child tr:first-child td {
+  thead:first-child tr th,
+  thead:first-child tr td {
     border-top: 0;
   }
   // Account for multiple tbody instances
   tbody + tbody {
-    border-top: 2px solid $tableBorder;
+    border-top: 2px solid #ddd;
   }
 }
 
@@ -68,22 +63,17 @@ table {
 // ----------------
 
 .table-bordered {
-  border: 1px solid $tableBorder;
+  border: 1px solid #ddd;
   border-collapse: separate; // Done so we can round those corners!
   *border-collapse: collapsed; // IE7 can't round corners anyway
-  border-left: 0;
   @include border-radius(4px);
-  th,
-  td {
-    border-left: 1px solid $tableBorder;
+  th + th,
+  td + td,
+  th + td,
+  td + th {
+    border-left: 1px solid #ddd;
   }
   // Prevent a double border
-  caption + thead tr:first-child th,
-  caption + tbody tr:first-child th,
-  caption + tbody tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + tbody tr:first-child th,
-  colgroup + tbody tr:first-child td,
   thead:first-child tr:first-child th,
   tbody:first-child tr:first-child th,
   tbody:first-child tr:first-child td {
@@ -92,29 +82,20 @@ table {
   // For first th or td in the first row in the first thead or tbody
   thead:first-child tr:first-child th:first-child,
   tbody:first-child tr:first-child td:first-child {
-    -webkit-border-top-left-radius: 4px;
-            border-top-left-radius: 4px;
-        -moz-border-radius-topleft: 4px;
+    @include border-radius(4px 0 0 0);
   }
   thead:first-child tr:first-child th:last-child,
   tbody:first-child tr:first-child td:last-child {
-    -webkit-border-top-right-radius: 4px;
-            border-top-right-radius: 4px;
-        -moz-border-radius-topright: 4px;
+    @include border-radius(0 4px 0 0);
   }
   // For first th or td in the first row in the first thead or tbody
   thead:last-child tr:last-child th:first-child,
   tbody:last-child tr:last-child td:first-child {
     @include border-radius(0 0 0 4px);
-    -webkit-border-bottom-left-radius: 4px;
-            border-bottom-left-radius: 4px;
-        -moz-border-radius-bottomleft: 4px;
   }
   thead:last-child tr:last-child th:last-child,
   tbody:last-child tr:last-child td:last-child {
-    -webkit-border-bottom-right-radius: 4px;
-            border-bottom-right-radius: 4px;
-        -moz-border-radius-bottomright: 4px;
+    @include border-radius(0 0 4px 0);
   }
 }
 
@@ -127,7 +108,7 @@ table {
   tbody {
     tr:nth-child(odd) td,
     tr:nth-child(odd) th {
-      background-color: $tableBackgroundAccent;
+      background-color: #f9f9f9;
     }
   }
 }
@@ -139,7 +120,7 @@ table {
 .table {
   tbody tr:hover td,
   tbody tr:hover th {
-    background-color: $tableBackgroundHover;
+    background-color: #f5f5f5;
   }
 }
 
@@ -148,8 +129,22 @@ table {
 // -----------------
 
 // Change the columns
+@mixin tableColumns($columnSpan: 1) {
+  float: none;
+  width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16;
+  margin-left: 0;
+}
 table {
-  @for $i from 1 through 24 {
-    .span#{$i} { @include tableColumns($i); }
-  }
+  .span1     { @include tableColumns(1); }
+  .span2     { @include tableColumns(2); }
+  .span3     { @include tableColumns(3); }
+  .span4     { @include tableColumns(4); }
+  .span5     { @include tableColumns(5); }
+  .span6     { @include tableColumns(6); }
+  .span7     { @include tableColumns(7); }
+  .span8     { @include tableColumns(8); }
+  .span9     { @include tableColumns(9); }
+  .span10    { @include tableColumns(10); }
+  .span11    { @include tableColumns(11); }
+  .span12    { @include tableColumns(12); }
 }

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

@@ -1,26 +1,15 @@
 // THUMBNAILS
 // ----------
-// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
 
-// Make wrapper ul behave like the grid
 .thumbnails {
   margin-left: -$gridGutterWidth;
   list-style: none;
   @include clearfix();
 }
-// Fluid rows have no left margin
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-// Float li to make thumbnails appear in a row
 .thumbnails > li {
-  float: left; // Explicity set the float since we don't require .span* classes
-  margin-bottom: $baseLineHeight;
-  margin-left: $gridGutterWidth;
+  float: left;
+  margin: 0 0 $baseLineHeight $gridGutterWidth;
 }
-
-// The actual thumbnail (can be `a` or `div`)
 .thumbnail {
   display: block;
   padding: 4px;
@@ -34,7 +23,6 @@ a.thumbnail:hover {
   border-color: $linkColor;
   @include box-shadow(0 1px 4px rgba(0,105,214,.25));
 }
-
 // Images and captions
 .thumbnail > img {
   display: block;

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

@@ -1,5 +1,5 @@
 // TOOLTIP
-// ------=
+// -------
 
 .tooltip {
   position: absolute;

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

@@ -1,4 +1,4 @@
-// Typography
+// Typography.scss
 // Headings, body text, lists, code, and more for a versatile and durable typography system
 // ----------------------------------------------------------------------------------------
 
@@ -8,6 +8,9 @@
 
 p {
   margin: 0 0 $baseLineHeight / 2;
+  font-family: $baseFontFamily;
+  font-size: $baseFontSize;
+  line-height: $baseLineHeight;
   small {
     font-size: $baseFontSize - 2;
     color: $grayLight;
@@ -25,9 +28,8 @@ p {
 
 h1, h2, h3, h4, h5, h6 {
   margin: 0;
-  font-family: $headingsFontFamily;
-  font-weight: $headingsFontWeight;
-  color: $headingsColor;
+  font-weight: bold;
+  color: $grayDark;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
     font-weight: normal;
@@ -49,8 +51,8 @@ h2 {
   }
 }
 h3 {
-  font-size: 18px;
   line-height: $baseLineHeight * 1.5;
+  font-size: 18px;
   small {
     font-size: 14px;
   }
@@ -124,24 +126,10 @@ dd {
 }
 dt {
   font-weight: bold;
-  line-height: $baseLineHeight - 1; // fix jank Helvetica Neue font bug
 }
 dd {
   margin-left: $baseLineHeight / 2;
 }
-// Horizontal layout (like forms)
-.dl-horizontal {
-  dt {
-    float: left;
-    width: 120px;
-    clear: left;
-    text-align: right;
-    @include text-overflow();
-  }
-  dd {
-    margin-left: 130px;
-  }
-}
 
 // MISC
 // ----
@@ -166,13 +154,11 @@ em {
 }
 
 // Abbreviations and acronyms
-abbr[title] {
-  cursor: help;
-  border-bottom: 1px dotted $grayLight;
-}
-abbr.initialism {
+abbr {
   font-size: 90%;
   text-transform: uppercase;
+  border-bottom: 1px dotted #ddd;
+  cursor: help;
 }
 
 // Blockquotes
@@ -196,10 +182,10 @@ blockquote {
   // Float right with text-align: right
   &.pull-right {
     float: right;
-    padding-right: 15px;
     padding-left: 0;
-    border-right: 5px solid $grayLighter;
+    padding-right: 15px;
     border-left: 0;
+    border-right: 5px solid $grayLighter;
     p,
     small {
       text-align: right;
@@ -210,7 +196,7 @@ blockquote {
 // Quotes
 q:before,
 q:after,
-blockquote:before,
+blockquote:before, 
 blockquote:after {
   content: "";
 }
@@ -219,8 +205,8 @@ blockquote:after {
 address {
   display: block;
   margin-bottom: $baseLineHeight;
-  font-style: normal;
   line-height: $baseLineHeight;
+  font-style: normal;
 }
 
 // Misc