bootstrap-sass-rails 3.0.0.3 → 3.0.1.0

data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss

@@ -37,17 +37,6 @@ textarea {
   line-height: inherit;
 }
 
-// Reset unusual Firefox-on-Android default style.
-//
-// See https://github.com/necolas/normalize.css/issues/214
-
-button,
-input,
-select[multiple],
-textarea {
-  background-image: none;
-}
-
 
 // Links
 
@@ -125,6 +114,6 @@ hr {
   margin: -1px;
   padding: 0;
   overflow: hidden;
-  clip: rect(0 0 0 0);
+  clip: rect(0,0,0,0);
   border: 0;
 }

data/app/assets/stylesheets/twitter/bootstrap/_tables.scss

@@ -18,9 +18,9 @@ th {
   width: 100%;
   margin-bottom: $line-height-computed;
   // Cells
-  thead,
-  tbody,
-  tfoot {
+  > thead,
+  > tbody,
+  > tfoot {
     > tr {
       > th,
       > td {
@@ -32,22 +32,23 @@ th {
     }
   }
   // Bottom align for column headings
-  thead > tr > th {
+  > thead > tr > th {
     vertical-align: bottom;
     border-bottom: 2px solid $table-border-color;
   }
   // Remove top border from thead by default
-  caption + thead,
-  colgroup + thead,
-  thead:first-child {
-    tr:first-child {
-      th, td {
+  > caption + thead,
+  > colgroup + thead,
+  > thead:first-child {
+    > tr:first-child {
+      > th,
+      > td {
         border-top: 0;
       }
     }
   }
   // Account for multiple tbody instances
-  tbody + tbody {
+  > tbody + tbody {
     border-top: 2px solid $table-border-color;
   }
 
@@ -61,9 +62,9 @@ th {
 // Condensed table w/ half padding
 
 .table-condensed {
-  thead,
-  tbody,
-  tfoot {
+  > thead,
+  > tbody,
+  > tfoot {
     > tr {
       > th,
       > td {
@@ -90,12 +91,10 @@ th {
       }
     }
   }
-  > thead {
-    > tr {
-      > th,
-      > td {
-        border-bottom-width: 2px;
-      }
+  > thead > tr {
+    > th,
+    > td {
+      border-bottom-width: 2px;
     }
   }
 }
@@ -105,14 +104,10 @@ th {
 //
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
-.table-striped {
-  > tbody {
-    > tr:nth-child(odd) {
-      > td,
-      > th {
-        background-color: $table-bg-accent;
-      }
-    }
+.table-striped > tbody > tr:nth-child(odd) {
+  > td,
+  > th {
+    background-color: $table-bg-accent;
   }
 }
 
@@ -121,14 +116,10 @@ th {
 //
 // Placed here since it has to come after the potential zebra striping
 
-.table-hover {
-  > tbody {
-    > tr:hover {
-      > td,
-      > th {
-        background-color: $table-bg-hover;
-      }
-    }
+.table-hover > tbody > tr:hover {
+  > td,
+  > th {
+    background-color: $table-bg-hover;
   }
 }
 
@@ -176,22 +167,23 @@ table {
 
 // Responsive tables
 //
-// Wrap your tables in `.table-scrollable` and we'll make them mobile friendly
+// Wrap your tables in `.table-responsive` and we'll make them mobile friendly
 // by enabling horizontal scrolling. Only applies <768px. Everything above that
 // will display normally.
 
-@media (max-width: $screen-sm) {
+@media (max-width: $screen-xs-max) {
   .table-responsive {
     width: 100%;
-    margin-bottom: 15px;
+    margin-bottom: ($line-height-computed * 0.75);
     overflow-y: hidden;
     overflow-x: scroll;
+    -ms-overflow-style: -ms-autohiding-scrollbar;
     border: 1px solid $table-border-color;
+    -webkit-overflow-scrolling: touch;
 
-    // Tighten up spacing and give a background color
+    // Tighten up spacing
     > .table {
       margin-bottom: 0;
-      background-color: #fff;
 
       // Ensure the content doesn't wrap
       > thead,
@@ -224,6 +216,13 @@ table {
             border-right: 0;
           }
         }
+      }
+
+      // Only nuke the last row's bottom-border in `tbody` and `tfoot` since
+      // chances are there will be only one `tr` in a `thead` and that would
+      // remove the border altogether.
+      > tbody,
+      > tfoot {
         > tr:last-child {
           > th,
           > td {
@@ -231,6 +230,7 @@ table {
           }
         }
       }
+
     }
   }
 }

data/app/assets/stylesheets/twitter/bootstrap/_theme.scss

@@ -32,13 +32,21 @@
 
 // Mixin for generating new styles
 @mixin btn-styles($btn-color: #555) {
-  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 10%));
-  border-color: darken($btn-color, 12%);
+  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
+  @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
+  background-repeat: repeat-x;
+  border-color: darken($btn-color, 14%);
+
+  &:hover,
+  &:focus  {
+    background-color: darken($btn-color, 12%);
+    background-position: 0 -15px;
+  }
 
   &:active,
   &.active {
-    background-color: darken($btn-color, 10%);
-    border-color: darken($btn-color, 12%);
+    background-color: darken($btn-color, 12%);
+    border-color: darken($btn-color, 14%);
   }
 }
 
@@ -77,12 +85,15 @@
 // --------------------------------------------------
 
 .dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
+.dropdown-menu > li > a:focus {
+  @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
+  background-color: darken($dropdown-link-hover-bg, 5%);
+}
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
-  @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
-  background-color: darken($dropdown-link-hover-bg, 5%);
+  @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
+  background-color: darken($dropdown-link-active-bg, 5%);
 }
 
 
@@ -91,15 +102,17 @@
 // Navbar
 // --------------------------------------------------
 
-// Basic navbar
-.navbar {
+// Default navbar
+.navbar-default {
   @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
+  @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
   border-radius: $navbar-border-radius;
   $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
   @include box-shadow($shadow);
 
   .navbar-nav > .active > a {
-    background-color: $navbar-default-bg;
+    @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
+    @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
   }
 }
 .navbar-brand,
@@ -110,9 +123,11 @@
 // Inverted navbar
 .navbar-inverse {
   @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
+  @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
 
   .navbar-nav > .active > a {
-    background-color: $navbar-inverse-bg;
+    @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
+    @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
   }
 
   .navbar-brand,

data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss

@@ -7,24 +7,24 @@
 .thumbnail {
   @extend .img-thumbnail;
   display: block; // Override the inline-block from `.img-thumbnail`
+  margin-bottom: $line-height-computed;
 
   > img {
     @include img-responsive();
+    margin-left: auto;
+    margin-right: auto;
   }
 }
 
 
 // Add a hover state for linked versions only
 a.thumbnail:hover,
-a.thumbnail:focus {
+a.thumbnail:focus,
+a.thumbnail.active {
   border-color: $link-color;
 }
 
-// Images and captions
-.thumbnail > img {
-  margin-left: auto;
-  margin-right: auto;
-}
+// Image captions
 .thumbnail .caption {
   padding: $thumbnail-caption-padding;
   color: $thumbnail-caption-color;

data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss

@@ -14,10 +14,10 @@
   @include opacity(0);
 
   &.in     { @include opacity(.9); }
-  &.top    { margin-top:  -3px; padding: 5px 0; }
-  &.right  { margin-left:  3px; padding: 0 5px; }
-  &.bottom { margin-top:   3px; padding: 5px 0; }
-  &.left   { margin-left: -3px; padding: 0 5px; }
+  &.top    { margin-top:  -3px; padding: $tooltip-arrow-width 0; }
+  &.right  { margin-left:  3px; padding: 0 $tooltip-arrow-width; }
+  &.bottom { margin-top:   3px; padding: $tooltip-arrow-width 0; }
+  &.left   { margin-left: -3px; padding: 0 $tooltip-arrow-width; }
 }
 
 // Wrapper for the tooltip content
@@ -49,13 +49,13 @@
   }
   &.top-left .tooltip-arrow {
     bottom: 0;
-    left: 5px;
+    left: $tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
   &.top-right .tooltip-arrow {
     bottom: 0;
-    right: 5px;
+    right: $tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
@@ -82,13 +82,13 @@
   }
   &.bottom-left .tooltip-arrow {
     top: 0;
-    left: 5px;
+    left: $tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }
   &.bottom-right .tooltip-arrow {
     top: 0;
-    right: 5px;
+    right: $tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }

data/app/assets/stylesheets/twitter/bootstrap/_type.scss

@@ -11,11 +11,11 @@ p {
 }
 .lead {
   margin-bottom: $line-height-computed;
-  font-size: ($font-size-base * 1.15);
+  font-size: floor($font-size-base * 1.15);
   font-weight: 200;
   line-height: 1.4;
 
-  @media (min-width: 768px) {
+  @media (min-width: $screen-sm-min) {
     font-size: ($font-size-base * 1.5);
   }
 }
@@ -25,18 +25,46 @@ p {
 // -------------------------
 
 // Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
+small,
+.small  { font-size: 85%; }
 
 // Undo browser default styling
 cite    { font-style: normal; }
 
 // Contextual emphasis
-.text-muted          { color: $text-muted; }
-.text-primary        { color: $brand-primary; }
-.text-warning        { color: $state-warning-text; }
-.text-danger         { color: $state-danger-text; }
-.text-success        { color: $state-success-text; }
-.text-info           { color: $state-info-text; }
+.text-muted {
+  color: $text-muted;
+}
+.text-primary {
+  color: $brand-primary;
+  &:hover {
+    color: darken($brand-primary, 10%);
+  }
+}
+.text-warning {
+  color: $state-warning-text;
+  &:hover {
+    color: darken($state-warning-text, 10%);
+  }
+}
+.text-danger {
+  color: $state-danger-text;
+  &:hover {
+    color: darken($state-danger-text, 10%);
+  }
+}
+.text-success {
+  color: $state-success-text;
+  &:hover {
+    color: darken($state-success-text, 10%);
+  }
+}
+.text-info {
+  color: $state-info-text;
+  &:hover {
+    color: darken($state-info-text, 10%);
+  }
+}
 
 // Alignment
 .text-left           { text-align: left; }
@@ -52,7 +80,10 @@ h1, h2, h3, h4, h5, h6,
   font-family: $headings-font-family;
   font-weight: $headings-font-weight;
   line-height: $headings-line-height;
-  small {
+  color: $headings-color;
+
+  small,
+  .small {
     font-weight: normal;
     line-height: 1;
     color: $headings-small-color;
@@ -64,25 +95,30 @@ h2,
 h3 {
   margin-top: $line-height-computed;
   margin-bottom: ($line-height-computed / 2);
+
+  small,
+  .small {
+    font-size: 65%;
+  }
 }
 h4,
 h5,
 h6 {
   margin-top: ($line-height-computed / 2);
   margin-bottom: ($line-height-computed / 2);
-}
 
-h1, .h1 { font-size: floor($font-size-base * 2.60); } // ~36px
-h2, .h2 { font-size: floor($font-size-base * 2.15); } // ~30px
-h3, .h3 { font-size: ceil($font-size-base * 1.70); } // ~24px
-h4, .h4 { font-size: ceil($font-size-base * 1.25); } // ~18px
-h5, .h5 { font-size:  $font-size-base; }
-h6, .h6 { font-size: ceil($font-size-base * 0.85); } // ~12px
+  small,
+  .small {
+    font-size: 75%;
+  }
+}
 
-h1 small, .h1 small { font-size: ceil($font-size-base * 1.70); } // ~24px
-h2 small, .h2 small { font-size: ceil($font-size-base * 1.25); } // ~18px
-h3 small, .h3 small,
-h4 small, .h4 small { font-size: $font-size-base; }
+h1, .h1 { font-size: $font-size-h1; }
+h2, .h2 { font-size: $font-size-h2; }
+h3, .h3 { font-size: $font-size-h3; }
+h4, .h4 { font-size: $font-size-h4; }
+h5, .h5 { font-size: $font-size-h5; }
+h6, .h6 { font-size: $font-size-h6; }
 
 
 // Page header
@@ -105,7 +141,7 @@ ol {
   margin-top: 0;
   margin-bottom: ($line-height-computed / 2);
   ul,
-  ol{
+  ol {
     margin-bottom: 0;
   }
 }
@@ -117,13 +153,19 @@ ol {
   padding-left: 0;
   list-style: none;
 }
+
 // Inline turns list items into inline-block
 .list-inline {
   @extend .list-unstyled;
+
   > li {
     display: inline-block;
     padding-left: 5px;
     padding-right: 5px;
+
+    &:first-child {
+      padding-left: 0;
+    }
   }
 }
 
@@ -168,7 +210,7 @@ dd {
 
 // Abbreviations and acronyms
 abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
+// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted $abbr-border-color;
@@ -196,7 +238,7 @@ blockquote {
     line-height: $line-height-base;
     color: $blockquote-small-color;
     &:before {
-      content: '\2014 \00A0';// EM DASH, NBSP
+      content: '\2014 \00A0'; // EM DASH, NBSP
     }
   }
 
@@ -207,23 +249,23 @@ blockquote {
     border-right: 5px solid $blockquote-border-color;
     border-left: 0;
     p,
-    small {
+    small,
+    .small {
       text-align: right;
     }
-    small {
+    small,
+    .small {
       &:before {
         content: '';
       }
       &:after {
-        content: '\00A0 \2014';// NBSP, EM DASH
+        content: '\00A0 \2014'; // NBSP, EM DASH
       }
     }
   }
 }
 
 // Quotes
-q:before,
-q:after,
 blockquote:before,
 blockquote:after {
   content: "";
@@ -231,7 +273,6 @@ blockquote:after {
 
 // Addresses
 address {
-  display: block;
   margin-bottom: $line-height-computed;
   font-style: normal;
   line-height: $line-height-base;