sass-rails-bootstrap 2.1.0.1 → 2.1.1

data/README.md

@@ -69,8 +69,8 @@ Alternatively, you could include only the files you need:
 
 This gem will directly track the semantic versioning releases of the Twitter Bootstrap project. Our major and minor versions will always match to theirs.
 
-Currently, this gem reflects the Bootstrap version 2.1.0 up to the commit:
-https://github.com/twitter/bootstrap/commit/320b75de63f347027774ba7353eea7f6937ab14b
+Currently, this gem reflects the Bootstrap version 2.1.1 up to the commit:
+https://github.com/twitter/bootstrap/commit/c52368d3c5984b28e6a71e5e1240afdd788fc2e6
 
 
 ## Copyright and license

data/lib/sass-rails-bootstrap/version.rb

@@ -1,3 +1,3 @@
 module SassRailsBootstrap
-  VERSION = "2.1.0.1"
+  VERSION = "2.1.1"
 end

data/vendor/assets/javascripts/twitter/bootstrap/affix.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-affix.js v2.1.0
+ * bootstrap-affix.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#affix
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/alert.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.1.0
+ * bootstrap-alert.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/button.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.1.0
+ * bootstrap-button.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -51,7 +51,7 @@
   }
 
   Button.prototype.toggle = function () {
-    var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
 
     $parent && $parent
       .find('.active')

data/vendor/assets/javascripts/twitter/bootstrap/carousel.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.1.0
+ * bootstrap-carousel.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/collapse.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.1.0
+ * bootstrap-collapse.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.1.0
+ * bootstrap-dropdown.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -110,7 +110,7 @@
 
     if (!selector) {
       selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
     }
 
     $parent = $(selector)
@@ -142,7 +142,7 @@
     $('html')
       .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
     $('body')
-      .on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() })
+      .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
       .on('click.dropdown.data-api touchstart.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
       .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
   })

data/vendor/assets/javascripts/twitter/bootstrap/modal.js

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.1.0
+ * bootstrap-modal.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/popover.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-popover.js v2.1.0
+ * bootstrap-popover.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-scrollspy.js v2.1.0
+ * bootstrap-scrollspy.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/tab.js

@@ -1,5 +1,5 @@
 /* ========================================================
- * bootstrap-tab.js v2.1.0
+ * bootstrap-tab.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-tooltip.js v2.1.0
+ * bootstrap-tooltip.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================

data/vendor/assets/javascripts/twitter/bootstrap/transition.js

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.1.0
+ * bootstrap-transition.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-typeahead.js v2.1.0
+ * bootstrap-typeahead.js v2.1.1
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -174,7 +174,7 @@
         .on('keypress', $.proxy(this.keypress, this))
         .on('keyup',    $.proxy(this.keyup, this))
 
-      if ($.browser.webkit || $.browser.msie) {
+      if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
         this.$element.on('keydown', $.proxy(this.keydown, this))
       }
 

data/vendor/assets/stylesheets/twitter/_bootstrap-responsive.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.1.0
+ * Bootstrap Responsive v2.1.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

data/vendor/assets/stylesheets/twitter/_bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.1.0
+ * Bootstrap v2.1.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.sass

@@ -7,6 +7,7 @@
 .btn-group
   position: relative
   font-size: 0  // remove as part 1 of font-size inline-block hack
+  vertical-align: middle  // match .btn alignment given font-size hack above
   white-space: nowrap  // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
   +ie7-restore-left-whitespace
 

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

@@ -85,17 +85,30 @@
 .btn-mini
   padding: 2px 6px
   font-size: $baseFontSize - 2px
-  line-height: $baseLineHeight - 4px
+  line-height: $baseLineHeight - 3px
+
 
 // Block button
+// -------------------------
+
 .btn-block
   display: block
   width: 100%
   padding-left: 0
   padding-right: 0
   +box-sizing(border-box)
+
+// Vertically space out multiple block buttons
 .btn-block + .btn-block
   margin-top: 5px
+
+// Specificity overrides
+input[type="submit"],
+input[type="reset"],
+input[type="button"]
+  &.btn-block
+    width: 100%
+    
       
       
 // Alternate buttons
@@ -165,7 +178,8 @@ input[type="submit"].btn
 
 // Make a button look and behave like a link
 .btn-link,
-.btn-link:active
+.btn-link:active,
+.btn-link[disabled]
   background-color: transparent
   background-image: none
   +box-shadow(none)
@@ -180,3 +194,7 @@ input[type="submit"].btn
   color: $linkColorHover
   text-decoration: underline
   background-color: transparent
+
+.btn-link[disabled]:hover
+  color: $grayDark
+  text-decoration: none

data/vendor/assets/stylesheets/twitter/bootstrap/_component-animations.sass

@@ -13,7 +13,6 @@
   position: relative
   height: 0
   overflow: hidden
-  overflow: visible \9
   +transition(height .35s ease)
   &.in
     height: auto

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

@@ -134,7 +134,7 @@
   .caret
     border-top: 0
     border-bottom: 4px solid $black
-    content: "\2191"
+    content: ""
   // Different positioning for bottom up menu
   .dropdown-menu
     top: auto
@@ -155,7 +155,7 @@
   -moz-border-radius: 0 6px 6px 6px
   border-radius: 0 6px 6px 6px
 
-.dropdown-submenu:hover .dropdown-menu
+.dropdown-submenu:hover > .dropdown-menu
   display: block
 
 .dropdown-submenu > a:after

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

@@ -83,8 +83,9 @@ input[type="color"],
 // Reset appearance properties for textual inputs and textarea
 // Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
 input,
-textarea
-  width: 210px
+textarea,
+.uneditable-input
+  width: 206px  // plus 12px padding and 2px border
 // Reset height since textareas have rows
 textarea
   height: auto
@@ -147,7 +148,7 @@ input[type="file"]
 // Make select elements obey height by applying a border
 select
   width: 220px  // default input width + 10px of padding that doesn't get applied
-  border: 1px solid #bbb
+  border: 1px solid $inputBorder
   background-color: $inputBackground  // Chrome on Linux and Mobile Safari need background-color
   
 // Make multiple select elements height not fixed
@@ -189,7 +190,7 @@ input[type="checkbox"]:focus
 // Placeholder
 // -------------------------
 
-// Placeholder text gets special styles; can't be bundled together though for some reason
+// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector
 input,
 textarea
   +placeholder
@@ -319,6 +320,10 @@ input[type="checkbox"][readonly]
 .control-group.success
   +form-field-state($successText, $successText, $successBackground)
 
+// Success
+.control-group.info
+  +form-field-state($infoText, $infoText, $infoBackground)
+
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
 input:focus:required:invalid,
@@ -401,7 +406,6 @@ select:focus:required:invalid
     border: 1px solid #ccc
   .add-on,
   .btn
-    margin-left: -1px
     vertical-align: top
     +border-radius(0)
   .active
@@ -421,6 +425,9 @@ select:focus:required:invalid
   select,
   .uneditable-input
     +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
+  .add-on,
+  .btn
+    margin-left: -1px
   .add-on:last-child,
   .btn:last-child
     +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
@@ -544,7 +551,7 @@ legend + .control-group
   // Float the labels left
   .control-label
     float: left
-    width: 140px
+    width: $horizontalComponentOffset - 20
     padding-top: 5px
     text-align: right
   // Move over all input controls and content
@@ -553,14 +560,19 @@ legend + .control-group
     // don't inherit the margin of the parent, in this case .controls
     *display: inline-block
     *padding-left: 20px
-    margin-left: 160px
+    margin-left: $horizontalComponentOffset
     *margin-left: 0
     &:first-child
-      *padding-left: 160px
+      *padding-left: $horizontalComponentOffset
   // Remove bottom margin on block level help text since that's accounted for on .control-group
   .help-block
-    margin-top: $baseLineHeight / 2
     margin-bottom: 0
+  // And apply it only to .help-block instances that follow a form control
+  input,
+  select,
+  textarea
+    + .help-block
+      margin-top: $baseLineHeight / 2
   // Move over buttons in .form-actions to align with .controls
   .form-actions
-    padding-left: 160px
+    padding-left: $horizontalComponentOffset

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

@@ -71,11 +71,11 @@
 // Placeholder text
 // -------------------------
 =placeholder($color: $placeholderText)
-  \:-moz-placeholder
+  &:-moz-placeholder
     color: $color
-  \:-ms-input-placeholder
+  &:-ms-input-placeholder
     color: $color
-  ::-webkit-input-placeholder
+  &::-webkit-input-placeholder
     color: $color
 
 // Text overflow
@@ -150,11 +150,13 @@
   select,
   textarea
     color: $textColor
+  input,
+  select,
+  textarea
     border-color: $borderColor
     +box-shadow(inset 0 1px 1px rgba(0,0,0,.075))  // Redeclare so transitions work
     &:focus
       border-color: darken($borderColor, 10%)
-      // 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
@@ -227,6 +229,12 @@
   -o-transition: $transition
   transition: $transition
 
+=transition-delay($transition-delay)
+  -webkit-transition-delay: $transition-delay
+  -moz-transition-delay: $transition-delay
+  -o-transition-delay: $transition-delay
+  transition-delay: $transition-delay
+
 // Transformations
 =rotate($degrees)
   -webkit-transform: rotate($degrees)
@@ -252,7 +260,7 @@
 =skew($x, $y)
   -webkit-transform: skew($x, $y)
   -moz-transform: skew($x, $y)
-  -ms-transform: skew($x, $y)
+  -ms-transform: skewX($x) skewY($y)  // See https://github.com/twitter/bootstrap/issues/4885
   -o-transform: skew($x, $y)
   transform: skew($x, $y)
   
@@ -383,7 +391,7 @@
   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 * 100%), $endColor)
+  background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor)
   background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor)
   background-image: linear-gradient($startColor, $midColor $colorStop, $endColor)
   background-repeat: no-repeat
@@ -397,7 +405,7 @@
   background-image: -o-radial-gradient(circle, $innerColor, $outerColor)
   background-repeat: no-repeat
   
-=gradient-striped($color, $angle: 45deg)
+=gradient-striped($color: #555, $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)
@@ -499,6 +507,7 @@
     
   [class*="span"]
     float: left
+    min-height: 1px  // prevent collapsing columns
     margin-left: $gridGutterWidth
     
   // Set the container width, and override it for fixed navbars in media queries

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

@@ -3,8 +3,9 @@
 // --------------------------------------------------
 
 
-// Recalculate z-index where appropriate
-.modal-open
+// Recalculate z-index where appropriate,
+// but only apply to elements within modal
+.modal-open .modal
   .dropdown-menu
     z-index: $zindexDropdown + $zindexModal
   .dropdown.open

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

@@ -27,6 +27,9 @@
   +border-radius(4px)
   +box-shadow(0 1px 4px rgba(0,0,0,.065))
 
+  // Prevent floats from breaking the navbar
+  +clearfix
+
 // Set width to auto for default container
 // We then reset it for fixed navbars in the grid system mixin
 .navbar .container
@@ -81,13 +84,16 @@
 // -------------------------
 .navbar .btn,
 .navbar .btn-group
-  +navbar-vertical-align(28px)  // Vertically center in navbar
+  +navbar-vertical-align(30px)  // Vertically center in navbar
 
-.navbar .btn-group .btn
-  margin: 0  // then undo the margin here so we don't accidentally double it
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn
+  margin-top: 0  // then undo the margin here so we don't accidentally double it
 
 
 // Navbar forms
+// -------------------------
 .navbar-form
   margin-bottom: 0  // remove default bottom margin
   +clearfix
@@ -114,6 +120,7 @@
 
 
 // Navbar search
+// -------------------------
 .navbar-search
   position: relative
   float: left
@@ -150,11 +157,13 @@
   left: 0
   z-index: $zindexFixedNavbar
   margin-bottom: 0  // remove 18px margin for default navbar
-.navbar-fixed-top,
-.navbar-fixed-bottom,
-.navbar-static-top
-  .navbar-inner
-    border: 0
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner
+  border-width: 0 0 1px
+
+.navbar-fixed-bottom .navbar-inner
+  border-width: 1px 0 0
 
 .navbar-fixed-top .navbar-inner,
 .navbar-fixed-bottom .navbar-inner
@@ -199,6 +208,7 @@
 
 .navbar .nav.pull-right
   float: right  // redeclare due to specificity
+  margin-right: 0  // remove margin on float right nav
 
 .navbar .nav > li
   float: left
@@ -232,9 +242,7 @@
   color: $navbarLinkColorActive
   text-decoration: none
   background-color: $navbarLinkBackgroundActive
-  -webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,.125)
-  -moz-box-shadow: inset 0 3px 8px rgba(0,0,0,.125)
-  box-shadow: inset 0 3px 8px rgba(0,0,0,.125)
+  +box-shadow(inset 0 3px 8px rgba(0,0,0,.125))
 
 
 // Navbar button for toggling navbar items in responsive layouts

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

@@ -8,23 +8,32 @@
   list-style: none
   text-align: center
   +clearfix
-  li
-    display: inline
-  a
-    display: inline-block
-    padding: 5px 14px
-    background-color: #fff
-    border: 1px solid #ddd
-    +border-radius(15px)
-    &:hover
-      text-decoration: none
-      background-color: #f5f5f5
-  .next a
-    float: right
-  .previous a
-    float: left
-  .disabled a,
-  .disabled a:hover
-    color: $grayLight
-    background-color: #fff
-    cursor: default
+
+.pager li
+  display: inline
+
+.pager a,
+.pager span
+  display: inline-block
+  padding: 5px 14px
+  background-color: #fff
+  border: 1px solid #ddd
+  +border-radius(15px)
+
+.pager a:hover
+  text-decoration: none
+  background-color: #f5f5f5
+
+.pager .next a,
+.pager .next span
+  float: right
+
+.pager .previous a
+  float: left
+
+.pager .disabled a,
+.pager .disabled a:hover,
+.pager .disabled span
+  color: $grayLight
+  background-color: #fff
+  cursor: default

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

@@ -6,6 +6,7 @@
 .pagination
   height: $baseLineHeight * 2
   margin: $baseLineHeight 0
+ 
 .pagination ul
   display: inline-block
   +ie7-inline-block
@@ -13,41 +14,50 @@
   margin-bottom: 0
   +border-radius(3px)
   +box-shadow(0 1px 2px rgba(0,0,0,.05))
-.pagination li
+
+.pagination ul > li
   display: inline
-.pagination a,
-.pagination span
+
+.pagination ul > li > a,
+.pagination ul > li > span
   float: left
   padding: 0 14px
-  line-height: $baseLineHeight * 2 - 2
+  line-height: ($baseLineHeight * 2) - 2
   text-decoration: none
   background-color: $paginationBackground
   border: 1px solid $paginationBorder
   border-left-width: 0
-.pagination a:hover,
-.pagination .active a,
-.pagination .active span
+
+.pagination ul > li > a:hover,
+.pagination ul > .active > a,
+.pagination ul > .active > span
   background-color: #f5f5f5
-.pagination .active a,
-.pagination .active span
+
+.pagination ul > .active > a,
+.pagination ul > .active > span
   color: $grayLight
   cursor: default
-.pagination .disabled span,
-.pagination .disabled a,
-.pagination .disabled a:hover
+
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover
   color: $grayLight
   background-color: transparent
   cursor: default
-.pagination li:first-child a,
-.pagination li:first-child span
+
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span
   border-left-width: 1px
   +border-radius(3px 0 0 3px)
-.pagination li:last-child a,
-.pagination li:last-child span
+
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span
   +border-radius(0 3px 3px 0)
 
+
 // Centered
 .pagination-centered
   text-align: center
+
 .pagination-right
   text-align: right

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

@@ -69,8 +69,11 @@ sub
 // -------------------------
 
 img
-  max-width: 100%  // Make images inherently responsive
-  height: auto  // Make images inherently responsive
+  /* Responsive images (ensure images don't scale beyond their parents) */
+  max-width: 100%  /* Part 1: Set a maxium relative to the parent */
+  width: auto\9  /* IE7-8 need help adjusting responsive images */
+  height: auto  /* Part 2: Scale the height according to the width, otherwise you get stretching */
+  
   vertical-align: middle
   border: 0
   -ms-interpolation-mode: bicubic

data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.sass

@@ -11,7 +11,8 @@
     
   // Negative indent the now static "fixed" navbar
   .navbar-fixed-top,
-  .navbar-fixed-bottom
+  .navbar-fixed-bottom,
+  .navbar-static-top
     margin-left: -20px
     margin-right: -20px
     
@@ -55,8 +56,9 @@
   .row-fluid [class*="span"]
     float: none
     display: block
-    width: auto
+    width: 100%
     margin-left: 0
+    +box-sizing(border-box)
   .span12,
   .row-fluid .span12
     width: 100%
@@ -83,6 +85,9 @@
     display: inline-block  // redeclare so they don't wrap to new lines
     width: auto
 
+  .controls-row [class*="span"] + [class*="span"]
+    margin-left: 0
+
   // Modals
   .modal
     position: fixed
@@ -115,24 +120,25 @@
     border: 1px solid #ccc
 
   // Remove the horizontal form styles
-  .form-horizontal .control-group > label
-    float: none
-    width: auto
-    padding-top: 0
-    text-align: left
-    
-  // Move over all input controls and content
-  .form-horizontal .controls
-    margin-left: 0
-    
-  // Move the options list down to align with labels
-  .form-horizontal .control-list
-    padding-top: 0  // has to be padding because margin collaspes
-    
-  // Move over buttons in .form-actions to align with .controls
-  .form-horizontal .form-actions
-    padding-left: 10px
-    padding-right: 10px
+  .form-horizontal
+    .control-label
+      float: none
+      width: auto
+      padding-top: 0
+      text-align: left
+  
+    // Move over all input controls and content
+    .controls
+      margin-left: 0
+
+    // Move the options list down to align with labels
+    .control-list
+      padding-top: 0  // has to be padding because margin collaspes
+
+    // Move over buttons in .form-actions to align with .controls
+    .form-actions
+      padding-left: 10px
+      padding-right: 10px
 
   // Modals
   .modal

data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.sass

@@ -111,6 +111,11 @@
     
   .nav-collapse .dropdown-menu .divider
     display: none
+
+  .nav-collapse .nav > li > .dropdown-menu
+    &:before,
+    &:after
+      display: none
     
   // Forms in navbar
   .nav-collapse .navbar-form,
@@ -122,6 +127,11 @@
     border-bottom: 1px solid $navbarBackground
     $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)
     +box-shadow($shadow)
+
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search
+    border-top-color: $navbarInverseBackground
+    border-bottom-color: $navbarInverseBackground
     
   // Pull right (secondary) nav content
   .navbar .nav-collapse .nav.pull-right

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

@@ -29,17 +29,18 @@ a:hover
 // Images
 // -------------------------
 
+// Rounded corners
 .img-rounded
   +border-radius(6px)
 
+// Add polaroid-esque trim
 .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)
+  +box-shadow(0 1px 3px rgba(0,0,0,.1))
 
+// Perfect circle
 .img-circle
-  +border-radius(500px)
+  +border-radius(500px)  // crank the border-radius so it works with most reasonably sized images

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

@@ -28,8 +28,14 @@
 
 // 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-"],
+.nav-tabs > .active > a > [class^="icon-"],
+.nav-tabs > .active > a > [class*=" icon-"],
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .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-"],

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

@@ -116,7 +116,7 @@ table
   colgroup + tbody tr:first-child td:last-child
     -webkit-border-top-right-radius: 4px
     border-top-right-radius: 4px
-    -moz-border-right-topleft: 4px
+    -moz-border-radius-topleft: 4px
 
 
 // ZEBRA-STRIPING
@@ -151,7 +151,7 @@ table [class*=span],
   margin-left: 0  // undo default grid column styles
 
 // Change the column widths to account for td/th padding
-table
+.table
   .span1
     +table-columns(1)
   .span2
@@ -206,10 +206,23 @@ table
 // -----------------
 // Exact selectors below required to override .table-striped
 
-.table
-  tbody tr.success td
+.table tbody tr
+  &.success td
     background-color: $successBackground
-  tbody tr.error td
+  &.error td
     background-color: $errorBackground
-  tbody tr.info td
+  &.warning td
+    background-color: $warningBackground
+  &.info td
     background-color: $infoBackground
+
+// Hover states for .table-hover
+.table-hover tbody tr
+  &.success:hover td
+    background-color: darken($successBackground, 5%)
+  &.error:hover td
+    background-color: darken($errorBackground, 5%)
+  &.warning:hover td
+    background-color: darken($warningBackground, 5%)
+  &.info:hover td
+    background-color: darken($infoBackground, 5%)

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

@@ -11,7 +11,7 @@ p
     
 .lead
   margin-bottom: $baseLineHeight
-  font-size: 20px
+  font-size: $baseFontSize * 1.5
   font-weight: 200
   line-height: $baseLineHeight * 1.5
 
@@ -31,8 +31,17 @@ em
 cite
   font-style: normal
 
+// Utility classes
 .muted
   color: $grayLight
+.text-warning
+  color: $warningText
+.text-error
+  color: $errorText
+.text-info
+  color: $infoText
+.text-success
+  color: $successText
 
 
 // Headings
@@ -135,14 +144,15 @@ dd
   
 // Horizontal layout (like forms)
 .dl-horizontal
+  +clearfix  // Ensure dl clears floats if empty dd elements present
   dt
     float: left
-    width: 120px
+    width: $horizontalComponentOffset - 20
     clear: left
     text-align: right
     +text-overflow
   dd
-    margin-left: 130px
+    margin-left: $horizontalComponentOffset
 
 
 // MISC

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

@@ -147,6 +147,11 @@ $placeholderText:       $grayLight
 $hrBorder:              $grayLighter
 
 
+// Horizontal forms & lists
+// -------------------------
+$horizontalComponentOffset:       180px
+
+
 // Wells
 // -------------------------
 $wellBackground:                  #f5f5f5
@@ -161,8 +166,8 @@ $navbarBackgroundHighlight:       #ffffff
 $navbarBackground:                darken($navbarBackgroundHighlight, 5%)
 $navbarBorder:                    darken($navbarBackground, 12%)
 
-$navbarText:                      $gray
-$navbarLinkColor:                 $gray
+$navbarText:                      #777
+$navbarLinkColor:                 #777
 $navbarLinkColorHover:            $grayDark
 $navbarLinkColorActive:           $gray
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails-bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.1.0.1
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails