bootstrap-sass-rails 3.0.2.1 → 3.0.3.0

data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss

@@ -10,7 +10,7 @@
   border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
 
   // Undo padding and float of grid classes
-  &.col {
+  &[class*="col-"] {
     float: none;
     padding-left: 0;
     padding-right: 0;

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

@@ -12,7 +12,8 @@
   color: $jumbotron-color;
   background-color: $jumbotron-bg;
 
-  h1 {
+  h1,
+  .h1 {
     line-height: 1;
     color: $jumbotron-heading-color;
   }
@@ -24,6 +25,10 @@
     border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
   }
 
+  .container {
+    max-width: 100%;
+  }
+
   @media screen and (min-width: $screen-sm-min) {
     padding-top:    ($jumbotron-padding * 1.6);
     padding-bottom: ($jumbotron-padding * 1.6);
@@ -33,7 +38,8 @@
       padding-right: ($jumbotron-padding * 2);
     }
 
-    h1 {
+    h1,
+    .h1 {
       font-size: ($font-size-base * 4.5);
     }
   }

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

@@ -28,6 +28,12 @@
   &:empty {
     display: none;
   }
+
+  // Quick fix for labels in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
 }
 
 // Colors

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

@@ -19,8 +19,8 @@
 @mixin clearfix() {
   &:before,
   &:after {
-    content: " "; /* 1 */
-    display: table; /* 2 */
+    content: " "; // 1
+    display: table; // 2
   }
   &:after {
     clear: both;
@@ -30,7 +30,7 @@
 // WebKit-style focus
 @mixin tab-focus() {
   // Default
-  outline: thin dotted #333;
+  outline: thin dotted;
   // WebKit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
@@ -55,7 +55,8 @@
 // Placeholder text
 @mixin placeholder($color: $input-color-placeholder) {
   &:-moz-placeholder            { color: $color; } // Firefox 4-18
-  &::-moz-placeholder           { color: $color; } // Firefox 19+
+  &::-moz-placeholder           { color: $color;   // Firefox 19+
+                                  opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
   &:-ms-input-placeholder       { color: $color; } // Internet Explorer 10+
   &::-webkit-input-placeholder  { color: $color; } // Safari and Chrome
 }
@@ -87,11 +88,7 @@
 }
 // New mixin to use as of v3.0.1
 @mixin text-hide() {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
+  @include hide-text();
 }
 
 
@@ -277,10 +274,8 @@
 // Creates two color stops, start and end, by specifying a color and position for each color stop.
 // Color stops are not available in IE9 and below.
 @mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
-  background-image: -webkit-gradient(linear, $start-percent top, $end-percent top, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
-  background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1+, Chrome 10+
-  background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
-  background-image:  linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
+  background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1-6, Chrome 10+
+  background-image:  linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=1); // IE9 and down
 }
@@ -290,47 +285,36 @@
 // Creates two color stops, start and end, by specifying a color and position for each color stop.
 // Color stops are not available in IE9 and below.
 @mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
-  background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
-  background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1+, Chrome 10+
-  background-image:  -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
-  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
+  background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent);  // Safari 5.1-6, Chrome 10+
+  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=0); // IE9 and down
 }
 
 @mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
   background-repeat: repeat-x;
-  background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+
-  background-image: -moz-linear-gradient($deg, $start-color, $end-color); // FF 3.6+
-  background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10
+  background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
+  background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
 }
 @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
-  background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
   background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
-  background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
   background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
   background-repeat: no-repeat;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
 }
 @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
   background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
-  background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color);
   background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
   background-repeat: no-repeat;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
 }
 @mixin gradient-radial($inner-color: #555, $outer-color: #333) {
-  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color));
   background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
-  background-image: -moz-radial-gradient(circle, $inner-color, $outer-color);
   background-image: radial-gradient(circle, $inner-color, $outer-color);
   background-repeat: no-repeat;
 }
 @mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, $color), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, $color), color-stop(.75, $color), color-stop(.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
   background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
 }
 
@@ -401,9 +385,6 @@
     + .panel-collapse .panel-body {
       border-top-color: $border;
     }
-    & > .dropdown .caret {
-      border-color: $heading-text-color transparent;
-    }
   }
   & > .panel-footer {
     + .panel-collapse .panel-body {
@@ -429,27 +410,27 @@
 
 // Tables
 // -------------------------
-@mixin table-row-variant($state, $background, $border) {
+@mixin table-row-variant($state, $background) {
   // Exact selectors below required to override `.table-striped` and prevent
   // inheritance to nested tables.
-  .table > thead > tr,
-  .table > tbody > tr,
-  .table > tfoot > tr {
-    > td.#{$state},
-    > th.#{$state},
-    &.#{$state} > td,
-    &.#{$state} > th {
-      background-color: $background;
+  .table {
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr > .#{$state},
+      > .#{$state} > td,
+      > .#{$state} > th {
+        background-color: $background;
+      }
     }
   }
 
   // Hover states for `.table-hover`
   // Note: this is not available for cells or rows within `thead` or `tfoot`.
-  .table-hover > tbody > tr {
-    > td.#{$state}:hover,
-    > th.#{$state}:hover,
-    &.#{$state}:hover > td,
-    &.#{$state}:hover > th {
+  .table-hover > tbody {
+    > tr > .#{$state}:hover,
+    > .#{$state}:hover > td,
+    > .#{$state}:hover > th {
       background-color: darken($background, 5%);
     }
   }
@@ -502,6 +483,11 @@
           border-color: $border;
     }
   }
+
+  .badge {
+    color: $background;
+    background-color: #fff;
+  }
 }
 
 // Button sizes
@@ -572,9 +558,10 @@
 // More easily include all the states for responsive-utilities.less.
 @mixin responsive-visibility($parent) {
   #{$parent} { display: block !important; }
-  tr#{$parent} { display: table-row !important; }
+  table#{$parent}  { display: table; }
+  tr#{$parent}     { display: table-row !important; }
   th#{$parent},
-  td#{$parent} { display: table-cell !important; }
+  td#{$parent}     { display: table-cell !important; }
 }
 
 @mixin responsive-invisibility($parent) {
@@ -739,7 +726,7 @@
 
 @mixin make-grid-columns-float($class) {
   $list: ();
-  @for $index from 1 to $grid-columns {
+  @for $index from 1 through $grid-columns {
     $list: append($list, unquote(".col-#{$class}-#{$index}"), comma);
   }
   #{$list} {
@@ -749,22 +736,22 @@
 
 
 @mixin calc-grid($index, $class, $type) {
-  @if $type == width and $index > 0 {
+  @if ($type == width) and ($index > 0) {
     .col-#{$class}-#{$index} {
       width: percentage(($index / $grid-columns));
     }
   }
-  @if $type == push {
+  @if ($type == push) {
     .col-#{$class}-push-#{$index} {
       left: percentage(($index / $grid-columns));
     }
   }
-  @if $type == pull {
+  @if ($type == pull) {
     .col-#{$class}-pull-#{$index} {
       right: percentage(($index / $grid-columns));
     }
   }
-  @if $type == offset {
+  @if ($type == offset) {
     .col-#{$class}-offset-#{$index} {
       margin-left: percentage(($index / $grid-columns));
     }

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

@@ -35,10 +35,8 @@
 // Shell div to position the modal with bottom padding
 .modal-dialog {
   position: relative;
-  margin-left: auto;
-  margin-right: auto;
   width: auto;
-  padding: 10px;
+  margin: 10px;
   z-index: ($zindex-modal-background + 10);
 }
 
@@ -122,10 +120,10 @@
 
   .modal-dialog {
     width: 600px;
-    padding-top: 30px;
-    padding-bottom: 30px;
+    margin: 30px auto;
   }
   .modal-content {
     @include box-shadow(0 5px 15px rgba(0,0,0,.5));
   }
+
 }

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

@@ -74,18 +74,16 @@
     }
 
     &.in {
-      overflow-y: auto;
+      overflow-y: visible;
     }
 
-    // Account for first and last children spacing
-    .navbar-nav.navbar-left:first-child {
-      margin-left: -$navbar-padding-horizontal;
-    }
-    .navbar-nav.navbar-right:last-child {
-      margin-right: -$navbar-padding-horizontal;
-    }
-    .navbar-text:last-child {
-      margin-right: 0;
+    // Undo the collapse side padding for navbars with containers to ensure
+    // alignment of right-aligned contents.
+    .navbar-fixed-top &,
+    .navbar-static-top &,
+    .navbar-fixed-bottom & {
+      padding-left: 0;
+      padding-right: 0;
     }
   }
 }
@@ -180,6 +178,7 @@
   padding: 9px 10px;
   @include navbar-vertical-align(34px);
   background-color: transparent;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid transparent;
   border-radius: $border-radius-base;
 
@@ -214,7 +213,7 @@
     line-height: $line-height-computed;
   }
 
-  @media (max-width: $screen-xs-max) {
+  @media (max-width: $grid-float-breakpoint-max) {
     // Dropdowns get custom display when collapsed
     .open .dropdown-menu {
       position: static;
@@ -246,12 +245,15 @@
     > li {
       float: left;
       > a {
-        padding-top: (($navbar-height - $line-height-computed) / 2);
-        padding-bottom: (($navbar-height - $line-height-computed) / 2);
+        padding-top:    $navbar-padding-vertical;
+        padding-bottom: $navbar-padding-vertical;
       }
     }
-  }
 
+    &.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
+  }
 }
 
 
@@ -289,7 +291,7 @@
   @extend .form-inline;
 
   .form-group {
-    @media (max-width: $screen-xs-max) {
+    @media (max-width: $grid-float-breakpoint-max) {
       margin-bottom: 5px;
     }
   }
@@ -306,6 +308,11 @@
     padding-top: 0;
     padding-bottom: 0;
     @include box-shadow(none);
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
   }
 }
 
@@ -336,6 +343,13 @@
 
 .navbar-btn {
   @include navbar-vertical-align($input-height-base);
+
+  &.btn-sm {
+    @include navbar-vertical-align($input-height-small);
+  }
+  &.btn-xs {
+    @include navbar-vertical-align(22);
+  }
 }
 
 
@@ -344,12 +358,17 @@
 // Add a class to make any element properly align itself vertically within the navbars.
 
 .navbar-text {
-  float: left;
   @include navbar-vertical-align($line-height-computed);
 
   @media (min-width: $grid-float-breakpoint) {
+    float: left;
     margin-left: $navbar-padding-horizontal;
     margin-right: $navbar-padding-horizontal;
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: 0;
+    }
   }
 }
 
@@ -418,15 +437,8 @@
     border-color: $navbar-default-border;
   }
 
-  // Dropdown menu items and carets
+  // Dropdown menu items
   .navbar-nav {
-    // Caret should match text color on hover
-    > .dropdown > a:hover .caret,
-    > .dropdown > a:focus .caret {
-      border-top-color: $navbar-default-link-hover-color;
-      border-bottom-color: $navbar-default-link-hover-color;
-    }
-
     // Remove background color from open dropdown
     > .open > a {
       &,
@@ -434,19 +446,10 @@
       &:focus {
         background-color: $navbar-default-link-active-bg;
         color: $navbar-default-link-active-color;
-        .caret {
-          border-top-color: $navbar-default-link-active-color;
-          border-bottom-color: $navbar-default-link-active-color;
-        }
       }
     }
-    > .dropdown > a .caret {
-      border-top-color: $navbar-default-link-color;
-      border-bottom-color: $navbar-default-link-color;
-    }
-
 
-    @media (max-width: $screen-xs-max) {
+    @media (max-width: $grid-float-breakpoint-max) {
       // Dropdowns get custom display when collapsed
       .open .dropdown-menu {
         > li > a {
@@ -565,31 +568,16 @@
         color: $navbar-inverse-link-active-color;
       }
     }
-    > .dropdown > a:hover .caret {
-      border-top-color: $navbar-inverse-link-hover-color;
-      border-bottom-color: $navbar-inverse-link-hover-color;
-    }
-    > .dropdown > a .caret {
-      border-top-color: $navbar-inverse-link-color;
-      border-bottom-color: $navbar-inverse-link-color;
-    }
-    > .open > a {
-      &,
-      &:hover,
-      &:focus {
-        .caret {
-          border-top-color: $navbar-inverse-link-active-color;
-          border-bottom-color: $navbar-inverse-link-active-color;
-        }
-      }
-    }
 
-    @media (max-width: $screen-xs-max) {
+    @media (max-width: $grid-float-breakpoint-max) {
       // Dropdowns get custom display
       .open .dropdown-menu {
         > .dropdown-header {
           border-color: $navbar-inverse-border;
         }
+        .divider {
+          background-color: $navbar-inverse-border;
+        }
         > li > a {
           color: $navbar-inverse-link-color;
           &:hover,