sass-rails-bootstrap 2.0.4 → 2.1.0

data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.sass

@@ -1,5 +1,6 @@
-// Snippets of reusable CSS to develop faster and keep code readable
-// -----------------------------------------------------------------
+//
+// Mixins
+// --------------------------------------------------
 
 
 // UTILITY MIXINS
@@ -10,9 +11,13 @@
 // For clearing floats like a boss h5bp.com/q
 =clearfix
   *zoom: 1
-  &:before, &:after
+  &:before,
+  &:after
     display: table
     content: ""
+    // Fixes Opera/contenteditable bug:
+    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
+    line-height: 0
   &:after
     clear: both
 
@@ -51,8 +56,7 @@
 
 =ie7-restore-right-whitespace
   *margin-right: .3em
-  &:last-child
-    *margin-left: 0
+
 
 // Sizing shortcuts
 // -------------------------
@@ -62,6 +66,7 @@
   
 =square($size)
   +size($size, $size)
+  
 
 // Placeholder text
 // -------------------------
@@ -127,8 +132,9 @@
 =input-block-level
   display: block
   width: 100%
-  min-height: 28px  // Make inputs at least the height of their button counterpart
+  min-height: 30px  // Make inputs at least the height of their button counterpart
   +box-sizing(border-box)  // Makes inputs behave like true block-level elements
+  
 
 // Mixin for form field states
 =form-field-state($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5)
@@ -145,9 +151,12 @@
   textarea
     color: $textColor
     border-color: $borderColor
+    +box-shadow(inset 0 1px 1px rgba(0,0,0,.075))  // Redeclare so transitions work
     &:focus
       border-color: darken($borderColor, 10%)
-      +box-shadow(0 0 6px lighten($borderColor, 20%))
+      // Write out in full since the lighten() function isn't easily escaped
+      $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%)
+      +box-shadow($shadow)
   // Give a small background color for input-prepend/-append
   .input-prepend .add-on,
   .input-append .add-on
@@ -166,6 +175,45 @@
   -moz-border-radius: $radius
   border-radius: $radius
 
+// Single Corner Border Radius
+=border-top-left-radius($radius)
+  -webkit-border-top-left-radius: $radius
+  -moz-border-radius-topleft: $radius
+  border-top-left-radius: $radius
+
+=border-top-right-radius($radius)
+  -webkit-border-top-right-radius: $radius
+  -moz-border-radius-topright: $radius
+  border-top-right-radius: $radius
+
+=border-bottom-right-radius($radius)
+  -webkit-border-bottom-right-radius: $radius
+  -moz-border-radius-bottomright: $radius
+  border-bottom-right-radius: $radius
+
+=border-bottom-left-radius($radius)
+  -webkit-border-bottom-left-radius: $radius
+  -moz-border-radius-bottomleft: $radius
+  border-bottom-left-radius: $radius
+
+// Single Side Border Radius
+=border-top-radius($radius)
+  +border-top-right-radius($radius)
+  +border-top-left-radius($radius)
+
+=border-right-radius($radius)
+  +border-top-right-radius($radius)
+  +border-bottom-right-radius($radius)
+
+=border-bottom-radius($radius)
+  +border-bottom-right-radius($radius)
+  +border-bottom-left-radius($radius)
+
+=border-left-radius($radius)
+  +border-top-left-radius($radius)
+  +border-bottom-left-radius($radius)
+
+
 // Drop shadows
 =box-shadow($shadow)
   -webkit-box-shadow: $shadow
@@ -176,7 +224,6 @@
 =transition($transition)
   -webkit-transition: $transition
   -moz-transition: $transition
-  -ms-transition: $transition
   -o-transition: $transition
   transition: $transition
 
@@ -210,11 +257,10 @@
   transform: skew($x, $y)
   
 =translate3d($x, $y, $z)
-  -webkit-transform: translate($x, $y, $z)
-  -moz-transform: translate($x, $y, $z)
-  -ms-transform: translate($x, $y, $z)
-  -o-transform: translate($x, $y, $z)
-  transform: translate($x, $y, $z)
+  -webkit-transform: translate3d($x, $y, $z)
+  -moz-transform: translate3d($x, $y, $z)
+  -o-transform: translate3d($x, $y, $z)
+  transform: translate3d($x, $y, $z)
 
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.
@@ -223,7 +269,6 @@
 =backface-visibility($visibility)
   -webkit-backface-visibility: $visibility
   -moz-backface-visibility: $visibility
-  -ms-backface-visibility: $visibility
   backface-visibility: $visibility
 
 // Background clipping
@@ -245,7 +290,6 @@
 =box-sizing($boxmodel)
   -webkit-box-sizing: $boxmodel
   -moz-box-sizing: $boxmodel
-  -ms-box-sizing: $boxmodel
   box-sizing: $boxmodel
 
 // User select
@@ -293,12 +337,15 @@
 // Add an alphatransparency value to any background or border color (via Elyse Holladay)
 =translucent-background($color: $white, $alpha: 1)
   background-color: hsla(hue($color), saturation($color), lightness($color), $alpha)
+  
 =translucent-border($color: $white, $alpha: 1)
   +border-color(hsla(hue($color), saturation($color), lightness($color), $alpha))
   +background-clip(padding-box)
   
 // Gradient Bar Colors for buttons and alerts
-=gradient-bar($primaryColor, $secondaryColor)
+=gradient-bar($primaryColor, $secondaryColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25))
+  color: $textColor
+  text-shadow: $textShadow
   +gradient-vertical($primaryColor, $secondaryColor)
   border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%)
   border-color: rgba(0, 0, 0, .1) rgba(0, 0, 0, .1) fadein(rgba(0, 0, 0, .1), 15%)
@@ -307,63 +354,56 @@
 =gradient-horizontal($startColor: #555, $endColor: #333)
   background-color: $endColor
   background-image: -moz-linear-gradient(left, $startColor, $endColor)  // FF 3.6+
-  background-image: -ms-linear-gradient(left, $startColor, $endColor)  // IE10
   background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor))  // Safari 4+, Chrome 2+
   background-image: -webkit-linear-gradient(left, $startColor, $endColor)  // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient(left, $startColor, $endColor)  // Opera 11.10
-  background-image: linear-gradient(left, $startColor, $endColor)  // Le standard
+  background-image: linear-gradient(to right, $startColor, $endColor)  // Standard, IE10
   background-repeat: repeat-x
-  $ieStartColor: rgb(red($startColor), green($startColor), blue($startColor))
-  $ieEndColor: rgb(red($endColor), green($endColor), blue($endColor))
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$ieStartColor}', endColorstr='#{$ieEndColor}', GradientType=1)  // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1)  // IE9 and down
+  
 =gradient-vertical($startColor: #555, $endColor: #333)
   background-color: mix($startColor, $endColor, 60%)
   background-image: -moz-linear-gradient(top, $startColor, $endColor)  // FF 3.6+
-  background-image: -ms-linear-gradient(top, $startColor, $endColor)  // IE10
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor))  // Safari 4+, Chrome 2+
   background-image: -webkit-linear-gradient(top, $startColor, $endColor)  // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient(top, $startColor, $endColor)  // Opera 11.10
-  background-image: linear-gradient(top, $startColor, $endColor)  // The standard
+  background-image: linear-gradient(to bottom, $startColor, $endColor)  // Standard, IE10
   background-repeat: repeat-x
-  $ieStartColor: rgb(red($startColor), green($startColor), blue($startColor))
-  $ieEndColor: rgb(red($endColor), green($endColor), blue($endColor))
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$ieStartColor}', endColorstr='#{$ieEndColor}', GradientType=0)  // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0)  // IE9 and down
+  
 =gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg)
   background-color: $endColor
   background-repeat: repeat-x
   background-image: -moz-linear-gradient($deg, $startColor, $endColor)  // FF 3.6+
-  background-image: -ms-linear-gradient($deg, $startColor, $endColor)  // IE10
   background-image: -webkit-linear-gradient($deg, $startColor, $endColor)  // Safari 5.1+, Chrome 10+
   background-image: -o-linear-gradient($deg, $startColor, $endColor)  // Opera 11.10
-  background-image: linear-gradient($deg, $startColor, $endColor)  // The standard
+  background-image: linear-gradient($deg, $startColor, $endColor)  // Standard, IE10
+  
 =gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f)
   background-color: mix($midColor, $endColor, 80%)
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor))
   background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor)
-  background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor)
-  background-image: -ms-linear-gradient($startColor, $midColor $colorStop, $endColor)
+  background-image: -moz-linear-gradient(top, $startColor, $midColor ($colorStop * 100%), $endColor)
   background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor)
   background-image: linear-gradient($startColor, $midColor $colorStop, $endColor)
   background-repeat: no-repeat
-  $ieStartColor: rgb(red($startColor), green($startColor), blue($startColor))
-  $ieEndColor: rgb(red($endColor), green($endColor), blue($endColor))
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$ieStartColor}', endColorstr='#{$ieEndColor}', GradientType=0)  // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0)  // IE9 and down, gets no color-stop at all for proper fallback
+  
 =gradient-radial($innerColor: #555, $outerColor: #333)
   background-color: $outerColor
   background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor))
   background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor)
   background-image: -moz-radial-gradient(circle, $innerColor, $outerColor)
-  background-image: -ms-radial-gradient(circle, $innerColor, $outerColor)
   background-image: -o-radial-gradient(circle, $innerColor, $outerColor)
   background-repeat: no-repeat
-=gradient-striped($color, $angle: -45deg)
+  
+=gradient-striped($color, $angle: 45deg)
   background-color: $color
   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: -ms-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: -o-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)
+  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)
 
 // Reset filters for IE
 =reset-filter
@@ -391,14 +431,15 @@
 
 // Button backgrounds
 // ---------------------------------------
-=button-background($startColor, $endColor)
+=button-background($startColor, $endColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25))
   // gradient-bar will set the background to a pleasing blend of these, to support IE<=9
-  +gradient-bar($startColor, $endColor)
+  +gradient-bar($startColor, $endColor, $textColor, $textShadow)
   *background-color: $endColor  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
   +reset-filter
 
   // In these cases the gradient won't cover the background, so we override
   &:hover, &:active, &.active, &.disabled, &[disabled]
+    color: $textColor
     background-color: $endColor
     *background-color: darken($endColor, 5%)
 
@@ -414,38 +455,6 @@
 =navbar-vertical-align($elementHeight)
   margin-top: ($navbarHeight - $elementHeight) / 2
     
-// Popover arrows
-// -------------------------
-// For tipsies and popovers
-=popover-arrow-top($arrowWidth: 5px, $color: $black)
-  bottom: 0
-  left: 50%
-  margin-left: -$arrowWidth
-  border-left: $arrowWidth solid transparent
-  border-right: $arrowWidth solid transparent
-  border-top: $arrowWidth solid $color
-=popover-arrow-left($arrowWidth: 5px, $color: $black)
-  top: 50%
-  right: 0
-  margin-top: -$arrowWidth
-  border-top: $arrowWidth solid transparent
-  border-bottom: $arrowWidth solid transparent
-  border-left: $arrowWidth solid $color
-=popover-arrow-bottom($arrowWidth: 5px, $color: $black)
-  top: 0
-  left: 50%
-  margin-left: -$arrowWidth
-  border-left: $arrowWidth solid transparent
-  border-right: $arrowWidth solid transparent
-  border-bottom: $arrowWidth solid $color
-=popover-arrow-right($arrowWidth: 5px, $color: $black)
-  top: 50%
-  left: 0
-  margin-top: -$arrowWidth
-  border-top: $arrowWidth solid transparent
-  border-bottom: $arrowWidth solid transparent
-  border-right: $arrowWidth solid $color
-  
 
 // Grid System
 // -----------
@@ -494,10 +503,11 @@
     
   // Set the container width, and override it for fixed navbars in media queries
   .container,
+  .navbar-static-top .container,
   .navbar-fixed-top .container,
   .navbar-fixed-bottom .container
     +core-grid-span($gridColumns, $gridColumnWidth, $gridGutterWidth)
-    
+
   @for $i from 1 through $gridColumns
     .span#{$i}
       +core-grid-span($i, $gridColumnWidth, $gridGutterWidth)
@@ -510,6 +520,14 @@
 =fluid-grid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth)
   width: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1)
   *width: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) - 0.5px / $gridRowWidth * 100 * 1%
+
+=fluid-grid-offset($columns, $fluidGridColumnWidth, $fluidGridGutterWidth)
+  margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) + $fluidGridGutterWidth * 2
+  *margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) - 0.5px / $gridRowWidth * 100 * 1% + $fluidGridGutterWidth * 2 - 0.5px / $gridRowWidth * 100 * 1%
+
+=fluid-grid-offset-first-child($columns, $fluidGridColumnWidth, $fluidGridGutterWidth)
+  margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) + $fluidGridGutterWidth
+  *margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) - 0.5px / $gridRowWidth * 100 * 1% + $fluidGridGutterWidth - 0.5px / $gridRowWidth * 100 * 1%
   
 =fluid-grid-generate($fluidGridColumnWidth, $fluidGridGutterWidth)
   .row-fluid
@@ -529,17 +547,30 @@
       .span#{$i}
         +fluid-grid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth)
 
+    @for $i from 1 to $gridColumns
+      .offset#{$i}
+        +fluid-grid-offset($i, $fluidGridColumnWidth, $fluidGridGutterWidth)
+      .offset#{$i}:first-child
+        +fluid-grid-offset-first-child($i, $fluidGridColumnWidth, $fluidGridGutterWidth)
+
   
 =input-grid-span($columns, $gridColumnWidth, $gridGutterWidth)
-  width: $gridColumnWidth * $columns + $gridGutterWidth * ($columns - 1) - 10
+  width: $gridColumnWidth * $columns + $gridGutterWidth * ($columns - 1) - 14
   
 =input-grid-generate($gridColumnWidth, $gridGutterWidth)
   input,
   textarea,
   .uneditable-input
     margin-left: 0  // override margin-left from core grid system
-    @for $i from 1 through $gridColumns
-      &.span#{$i}
-        +input-grid-span($i, $gridColumnWidth, $gridGutterWidth)
+
+  // Space grid-sized controls properly if multiple per line
+  .controls-row [class*="span"] + [class*="span"]
+    margin-left: $gridGutterWidth
+
+  @for $i from 1 through $gridColumns
+    input.span#{$i},
+    textarea.span#{$i},
+    .uneditable-input.span#{$i}
+      +input-grid-span($i, $gridColumnWidth, $gridGutterWidth)
       
   

data/vendor/assets/stylesheets/twitter/bootstrap/_modals.sass

@@ -1,5 +1,7 @@
-// MODALS
-// ------
+//
+// Modals
+// --------------------------------------------------
+
 
 // Recalculate z-index where appropriate
 .modal-open
@@ -57,6 +59,10 @@
   // Close icon
   .close
     margin-top: 2px
+  // Heading
+  h3
+    margin: 0
+    line-height: 30px
 
 // Body (where all modal content resides)
 .modal-body