sass-twitter-bootstrap-rails 1.0.1 → 1.0.2

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

@@ -1,6 +1,6 @@
 module SassTwitterBootstrap
   module Rails
-    VERSION = '1.0.1'
-    BOOTSTRAP_VERSION = '2.0.0'
+    VERSION = '1.0.2'
+    BOOTSTRAP_VERSION = '2.0.1'
   end
 end

data/sass-twitter-bootstrap-rails.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_path = "lib"
+  s.require_path  = "lib"
 end

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.0
+ * bootstrap-alert.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -51,11 +51,14 @@
 
       $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
 
-      $parent.removeClass('in')
+      $parent
+        .trigger('close')
+        .removeClass('in')
 
       function removeElement() {
-        $parent.remove()
-        $parent.trigger('closed')
+        $parent
+          .trigger('closed')
+          .remove()
       }
 
       $.support.transition && $parent.hasClass('fade') ?
@@ -88,4 +91,4 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.0.0
+ * bootstrap-button.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -91,8 +91,8 @@
 
   $(function () {
     $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      $(e.target).button('toggle')
+      $(e.currentTarget).button('toggle')
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.0.0
+ * bootstrap-carousel.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -61,6 +61,7 @@
 
   , pause: function () {
       clearInterval(this.interval)
+      this.interval = null
       return this
     }
 
@@ -82,6 +83,8 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
+      if (!$next.length) return
+
       this.sliding = true
 
       isCycling && this.pause()
@@ -151,4 +154,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.0
+ * bootstrap-collapse.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -133,4 +133,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.0.0
+ * bootstrap-dropdown.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -89,4 +89,4 @@
     $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.0.0
+ * bootstrap-modal.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
   * ====================== */
 
   var Modal = function ( content, options ) {
-    this.options = $.extend({}, $.fn.modal.defaults, options)
+    this.options = options
     this.$element = $(content)
       .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
   }
@@ -177,16 +177,17 @@
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
-        , options = typeof option == 'object' && option
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
       if (!data) $this.data('modal', (data = new Modal(this, options)))
       if (typeof option == 'string') data[option]()
-      else data.show()
+      else if (options.show) data.show()
     })
   }
 
   $.fn.modal.defaults = {
       backdrop: true
     , keyboard: true
+    , show: true
   }
 
   $.fn.modal.Constructor = Modal
@@ -206,4 +207,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-popover.js v2.0.0
+ * bootstrap-popover.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.
@@ -92,4 +92,4 @@
   , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-scrollspy.js v2.0.0
+ * bootstrap-scrollspy.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -122,4 +122,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ========================================================
- * bootstrap-tab.js v2.0.0
+ * bootstrap-tab.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.
@@ -127,4 +127,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-tooltip.js v2.0.0
+ * bootstrap-tooltip.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
@@ -267,4 +267,4 @@
   , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
   }
 
-}( window.jQuery )
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.0.0
+ * bootstrap-transition.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.
@@ -47,5 +47,5 @@
     })()
 
   })
-  
-}( window.jQuery )
+
+}( window.jQuery );

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

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-typeahead.js v2.0.0
+ * bootstrap-typeahead.js v2.0.1
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -268,4 +268,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );

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

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

data/vendor/assets/stylesheets/twitter/bootstrap/breadcrumbs.scss

@@ -9,7 +9,7 @@
   @include border-radius(3px);
   @include box-shadow(inset 0 1px 0 $white);
   li {
-    display: inline;
+    display: inline-block;
     text-shadow: 0 1px 0 $white;
   }
   .divider {

data/vendor/assets/stylesheets/twitter/bootstrap/button-groups.scss

@@ -133,7 +133,8 @@
 .btn-primary,
 .btn-danger,
 .btn-info,
-.btn-success {
+.btn-success,
+.btn-inverse {
   .caret {
     border-top-color: $white;
     @include opacity(75);

data/vendor/assets/stylesheets/twitter/bootstrap/buttons.scss

@@ -9,12 +9,14 @@
 .btn {
   display: inline-block;
   padding: 4px 10px 4px;
+  margin-bottom: 0;
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $grayDark;
   text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  @include vertical-three-colors-gradient($white, $white, 25%, darken($white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
+  vertical-align: middle;
+  @include buttonBackground($white, darken($white, 10%));
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   @include border-radius(4px);
@@ -23,6 +25,7 @@
   cursor: pointer;
 
   // Give IE7 some love
+  @extend .reset_filter;
   @extend .ie7-restore-left-whitespace;
 }
 
@@ -51,7 +54,6 @@
   @include box-shadow($shadow);
   background-color: darken($white, 10%);
   background-color: darken($white, 15%) e("\9");
-  color: rgba(0,0,0,.5);
   outline: 0;
 }
 
@@ -76,7 +78,7 @@
   line-height: normal;
   @include border-radius(5px);
 }
-.btn-large .icon {
+.btn-large [class^="icon-"] {
   margin-top: 1px;
 }
 
@@ -86,10 +88,17 @@
   font-size: $baseFontSize - 2px;
   line-height: $baseLineHeight - 2px;
 }
-.btn-small .icon {
+.btn-small [class^="icon-"] {
   margin-top: -1px;
 }
 
+// Mini
+.btn-mini {
+  padding: 2px 6px;
+  font-size: $baseFontSize - 2px;
+  line-height: $baseLineHeight - 4px;
+}
+
 
 // Alternate buttons
 // --------------------------------------------------
@@ -105,7 +114,9 @@
 .btn-success,
 .btn-success:hover,
 .btn-info,
-.btn-info:hover {
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover {
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   color: $white;
 }
@@ -114,7 +125,8 @@
 .btn-warning.active,
 .btn-danger.active,
 .btn-success.active,
-.btn-info.active {
+.btn-info.active,
+.btn-dark.active {
   color: rgba(255,255,255,.75);
 }
 
@@ -139,6 +151,10 @@
 .btn-info {
   @include buttonBackground(#5bc0de, #2f96b4);
 }
+// Inverse appears as dark gray
+.btn-inverse {
+ @include buttonBackground(#454545, #262626);
+}
 
 
 // Cross-browser Jank

data/vendor/assets/stylesheets/twitter/bootstrap/code.scss

@@ -11,12 +11,16 @@ pre {
   @include border-radius(3px);
   @extend .monospace;
 }
+
+// Inline code
 code {
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
   color: #d14;
   padding: 3px 4px;
 }
+
+// Blocks of code
 pre {
   display: block;
   padding: ($baseLineHeight - 1) / 2;
@@ -29,6 +33,7 @@ pre {
   @include border-radius(4px);
   white-space: pre-wrap;
   word-break: break-all;
+  word-wrap: break-word;
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
@@ -38,6 +43,14 @@ pre {
   // Account for some code outputs that place code tags in pre tags
   code {
     padding: 0;
+    color: inherit;
     background-color: transparent;
+    border: 0;
   }
+}
+
+// Enable scrollable blocks of code
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
 }

data/vendor/assets/stylesheets/twitter/bootstrap/dropdowns.scss

@@ -93,7 +93,7 @@
     padding: 3px 15px;
     clear: both;
     font-weight: normal;
-    line-height: 18px;
+    line-height: $baseLineHeight;
     color: $gray;
     white-space: nowrap;
   }

data/vendor/assets/stylesheets/twitter/bootstrap/forms.scss

@@ -29,11 +29,22 @@ legend {
   border-bottom: 1px solid #eee;
 }
 
+small {
+  font-size: $baseLineHeight * .75;
+  color: $grayLight;
+}
+
 // Set font for forms
 label,
 input,
 button,
 select,
+textarea {
+  @include shorthand($baseFontSize, normal, $baseLineHeight);
+}
+input,
+button,
+select,
 textarea {
   @include sans-serif($baseFontSize, normal, $baseLineHeight);
 }
@@ -83,13 +94,18 @@ input[type="radio"] {
   margin: 3px 0;
   *margin-top: 0; /* IE7 */
   line-height: normal;
-  border: 0;
   cursor: pointer;
   @include border-radius(0);
+  border: 0 \9;
+}
+
+input[type="image"] {
+  border: 0;
 }
 
 // Reset the file input to browser defaults
 input[type="file"] {
+  width: auto;
   padding: initial;
   line-height: initial;
   border: initial;
@@ -98,6 +114,10 @@ input[type="file"] {
   @include box-shadow(none);
 }
 
+input[type="file"] {
+  line-height: 18px \9;
+}
+
 // Help out input buttons
 input[type="button"],
 input[type="reset"],
@@ -166,6 +186,7 @@ input[type="hidden"] {
 .radio.inline,
 .checkbox.inline {
   display: inline-block;
+  padding-top: 5px;
   margin-bottom: 0;
   vertical-align: middle;
 }
@@ -173,11 +194,6 @@ input[type="hidden"] {
 .checkbox.inline + .checkbox.inline {
   margin-left: 10px; // space out consecutive inline controls
 }
-// But don't forget to remove their padding on first-child
-.controls > .radio.inline:first-child,
-.controls > .checkbox.inline:first-child {
-  padding-top: 0;
-}
 
 // FOCUS STATE
 // -----------
@@ -194,9 +210,10 @@ textarea:focus {
   $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
   @include box-shadow($shadow);
   outline: 0;
-  outline: thin dotted \9; /* IE6-8 */
+  outline: thin dotted \9; /* IE6-9 */
 }
 input[type="file"]:focus,
+input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus {
   @include box-shadow(none); // override for file inputs
@@ -248,33 +265,6 @@ textarea[readonly] {
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
-// Mixin for form field states
-@mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
-  // Set the text color
-  > label,
-  .help-block,
-  .help-inline {
-    color: $textColor;
-  }
-  // Style inputs accordingly
-  input,
-  select,
-  textarea {
-    color: $textColor;
-    border-color: $borderColor;
-    &:focus {
-      border-color: darken($borderColor, 10%);
-      @include box-shadow(0 0 6px lighten($borderColor, 20%));
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: $textColor;
-    background-color: $backgroundColor;
-    border-color: $textColor;
-  }
-}
 // Warning
 .control-group.warning {
   @include formFieldState($warningText, $warningText, $warningBackground);
@@ -329,6 +319,7 @@ select:focus:required:invalid {
 // ---------
 
 .help-block {
+  display: block;
   margin-top: 5px;
   margin-bottom: 0;
   color: $grayLight;
@@ -360,7 +351,8 @@ select:focus:required:invalid {
     }
   }
   .uneditable-input {
-    border-left-color: #ccc;
+    border-left-color: #eee;
+    border-right-color: #ccc;
   }
   .add-on {
     float: left;
@@ -379,6 +371,10 @@ select:focus:required:invalid {
     border: 1px solid #ccc;
     @include border-radius(3px 0 0 3px);
   }
+  // Re-hide hidden elements due to specifity
+  .hide {
+    display: none;
+  }
   .active {
     background-color: lighten($green, 30);
     border-color: $green;
@@ -458,29 +454,37 @@ select:focus:required:invalid {
 .form-inline .input-prepend .add-on {
   vertical-align: middle;
 }
+// Inline checkbox/radio labels
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
 
 // Margin to space out fieldsets
 .control-group {
   margin-bottom: $baseLineHeight / 2;
 }
 
+// Legend collapses margin, so next element is responsible for spacing
+legend + .control-group {
+  margin-top: $baseLineHeight;
+  -webkit-margin-top-collapse: separate;
+}
 
 // Horizontal-specific styles
 // --------------------------
 
 .form-horizontal {
-  // Legend collapses margin, so we're relegated to padding
-  legend + .control-group {
-    margin-top: $baseLineHeight;
-    -webkit-margin-top-collapse: separate;
-  }
   // Increase spacing between groups
   .control-group {
     margin-bottom: $baseLineHeight;
     @include clearfix;
   }
   // Float the labels left
-  .control-group > label {
+  .control-label {
     float: left;
     width: 140px;
     padding-top: 5px;

data/vendor/assets/stylesheets/twitter/bootstrap/labels.scss

@@ -2,15 +2,30 @@
 // ------
 
 .label {
-  padding: 1px 3px 2px;
-  font-size: $baseFontSize * .75;
+  padding: 2px 4px 3px;
+  font-size: $baseFontSize * .85;
   font-weight: bold;
   color: $white;
-  text-transform: uppercase;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
   background-color: $grayLight;
   @include border-radius(3px);
 }
-.label-important { background-color: $errorText; }
-.label-warning   { background-color: $orange; }
-.label-success   { background-color: $successText; }
-.label-info      { background-color: $infoText; }
+
+// Hover state
+.label:hover {
+  color: $white;
+  text-decoration: none;
+}
+
+// Colors
+.label-important        { background-color: $errorText; }
+.label-important:hover  { background-color: darken($errorText, 10%); }
+
+.label-warning          { background-color: $orange; }
+.label-warning:hover    { background-color: darken($orange, 10%); }
+
+.label-success          { background-color: $successText; }
+.label-success:hover    { background-color: darken($successText, 10%); }
+
+.label-info             { background-color: $infoText; }
+.label-info:hover       { background-color: darken($infoText, 10%); }

data/vendor/assets/stylesheets/twitter/bootstrap/mixins.scss

@@ -19,7 +19,7 @@
 
 .tab-focus {
   // Default
-  outline: thin dotted;
+  outline: thin dotted #333;
   // Webkit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
@@ -76,6 +76,15 @@
   }
 }
 
+// Text overflow
+// -------------------------
+// Requires inline-block or block for proper styling
+.text-overflow {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 // Fonts
 // -----------------------------------
 
@@ -184,7 +193,7 @@
     }
 
     @for $i from 1 through 11 {
-      .span#{$i} { @include fluid-columns($fluidGridGutterWidth, $fluidGridColumnWidth, $i); }
+      > .span#{$i} { @include fluid-columns($fluidGridGutterWidth, $fluidGridColumnWidth, $i); }
     }
   }
 }
@@ -206,6 +215,46 @@
   }
 }
 
+// Make a grid
+.make-row {
+  margin-left: $gridGutterWidth * -1;
+  @extend .clearfix;
+}
+
+@mixin makeColumn($column: 1) {
+  float: left;
+  margin-left: $gridGutterWidth;
+  width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ( $columns - 1));
+}
+
+// Mixin for form field states
+@mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
+  // Set the text color
+  > label,
+  .help-block,
+  .help-inline {
+    color: $textColor;
+  }
+  // Style inputs accordingly
+  input,
+  select,
+  textarea {
+    color: $textColor;
+    border-color: $borderColor;
+    &:focus {
+      border-color: darken($borderColor, 10%);
+      @include box-shadow(0 0 6px lighten($borderColor, 20%));
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on,
+  .input-append .add-on {
+    color: $textColor;
+    background-color: $backgroundColor;
+    border-color: $textColor;
+  }
+}
+
 // CSS3 Properties
 // -----------------------------------
 
@@ -254,6 +303,13 @@
        -o-transform: translate($x, $y);
           transform: translate($x, $y);
 }
+@mixin translate3d($x: 0, $y: 0, $z: 0) {
+  -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);
+}
 
 // Background clipping
 @mixin background-clip($clip) {

data/vendor/assets/stylesheets/twitter/bootstrap/modals.scss

@@ -1,6 +1,7 @@
 // MODALS
 // ------
 
+// Recalculate z-index where appropriate
 .modal-open {
   .dropdown-menu {  z-index: $zindexDropdown + $zindexModal; }
   .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
@@ -8,6 +9,7 @@
   .tooltip       {  z-index: $zindexTooltip  + $zindexModal; }
 }
 
+// Background
 .modal-backdrop {
   position: fixed;
   top: 0;
@@ -25,6 +27,7 @@
   @include opacity(80);
 }
 
+// Base modal
 .modal {
   position: fixed;
   top: 50%;
@@ -54,9 +57,16 @@
   // Close icon
   .close { margin-top: 2px; }
 }
+// Body (where all modal content resises)
 .modal-body {
   padding: 15px;
 }
+// Remove bottom margin if need be
+.modal-body .modal-form {
+  margin-bottom: 0;
+}
+
+// Footer (for actions)
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;

data/vendor/assets/stylesheets/twitter/bootstrap/navbar.scss

@@ -81,7 +81,7 @@
     margin-top: 5px; // make buttons vertically centered in navbar
   }
   .btn-group .btn {
-    margin-top: 0;
+    margin-top: 0; // then undo the margin here so we don't accidentally double it
   }
 }
 
@@ -104,6 +104,14 @@
   input[type="radio"] {
     margin-top: 3px;
   }
+  .input-append,
+  .input-prepend {
+    margin-top: 6px;
+    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
+    input {
+      margin-top: 0;
+    }
+  }
 }
 
 // Navbar search
@@ -133,7 +141,7 @@
       background-color: $grayLight;
       background-color: rgba(255,255,255,.5);
     }
-    // Focus states (we use .focused since IE8 and down doesn't support :focus)
+    // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,
     &.focused {
       padding: 5px 10px;
@@ -194,7 +202,7 @@
 }
 // Hover
 .navbar .nav > li > a:hover {
-  background-color: transparent;
+  background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
   color: $navbarLinkColorHover;
   text-decoration: none;
 }
@@ -205,7 +213,6 @@
   color: $navbarLinkColorHover;
   text-decoration: none;
   background-color: $navbarBackground;
-  background-color: rgba(0,0,0,.5);
 }
 
 // Dividers (basically a vertical hr)

data/vendor/assets/stylesheets/twitter/bootstrap/navs.scss

@@ -21,7 +21,21 @@
   background-color: $grayLighter;
 }
 
-
+// Nav headers (for dropdowns and lists)
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: $baseLineHeight;
+  color: $grayLight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  text-transform: uppercase;
+}
+// Space them out when they follow another list item (link)
+.nav li + .nav-header {
+  margin-top: 9px;
+}
 
 // NAV LIST
 // --------
@@ -33,21 +47,12 @@
 }
 .nav-list > li > a,
 .nav-list .nav-header {
-  display: block;
-  padding: 3px 15px;
   margin-left:  -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
-.nav-list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: $baseLineHeight;
-  color: $grayLight;
-  text-transform: uppercase;
-}
-.nav-list > li + .nav-header {
-  margin-top: 9px;
+.nav-list > li > a {
+  padding: 3px 15px;
 }
 .nav-list .active > a,
 .nav-list .active > a:hover {
@@ -249,6 +254,9 @@
 .tabbable {
   @include clearfix;
 }
+.tab-content {
+  overflow: hidden; // prevent content from running below tabs
+}
 
 // Remove border on bottom, left, right
 .tabs-below .nav-tabs,

data/vendor/assets/stylesheets/twitter/bootstrap/reset.scss

@@ -108,7 +108,7 @@ input[type="button"],
 input[type="reset"],
 input[type="submit"] {
   cursor: pointer; // Cursors on all buttons applied consistently
-  -webkit-appearance: button; // Style clicable inputs in iOS
+  -webkit-appearance: button; // Style clickable inputs in iOS
 }
 input[type="search"] { // Appearance in Safari/Chrome
   -webkit-appearance: textfield;

data/vendor/assets/stylesheets/twitter/bootstrap/responsive.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.0.0
+ * Bootstrap Responsive v2.0.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -17,8 +17,8 @@
 // -------------------------
 // Required since we compile the responsive stuff separately
 
-@import "variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.less";
+@import "variables.scss"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.scss";
 
 
 // RESPONSIVE CLASSES
@@ -56,7 +56,7 @@
   .uneditable-input {
     display: block;
     width: 100%;
-    height: 28px; /* Make inputs at least the height of their button counterpart */
+    min-height: 28px; /* Make inputs at least the height of their button counterpart */
     /* Makes inputs behave like true block-level elements */
     -webkit-box-sizing: border-box; /* Older Webkit */
        -moz-box-sizing: border-box; /* Older FF */
@@ -123,7 +123,7 @@
 // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
 // --------------------------------------------------
 
-@media (max-width: 768px) {
+@media (max-width: 767px) {
   // GRID & CONTAINERS
   // -----------------
   // Remove width from containers
@@ -154,7 +154,7 @@
 // PORTRAIT TABLET TO DEFAULT DESKTOP
 // ----------------------------------
 
-@media (min-width: 768px) and (max-width: 980px) {
+@media (min-width: 768px) and (max-width: 979px) {
 
   // Fixed grid
   @include generate(12, 42px, 20px);
@@ -171,7 +171,7 @@
 
 // TABLETS AND BELOW
 // -----------------
-@media (max-width: 980px) {
+@media (max-width: 979px) {
 
   // UNFIX THE TOPBAR
   // ----------------
@@ -215,6 +215,10 @@
   .navbar .nav > .divider-vertical {
     display: none;
   }
+  .navbar .nav .nav-header {
+    color: $navbarText;
+    text-shadow: none;
+  }
   // Nav and dropdown links in navbar
   .navbar .nav > li > a,
   .navbar .dropdown-menu a {

data/vendor/assets/stylesheets/twitter/bootstrap/sprites.scss

@@ -9,24 +9,26 @@
 // All icons receive the styles of the <i> tag with a base class
 // of .i and are then given a unique class to add width, height,
 // and background-position. Your resulting HTML will look like
-// <i class="i icon-inbox"></i>.
+// <i class="icon-inbox"></i>.
 
 // For the white version of the  icons, just add the .icon-white class:
-// <i class="i icon-inbox icon-white"></i>
+// <i class="icon-inbox icon-white"></i>
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
+  line-height: 14px;
   vertical-align: text-top;
-  background-image: url(../img/glyphicons-halflings.png);
+  background-image: url($iconSpritePath);
   background-position: 14px 14px;
   background-repeat: no-repeat;
 
   @extend .ie7-restore-right-whitespace;
 }
 .icon-white {
-  background-image: url(../img/glyphicons-halflings-white.png);
+  background-image: url($iconWhiteSpritePath);
 }
 
 .icon-glass              { background-position: 0      0; }

data/vendor/assets/stylesheets/twitter/bootstrap/tables.scss

@@ -24,14 +24,15 @@ table {
     padding: 8px;
     line-height: $baseLineHeight;
     text-align: left;
+    vertical-align: top;
     border-top: 1px solid #ddd;
   }
   th {
     font-weight: bold;
-    vertical-align: bottom;
   }
-  td {
-    vertical-align: top;
+  // Bottom align for column headings
+  thead th {
+    vertical-align: bottom;
   }
   thead:first-child tr th,
   thead:first-child tr td {
@@ -106,6 +107,16 @@ table {
   }
 }
 
+// HOVER EFFECT
+// ------------
+// Placed here since it has to come after the potential zebra striping
+.table {
+  tbody tr:hover td,
+  tbody tr:hover th {
+    background-color: #f5f5f5;
+  }
+}
+
 // TABLE CELL SIZING
 // -----------------
 

data/vendor/assets/stylesheets/twitter/bootstrap/thumbnails.scss

@@ -2,13 +2,13 @@
 // ----------
 
 .thumbnails {
-  margin-left: -20px;
+  margin-left: -$gridGutterWidth;
   list-style: none;
   @include clearfix;
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 $baseLineHeight 20px;
+  margin: 0 0 $baseLineHeight $gridGutterWidth;
 }
 .thumbnail {
   display: block;

data/vendor/assets/stylesheets/twitter/bootstrap/type.scss

@@ -108,7 +108,8 @@ ol {
 li {
   line-height: $baseLineHeight;
 }
-ul.unstyled {
+ul.unstyled,
+ol.unstyled {
   list-style: none;
   margin-left: 0;
 }
@@ -134,7 +135,7 @@ dl {
 hr {
   margin: $baseLineHeight 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid $hrBorder;
   border-bottom: 1px solid $white;
 }
 

data/vendor/assets/stylesheets/twitter/bootstrap/variables.scss

@@ -25,51 +25,75 @@ $orange: #f89406;
 $pink: #c3325f;
 $purple: #7a43b6;
 
-// Baseline grid
+// Typography
 $baseFontSize: 13px;
 $baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
 $baseLineHeight: 18px;
 $textColor: $grayDark;
 
+// Buttons
 $primaryButtonBackground: $linkColor;
 
-$zindexDropdown: 1000;
-$zindexPopover: 1010;
-$zindexTooltip: 1020;
-$zindexFixedNavbar: 1030;
-$zindexModalBackdrop: 1040;
-$zindexModal: 1050;
+// COMPONENT VARIABLES
+// --------------------------------------------------
 
-$placeholderText: $grayLight;
+// Z-index master list
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+$zindexDropdown:        1000;
+$zindexPopover:         1010;
+$zindexTooltip:         1020;
+$zindexFixedNavbar:     1030;
+$zindexModalBackdrop:   1040;
+$zindexModal:           1050;
 
-$navbarHeight: 40px;
-$navbarBackground: $grayDarker;
-$navbarBackgroundHighlight: $grayDark;
+// Sprite icons path
+$iconSpritePath:        "../img/glyphicons-halflings.png";
+$iconWhiteSpritePath:   "../img/glyphicons-halflings-white.png";
 
-$navbarText: $grayLight;
-$navbarLinkColor: $grayLight;
-$navbarLinkColorHover: $white;
+// Input placeholder text color
+$placeholderText:       $grayLight;
 
-$warningText: #c09853;
-$warningBackground: #fcf8e3;
-$warningBorder: darken(adjust-hue($warningBackground, -10), 3%);
+// Hr border color
+$hrBorder:              $grayLighter;
 
-$errorText: #b94a48;
-$errorBackground: #f2dede;
-$errorBorder: darken(adjust-hue($errorBackground, -10), 3%);
+// Navbar
+$navbarHeight:                40px;
+$navbarBackground:            $grayDarker;
+$navbarBackgroundHighlight:   $grayDark;
+$navbarLinkBackgroundHover:   transparent;
 
-$successText: #468847;
-$successBackground: #dff0d8;
-$successBorder: darken(adjust-hue($successBackground, -10), 5%);
+$navbarText:                  $grayLight;
+$navbarLinkColor:             $grayLight;
+$navbarLinkColorHover:        $white;
 
-$infoText: #3a87ad;
-$infoBackground: #d9edf7;
-$infoBorder: darken(adjust-hue($infoBackground, -10), 7%);
+// Form states and alerts
+$warningText:           #c09853;
+$warningBackground:     #fcf8e3;
+$warningBorder:         darken(adjust-hue($warningBackground, -10), 3%);
 
-$gridColumns: 12;
-$gridColumnWidth: 60px;
-$gridGutterWidth: 20px;
-$gridRowWidth: $gridColumns * $gridColumnWidth + $gridGutterWidth * ($gridColumns - 1);
+$errorText:             #b94a48;
+$errorBackground:       #f2dede;
+$errorBorder:           darken(adjust-hue($errorBackground, -10), 3%);
 
-$fluidGridColumnWidth: 6.383%;
-$fluidGridGutterWidth: 2.128%;
+$successText:           #468847;
+$successBackground:     #dff0d8;
+$successBorder:         darken(adjust-hue($successBackground, -10), 5%);
+
+$infoText:              #3a87ad;
+$infoBackground:        #d9edf7;
+$infoBorder:            darken(adjust-hue($infoBackground, -10), 7%);
+
+
+// GRID
+// ------------------------------
+
+// Default 940px grid
+$gridColumns:           12;
+$gridColumnWidth:       60px;
+$gridGutterWidth:       20px;
+$gridRowWidth:          $gridColumns * $gridColumnWidth + $gridGutterWidth * ($gridColumns - 1);
+
+// Fluid grid
+$fluidGridColumnWidth:  6.382978723%;
+$fluidGridGutterWidth:  2.127659574%;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-twitter-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2158198660 !ruby/object:Gem::Requirement
+  requirement: &70308309789040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2158198660
+  version_requirements: *70308309789040
 description: This gem provides Twitter Bootstrap converted to Sass directly for you
   Rails 3 application.
 email:
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Use Twitter CSS toolkit Bootstrap with Rails and Sass