bootstrap-sass-rails 3.0.0.3 → 3.0.1.0

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

@@ -27,11 +27,11 @@
   }
 }
 
-// Webkit-style focus
+// WebKit-style focus
 @mixin tab-focus() {
   // Default
   outline: thin dotted #333;
-  // Webkit
+  // WebKit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -69,7 +69,15 @@
 }
 
 // CSS image replacement
+//
+// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// mixins being reused as classes with the same name, this doesn't hold up. As
+// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note
+// that we cannot chain the mixins together in Less, so they are repeated.
+//
 // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
+
+// Deprecated as of v3.0.1 (will be removed in v4)
 @mixin hide-text() {
   font: 0/0 a;
   color: transparent;
@@ -77,6 +85,14 @@
   background-color: transparent;
   border: 0;
 }
+// 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;
+}
 
 
 
@@ -112,6 +128,10 @@
   -webkit-transition: $transition;
           transition: $transition;
 }
+@mixin transition-property($transition-property) {
+  -webkit-transition-property: $transition-property;
+          transition-property: $transition-property;
+}
 @mixin transition-delay($transition-delay) {
   -webkit-transition-delay: $transition-delay;
           transition-delay: $transition-delay;
@@ -153,10 +173,41 @@
           transform: translate3d($x, $y, $z);
 }
 
+@mixin rotateX($degrees) {
+  -webkit-transform: rotateX($degrees);
+      -ms-transform: rotateX($degrees); // IE9+
+          transform: rotateX($degrees);
+}
+@mixin rotateY($degrees) {
+  -webkit-transform: rotateY($degrees);
+      -ms-transform: rotateY($degrees); // IE9+
+          transform: rotateY($degrees);
+}
+@mixin perspective($perspective) {
+  -webkit-perspective: $perspective;
+     -moz-perspective: $perspective;
+          perspective: $perspective;
+}
+@mixin perspective-origin($perspective) {
+  -webkit-perspective-origin: $perspective;
+     -moz-perspective-origin: $perspective;
+          perspective-origin: $perspective;
+}
+@mixin transform-origin($origin) {
+  -webkit-transform-origin: $origin;
+     -moz-transform-origin: $origin;
+          transform-origin: $origin;
+}
+
+// Animations
+@mixin animation($animation) {
+  -webkit-animation: $animation;
+          animation: $animation;
+}
+
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.
 // Default value is `visible`, but can be changed to `hidden`
-// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
 @mixin backface-visibility($visibility){
   -webkit-backface-visibility: $visibility;
      -moz-backface-visibility: $visibility;
@@ -240,7 +291,7 @@
 // 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: -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-repeat: repeat-x;
@@ -276,11 +327,11 @@
   background-image: radial-gradient(circle, $inner-color, $outer-color);
   background-repeat: no-repeat;
 }
-@mixin gradient-striped($color: #555, $angle: 45deg) {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+@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);
 }
 
 // Reset filters for IE
@@ -298,7 +349,7 @@
 // Short retina mixin for setting background-image and -size
 
 @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
-  background-image: image-url($file-1x);
+  background-image: image-url("#{$file-1x}");
 
   @media
   only screen and (-webkit-min-device-pixel-ratio: 2),
@@ -307,7 +358,7 @@
   only screen and (        min-device-pixel-ratio: 2),
   only screen and (                min-resolution: 192dpi),
   only screen and (                min-resolution: 2dppx) {
-    background-image: image-url($file-2x);
+    background-image: image-url("#{$file-2x}");
     background-size: $width-1x $height-1x;
   }
 }
@@ -341,13 +392,18 @@
 // -------------------------
 @mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
   border-color: $border;
+
   & > .panel-heading {
     color: $heading-text-color;
     background-color: $heading-bg-color;
     border-color: $heading-border;
+
     + .panel-collapse .panel-body {
       border-top-color: $border;
     }
+    & > .dropdown .caret {
+      border-color: $heading-text-color transparent;
+    }
   }
   & > .panel-footer {
     + .panel-collapse .panel-body {
@@ -362,6 +418,7 @@
   background-color: $background;
   border-color: $border;
   color: $text-color;
+
   hr {
     border-top-color: darken($border, 5%);
   }
@@ -383,7 +440,6 @@
     &.#{$state} > td,
     &.#{$state} > th {
       background-color: $background;
-      border-color: $border;
     }
   }
 
@@ -392,9 +448,9 @@
   .table-hover > tbody > tr {
     > td.#{$state}:hover,
     > th.#{$state}:hover,
-    &.#{$state}:hover > td {
+    &.#{$state}:hover > td,
+    &.#{$state}:hover > th {
       background-color: darken($background, 5%);
-      border-color: darken($border, 5%);
     }
   }
 }
@@ -443,7 +499,7 @@
     &:active,
     &.active {
       background-color: $background;
-          border-color: $border
+          border-color: $border;
     }
   }
 }
@@ -507,7 +563,7 @@
 @mixin progress-bar-variant($color) {
   background-color: $color;
   .progress-striped & {
-    @include gradient-striped($color);
+    @include gradient-striped();
   }
 }
 
@@ -522,12 +578,13 @@
 }
 
 @mixin responsive-invisibility($parent) {
-  #{$parent} { display: none !important; }
-  tr#{$parent} { display: none !important; }
+    #{$parent},
+  tr#{$parent},
   th#{$parent},
   td#{$parent} { display: none !important; }
 }
 
+
 // Grid System
 // -----------
 
@@ -569,7 +626,7 @@
   padding-right: ($gutter / 2);
 
   // Calculate width based on number of columns available
-  @media (min-width: $screen-sm) {
+  @media (min-width: $screen-sm-min) {
     float: left;
     width: percentage(($columns / $grid-columns));
   }
@@ -577,17 +634,17 @@
 
 // Generate the small column offsets
 @mixin make-sm-column-offset($columns) {
-  @media (min-width: $screen-sm) {
+  @media (min-width: $screen-sm-min) {
     margin-left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-sm-column-push($columns) {
-  @media (min-width: $screen-sm) {
+  @media (min-width: $screen-sm-min) {
     left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-sm-column-pull($columns) {
-  @media (min-width: $screen-sm) {
+  @media (min-width: $screen-sm-min) {
     right: percentage(($columns / $grid-columns));
   }
 }
@@ -602,15 +659,15 @@
   padding-right: ($gutter / 2);
 
   // Calculate width based on number of columns available
-  @media (min-width: $screen-md) {
+  @media (min-width: $screen-md-min) {
     float: left;
     width: percentage(($columns / $grid-columns));
   }
 }
 
-// Generate the large column offsets
+// Generate the medium column offsets
 @mixin make-md-column-offset($columns) {
-  @media (min-width: $screen-md) {
+  @media (min-width: $screen-md-min) {
     margin-left: percentage(($columns / $grid-columns));
   }
 }
@@ -620,7 +677,7 @@
   }
 }
 @mixin make-md-column-pull($columns) {
-  @media (min-width: $screen-md) {
+  @media (min-width: $screen-md-min) {
     right: percentage(($columns / $grid-columns));
   }
 }
@@ -635,7 +692,7 @@
   padding-right: ($gutter / 2);
 
   // Calculate width based on number of columns available
-  @media (min-width: $screen-lg) {
+  @media (min-width: $screen-lg-min) {
     float: left;
     width: percentage(($columns / $grid-columns));
   }
@@ -643,22 +700,85 @@
 
 // Generate the large column offsets
 @mixin make-lg-column-offset($columns) {
-  @media (min-width: $screen-lg) {
+  @media (min-width: $screen-lg-min) {
     margin-left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-lg-column-push($columns) {
-  @media (min-width: $screen-lg) {
+  @media (min-width: $screen-lg-min) {
     left: percentage(($columns / $grid-columns));
   }
 }
 @mixin make-lg-column-pull($columns) {
-  @media (min-width: $screen-lg) {
+  @media (min-width: $screen-lg-min) {
     right: percentage(($columns / $grid-columns));
   }
 }
 
 
+// Framework grid generation
+//
+// Used only by Bootstrap to generate the correct number of grid classes given
+// any value of `$grid-columns`.
+
+@mixin make-grid-columns() {
+  $list: ();
+  @for $index from 1 through $grid-columns {
+    $list: append($list, unquote(".col-xs-#{$index}, .col-sm-#{$index}, .col-md-#{$index}, .col-lg-#{$index}"), comma);
+  }
+  #{$list} {
+    position: relative;
+    // Prevent columns from collapsing when empty
+    min-height: 1px;
+    // Inner gutter via padding
+    padding-left:  ($grid-gutter-width / 2);
+    padding-right: ($grid-gutter-width / 2);
+  }
+}
+
+
+@mixin make-grid-columns-float($class) {
+  $list: ();
+  @for $index from 1 to $grid-columns {
+    $list: append($list, unquote(".col-#{$class}-#{$index}"), comma);
+  }
+  #{$list} {
+    float: left;
+  }
+}
+
+
+@mixin calc-grid($index, $class, $type) {
+  @if $type == width {
+    .col-#{$class}-#{$index} {
+      width: percentage(($index / $grid-columns));
+    }
+  }
+  @if $type == push {
+    .col-#{$class}-push-#{$index} {
+      left: percentage(($index / $grid-columns));
+    }
+  }
+  @if $type == pull {
+    .col-#{$class}-pull-#{$index} {
+      right: percentage(($index / $grid-columns));
+    }
+  }
+  @if $type == offset {
+    .col-#{$class}-offset-#{$index} {
+      margin-left: percentage(($index / $grid-columns));
+    }
+  }
+}
+
+@mixin make-grid($index, $class, $type) {
+  @for $i from 1 through $index {
+    @include calc-grid($i, $class, $type);
+  }
+}
+
+
+
 // Form validation states
 //
 // Used in forms.less to generate the form validation CSS for warnings, errors,
@@ -667,7 +787,11 @@
 @mixin form-control-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) {
   // Color the label and help text
   .help-block,
-  .control-label {
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline  {
     color: $text-color;
   }
   // Set the border and box shadow on specific inputs to match

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

@@ -10,19 +10,6 @@
 // Kill the scroll on the body
 .modal-open {
   overflow: hidden;
-
-
-  // Account for hiding of scrollbar
-
-
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    margin-right: 15px
-  }
-}
-
-body.modal-open {
-  margin-right: 15px
 }
 
 // Container that the modal scrolls within
@@ -47,6 +34,7 @@ body.modal-open {
 
 // Shell div to position the modal with bottom padding
 .modal-dialog {
+  position: relative;
   margin-left: auto;
   margin-right: auto;
   width: auto;
@@ -130,11 +118,9 @@ body.modal-open {
 }
 
 // Scale up the modal
-@media screen and (min-width: $screen-tablet) {
+@media screen and (min-width: $screen-sm-min) {
 
   .modal-dialog {
-    left: 50%;
-    right: auto;
     width: 600px;
     padding-top: 30px;
     padding-bottom: 30px;

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

@@ -10,7 +10,6 @@
 
 .navbar {
   position: relative;
-  z-index: $zindex-navbar;
   min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
   margin-bottom: $navbar-margin-bottom;
   border: 1px solid transparent;
@@ -75,7 +74,7 @@
     }
 
     &.in {
-      overflow-y: visible;
+      overflow-y: auto;
     }
 
     // Account for first and last children spacing
@@ -111,12 +110,14 @@
 //
 // Navbar alignment options
 //
-// Display the navbar across the entirity of the page or fixed it to the top or
+// Display the navbar across the entirety of the page or fixed it to the top or
 // bottom of the page.
 
 // Static top (unfixed, but 100% wide) navbar
 .navbar-static-top {
+  z-index: $zindex-navbar;
   border-width: 0 0 1px;
+
   @media (min-width: $grid-float-breakpoint) {
     border-radius: 0;
   }
@@ -128,7 +129,7 @@
   position: fixed;
   right: 0;
   left: 0;
-  border-width: 0 0 1px;
+  z-index: $zindex-navbar-fixed;
 
   // Undo the rounded corners
   @media (min-width: $grid-float-breakpoint) {
@@ -136,12 +137,13 @@
   }
 }
 .navbar-fixed-top {
-  z-index: $zindex-navbar-fixed;
   top: 0;
+  border-width: 0 0 1px;
 }
 .navbar-fixed-bottom {
   bottom: 0;
   margin-bottom: 0; // override .navbar defaults
+  border-width: 1px 0 0;
 }
 
 
@@ -152,6 +154,7 @@
   padding: $navbar-padding-vertical $navbar-padding-horizontal;
   font-size: $font-size-large;
   line-height: $line-height-computed;
+
   &:hover,
   &:focus {
     text-decoration: none;
@@ -254,7 +257,7 @@
 
 // Component alignment
 //
-// Repurpose the pull utilities as their own navbar utilities to avoid specifity
+// Repurpose the pull utilities as their own navbar utilities to avoid specificity
 // issues with parents and chaining. Only do this when the navbar is uncollapsed
 // though so that navbar contents properly stack and align in mobile.
 
@@ -412,7 +415,7 @@
 
   .navbar-collapse,
   .navbar-form {
-    border-color: darken($navbar-default-bg, 7%);
+    border-color: $navbar-default-border;
   }
 
   // Dropdown menu items and carets