bootstrap-sass-rails 2.0.1.2 → 2.0.2.0

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

@@ -1,7 +1,7 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '2.0.1.2'
+      VERSION = '2.0.2.0'
     end
   end
 end

data/test/cases/usage_css_spec.rb

@@ -37,6 +37,7 @@ class UsageCssSpec < Bootstrap::Sass::Rails::Spec
       app_css.must_include '_accordion.scss'
       app_css.must_include '_carousel.scss'
       app_css.must_include '_hero-unit.scss'
+      app_css.must_include '_badges.scss'
     end
 
     it 'must include basic css afterward' do

data/test/dummy/log/test.log

@@ -1167,3 +1167,79 @@ Compiled twitter/bootstrap.css  (505ms)  (pid 63126)
 Compiled sprockets.css  (512ms)  (pid 63126)
 Compiled twitter/bootstrap.css  (501ms)  (pid 63126)
 Compiled sprockets.css  (509ms)  (pid 63126)
+Compiled application.css  (1139ms)  (pid 9818)
+Compiled application.css  (523ms)  (pid 9818)
+Compiled application.css  (484ms)  (pid 9818)
+Compiled twitter/bootstrap/transition.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/alert.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/button.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/popover.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/tab.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap.js  (94ms)  (pid 9818)
+Compiled application.js  (118ms)  (pid 9818)
+Compiled twitter/bootstrap/transition.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/alert.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/button.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/popover.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/tab.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 9818)
+Compiled twitter/bootstrap.js  (74ms)  (pid 9818)
+Compiled application.js  (80ms)  (pid 9818)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 9818)
+Compiled individual.js  (4ms)  (pid 9818)
+Compiled individual.css  (166ms)  (pid 9818)
+Compiled twitter/bootstrap.css  (565ms)  (pid 9818)
+Compiled sprockets.css  (573ms)  (pid 9818)
+Compiled twitter/bootstrap.css  (542ms)  (pid 9818)
+Compiled sprockets.css  (549ms)  (pid 9818)
+Compiled application.css  (511ms)  (pid 9855)
+Compiled application.css  (491ms)  (pid 9855)
+Compiled application.css  (481ms)  (pid 9855)
+Compiled twitter/bootstrap/transition.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/alert.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/button.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/popover.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/tab.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap.js  (99ms)  (pid 9855)
+Compiled application.js  (105ms)  (pid 9855)
+Compiled twitter/bootstrap/transition.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/alert.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/button.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/popover.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/tab.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 9855)
+Compiled twitter/bootstrap.js  (77ms)  (pid 9855)
+Compiled application.js  (83ms)  (pid 9855)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 9855)
+Compiled individual.js  (4ms)  (pid 9855)
+Compiled individual.css  (120ms)  (pid 9855)
+Compiled twitter/bootstrap.css  (559ms)  (pid 9855)
+Compiled sprockets.css  (567ms)  (pid 9855)
+Compiled twitter/bootstrap.css  (574ms)  (pid 9855)
+Compiled sprockets.css  (581ms)  (pid 9855)

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.1
+ * bootstrap-alert.js v2.0.2
  * 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.0.1
+ * bootstrap-button.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -91,7 +91,9 @@
 
   $(function () {
     $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      $(e.currentTarget).button('toggle')
+      var $btn = $(e.target)
+      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+      $btn.button('toggle')
     })
   })
 

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.0.1
+ * bootstrap-carousel.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -29,6 +29,9 @@
     this.$element = $(element)
     this.options = $.extend({}, $.fn.carousel.defaults, options)
     this.options.slide && this.slide(this.options.slide)
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
   }
 
   Carousel.prototype = {
@@ -83,14 +86,14 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
-      if (!$next.length) return
-
       this.sliding = true
 
       isCycling && this.pause()
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
+      if ($next.hasClass('active')) return
+
       if (!$.support.transition && this.$element.hasClass('slide')) {
         this.$element.trigger('slide')
         $active.removeClass('active')
@@ -136,6 +139,7 @@
 
   $.fn.carousel.defaults = {
     interval: 5000
+  , pause: 'hover'
   }
 
   $.fn.carousel.Constructor = Carousel

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

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.1
+ * bootstrap-collapse.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -74,7 +74,9 @@
         [dimension](size || 'auto')
         [0].offsetWidth
 
-      this.$element.addClass('collapse')
+      this.$element[size ? 'addClass' : 'removeClass']('collapse')
+
+      return this
     }
 
   , transition: function ( method, startEvent, completeEvent ) {

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.0.1
+ * bootstrap-dropdown.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.0.1
+ * bootstrap-modal.js v2.0.2
  * 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.0.1
+ * bootstrap-popover.js v2.0.2
  * 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.0.1
+ * bootstrap-scrollspy.js v2.0.2
  * 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.0.1
+ * bootstrap-tab.js v2.0.2
  * 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.0.1
+ * bootstrap-tooltip.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
@@ -206,7 +206,7 @@
       title = $e.attr('data-original-title')
         || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
 
-      title = title.toString().replace(/(^\s*|\s*$)/, "")
+      title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
 
       return title
     }

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

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.0.1
+ * bootstrap-transition.js v2.0.2
  * 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.0.1
+ * bootstrap-typeahead.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -40,6 +40,7 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element.val(val)
+      this.$element.change();
       return this.hide()
     }
 
@@ -165,9 +166,6 @@
     }
 
   , keyup: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-
       switch(e.keyCode) {
         case 40: // down arrow
         case 38: // up arrow
@@ -180,6 +178,7 @@
           break
 
         case 27: // escape
+          if (!this.shown) return
           this.hide()
           break
 
@@ -187,10 +186,11 @@
           this.lookup()
       }
 
+      e.stopPropagation()
+      e.preventDefault()
   }
 
   , keypress: function (e) {
-      e.stopPropagation()
       if (!this.shown) return
 
       switch(e.keyCode) {
@@ -210,12 +210,12 @@
           this.next()
           break
       }
+
+      e.stopPropagation()
     }
 
   , blur: function (e) {
       var that = this
-      e.stopPropagation()
-      e.preventDefault()
       setTimeout(function () { that.hide() }, 150)
     }
 

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

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.0.1
+ * Bootstrap v2.0.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -53,6 +53,7 @@
 // Components: Misc
 @import "bootstrap/thumbnails";
 @import "bootstrap/labels";
+@import "bootstrap/badges";
 @import "bootstrap/progress-bars";
 @import "bootstrap/accordion";
 @import "bootstrap/carousel";

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

@@ -9,10 +9,10 @@
   background-color: $warningBackground;
   border: 1px solid $warningBorder;
   @include border-radius(4px);
+  color: $warningText;
 }
-.alert,
 .alert-heading {
-  color: $warningText;
+  color: inherit;
 }
 
 // Adjust close link position
@@ -29,28 +29,17 @@
 .alert-success {
   background-color: $successBackground;
   border-color: $successBorder;  
-}
-.alert-success,
-.alert-success .alert-heading {
   color: $successText;
 }
 .alert-danger,
 .alert-error {
   background-color: $errorBackground;
   border-color: $errorBorder;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
   color: $errorText;
 }
 .alert-info {
   background-color: $infoBackground;
   border-color: $infoBorder;
-}
-.alert-info,
-.alert-info .alert-heading {
   color: $infoText;
 }