bootstrap-sass 2.0.4.2 → 2.1.0.0

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

@@ -1,3 +1,8 @@
+//
+// Responsive: Navbar
+// --------------------------------------------------
+
+
 // TABLETS AND BELOW
 // -----------------
 @media (max-width: 979px) {
@@ -8,8 +13,9 @@
   body {
     padding-top: 0;
   }
-  // Unfix the navbar
-  .navbar-fixed-top, .navbar-fixed-bottom {
+  // Unfix the navbars
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
     position: static;
   }
   .navbar-fixed-top {
@@ -18,7 +24,8 @@
   .navbar-fixed-bottom {
     margin-top: $baseLineHeight;
   }
-  .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner {
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
     padding: 5px;
   }
   .navbar .container {
@@ -57,8 +64,9 @@
     text-shadow: none;
   }
   // Nav and dropdown links in navbar
-  .nav-collapse .nav > li > a, .nav-collapse .dropdown-menu a {
-    padding: 6px 15px;
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
     font-weight: bold;
     color: $navbarLinkColor;
     @include border-radius(3px);
@@ -72,9 +80,14 @@
   .nav-collapse .dropdown-menu li + li a {
     margin-bottom: 2px;
   }
-  .nav-collapse .nav > li > a:hover, .nav-collapse .dropdown-menu a:hover {
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .dropdown-menu a:hover {
     background-color: $navbarBackground;
   }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+    background-color: $navbarInverseBackground;
+  }
   // Buttons in the navbar
   .nav-collapse.in .btn-group {
     margin-top: 5px;
@@ -95,14 +108,16 @@
     @include border-radius(0);
     @include box-shadow(none);
   }
-  .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:after {
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
     display: none;
   }
   .nav-collapse .dropdown-menu .divider {
     display: none;
   }
   // Forms in navbar
-  .nav-collapse .navbar-form, .nav-collapse .navbar-search {
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
     float: none;
     padding: ($baseLineHeight / 2) 15px;
     margin: ($baseLineHeight / 2) 0;
@@ -138,10 +153,12 @@
 // DEFAULT DESKTOP
 // ---------------
 
-// Required to make the collapsing navbar work on regular desktops
 @media (min-width: 980px) {
+
+  // Required to make the collapsing navbar work on regular desktops
   .nav-collapse.collapse {
     height: auto !important;
     overflow: visible !important;
   }
+
 }

data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss

@@ -1,5 +1,7 @@
-// RESPONSIVE CLASSES
-// ------------------
+//
+// Responsive: Utility classes
+// --------------------------------------------------
+
 
 // Hide from screenreaders and browsers
 // Credit: HTML5 Boilerplate
@@ -13,29 +15,29 @@
 // For desktops
 .visible-phone     { display: none !important; }
 .visible-tablet    { display: none !important; }
-.visible-desktop   { } // Don't set initially
 .hidden-phone      { }
 .hidden-tablet     { }
 .hidden-desktop    { display: none !important; }
-
-// Phones only
-@media (max-width: 767px) {
-  // Show
-  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
-  // Hide
-  .hidden-phone      { display: none !important; }
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important; }
-}
+.visible-desktop   { display: inherit !important; }
 
 // Tablets & small desktops only
 @media (min-width: 768px) and (max-width: 979px) {
+  // Hide everything else
+  .hidden-desktop    { display: inherit !important; }
+  .visible-desktop   { display: none !important ; }
   // Show
   .visible-tablet    { display: inherit !important; }
   // Hide
   .hidden-tablet     { display: none !important; }
+}
+
+// Phones only
+@media (max-width: 767px) {
   // Hide everything else
   .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important ; }
+  .visible-desktop   { display: none !important; }
+  // Show
+  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
+  // Hide
+  .hidden-phone      { display: none !important; }
 }

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

@@ -1,10 +1,10 @@
+//
 // Scaffolding
-// Basic and global styles for generating a grid system, structural layout, and page templates
-// -------------------------------------------------------------------------------------------
+// --------------------------------------------------
 
 
 // Body reset
-// -----------------
+// -------------------------
 
 body {
   margin: 0;
@@ -17,7 +17,7 @@ body {
 
 
 // Links
-// -----
+// -------------------------
 
 a {
   color: $linkColor;
@@ -26,4 +26,26 @@ a {
 a:hover {
   color: $linkColorHover;
   text-decoration: underline;
+}
+
+
+// Images
+// -------------------------
+
+.img-rounded {
+  @include border-radius(6px);
+}
+
+.img-polaroid {
+  padding: 4px;
+  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);
+}
+
+.img-circle {
+  @include border-radius(500px);
 }

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

@@ -1,20 +1,21 @@
-// SPRITES
-// Glyphs and icons for buttons, nav, and more
-// -------------------------------------------
+//
+// Sprites
+// --------------------------------------------------
 
 
 // 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:
 // <i class="icon-inbox icon-white"></i>
 
-[class^="icon-"], [class*=" icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -24,8 +25,17 @@
   background-image: $iconSpritePath;
   background-position: 14px 14px;
   background-repeat: no-repeat;
+  margin-top: 1px;
 }
-.icon-white {
+
+/* White icons with optional class, or on hover/active states of certain elements */
+.icon-white,
+.nav > .active > a > [class^="icon-"],
+.nav > .active > a > [class*=" icon-"],
+.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-"] {
   background-image: $iconWhiteSpritePath;
 }
 
@@ -143,7 +153,7 @@
 .icon-warning-sign       { background-position: -144px -120px; }
 .icon-plane              { background-position: -168px -120px; }
 .icon-calendar           { background-position: -192px -120px; }
-.icon-random             { background-position: -216px -120px; }
+.icon-random             { background-position: -216px -120px; width: 16px; }
 .icon-comment            { background-position: -240px -120px; }
 .icon-magnet             { background-position: -264px -120px; }
 .icon-chevron-up         { background-position: -288px -120px; }
@@ -151,7 +161,7 @@
 .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-folder-open        { background-position: -408px -120px; width: 16px; }
 .icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
 .icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off
 

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

@@ -1,7 +1,6 @@
 //
-// Tables.less
-// Tables for, you guessed it, tabular data
-// ----------------------------------------
+// Tables
+// --------------------------------------------------
 
 
 // BASE TABLES
@@ -21,7 +20,8 @@ table {
   width: 100%;
   margin-bottom: $baseLineHeight;
   // Cells
-  th, td {
+  th,
+  td {
     padding: 8px;
     line-height: $baseLineHeight;
     text-align: left;
@@ -36,9 +36,12 @@ 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 {
+  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 {
     border-top: 0;
   }
   // Account for multiple tbody instances
@@ -53,7 +56,8 @@ table {
 // -------------------------------
 
 .table-condensed {
-  th, td {
+  th,
+  td {
     padding: 4px 5px;
   }
 }
@@ -65,50 +69,86 @@ table {
 .table-bordered {
   border: 1px solid $tableBorder;
   border-collapse: separate; // Done so we can round those corners!
-  *border-collapse: collapsed; // IE7 can't round corners anyway
+  *border-collapse: collapse; // IE7 can't round corners anyway
   border-left: 0;
   @include border-radius(4px);
-  th, td {
+  th,
+  td {
     border-left: 1px solid $tableBorder;
   }
   // 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 {
+  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 {
     border-top: 0;
   }
   // 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 {
+  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;
   }
-  thead:first-child tr:first-child th:last-child, tbody:first-child tr:first-child td:last-child {
+  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;
   }
   // 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 {
+  thead:last-child tr:last-child th:first-child,
+  tbody:last-child tr:last-child td:first-child,
+  tfoot: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 {
+  thead:last-child tr:last-child th:last-child,
+  tbody:last-child tr:last-child td:last-child,
+  tfoot:last-child tr:last-child td:last-child {
     -webkit-border-bottom-right-radius: 4px;
             border-bottom-right-radius: 4px;
-        -moz-border-radius-bottomright: 4px;	
+        -moz-border-radius-bottomright: 4px;
   }
+
+  // Special fixes to round the left border on the first td/th
+  caption + thead tr:first-child th:first-child,
+  caption + tbody tr:first-child td:first-child,
+  colgroup + thead tr:first-child th:first-child,
+  colgroup + tbody tr:first-child td:first-child {
+    -webkit-border-top-left-radius: 4px;
+            border-top-left-radius: 4px;
+        -moz-border-radius-topleft: 4px;
+  }
+  caption + thead tr:first-child th:last-child,
+  caption + tbody tr:first-child td:last-child,
+  colgroup + thead tr:first-child th:last-child,
+  colgroup + tbody tr:first-child td:last-child {
+    -webkit-border-top-right-radius: 4px;
+            border-top-right-radius: 4px;
+          -moz-border-right-topleft: 4px;
+  }
+
 }
 
 
+
+
 // ZEBRA-STRIPING
 // --------------
 
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 .table-striped {
   tbody {
-    tr:nth-child(odd) td, tr:nth-child(odd) th {
+    tr:nth-child(odd) td,
+    tr:nth-child(odd) th {
       background-color: $tableBackgroundAccent;
     }
   }
@@ -118,16 +158,47 @@ table {
 // HOVER EFFECT
 // ------------
 // Placed here since it has to come after the potential zebra striping
-.table {
-  tbody tr:hover td, tbody tr:hover th {
-    background-color: $tableBackgroundHover;
+.table-hover {
+  tbody {
+    tr:hover td,
+    tr:hover th {
+      background-color: $tableBackgroundHover;
+    }
   }
 }
 
+
 // TABLE CELL SIZING
 // -----------------
+
+// Reset default grid behavior
+table [class*=span],
+.row-fluid table [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 $gridColumns {
     .span#{$i} { @include tableColumns($i); }
   }
-}
+}
+
+
+// TABLE BACKGROUNDS
+// -----------------
+// Exact selectors below required to override .table-striped
+
+.table {
+  tbody tr.success td {
+    background-color: $successBackground;
+  }
+  tbody tr.error td {
+    background-color: $errorBackground;
+  }
+  tbody tr.info td {
+    background-color: $infoBackground;
+  }
+}

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

@@ -1,5 +1,8 @@
-// THUMBNAILS
-// ----------
+//
+// Thumbnails
+// --------------------------------------------------
+
+
 // Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
 
 // Make wrapper ul behave like the grid
@@ -15,8 +18,6 @@
 
 // Float li to make thumbnails appear in a row
 .thumbnails > li {
-  float: left;
-  margin: 0 0 $baseLineHeight $gridGutterWidth;
   float: left; // Explicity set the float since we don't require .span* classes
   margin-bottom: $baseLineHeight;
   margin-left: $gridGutterWidth;
@@ -26,17 +27,18 @@
 .thumbnail {
   display: block;
   padding: 4px;
-  line-height: 1;
+  line-height: $baseLineHeight;
   border: 1px solid #ddd;
   @include border-radius(4px);
-  @include box-shadow(0 1px 1px rgba(0,0,0,.075));
+  @include box-shadow(0 1px 3px rgba(0,0,0,.055));
+  @include transition(all .2s ease-in-out);
 }
-
 // Add a hover state for linked versions only
 a.thumbnail:hover {
   border-color: $linkColor;
   @include box-shadow(0 1px 4px rgba(0,105,214,.25));
 }
+
 // Images and captions
 .thumbnail > img {
   display: block;
@@ -46,4 +48,5 @@ a.thumbnail:hover {
 }
 .thumbnail .caption {
   padding: 9px;
+  color: $gray;
 }