bootstrap-sass-rails 2.2.2.1 → 2.3.0.0

data/README.md

@@ -68,6 +68,31 @@ within `.css.scss` files.
   @include myButton(10px);
 }
 ```
+### Responsive styles
+
+Adding the responsive styles included with Twitter Bootstrap to your project is just as easy.
+Depending on the way you chose to include the base bootstrap styles you need to do one of the following:
+
+Importing the responsive partial using the Sass `@import` directive in a `.scss` file:
+
+```scss
+@import 'twitter/bootstrap';
+@import 'twitter/bootstrap/responsive';
+```
+
+Using `=require` to include the responsive partial in a `.css` file (watch the underscore in the partial name!):
+```css
+/*
+ *= require twitter/bootstrap
+ *= require twitter/bootstrap/_responsive
+ */
+```
+
+Using `=require` to include the responsive partial in a `.scss` file (watch the underscore in the partial name!):
+```scss
+#= require twitter/bootstrap
+#= require twitter/bootstrap/_responsive
+```
 
 ### Icon Fonts
 

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

@@ -1,7 +1,7 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '2.2.2.1'
+      VERSION = '2.3.0.0'
     end
   end
 end

data/test/dummy/log/test.log

@@ -3161,145 +3161,3 @@ Compiled individual.css  (253ms)  (pid 95725)
 Compiled no-sprites.css  (784ms)  (pid 95725)
 Compiled twitter/bootstrap.css  (1021ms)  (pid 95725)
 Compiled sprockets.css  (1028ms)  (pid 95725)
-Compiled application.css  (984ms)  (pid 31846)
-Compiled twitter/bootstrap/transition.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/alert.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/button.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/modal.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/popover.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/tab.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap/typeahead.js  (1ms)  (pid 31846)
-Compiled twitter/bootstrap/affix.js  (0ms)  (pid 31846)
-Compiled twitter/bootstrap.js  (92ms)  (pid 31846)
-Compiled application.js  (98ms)  (pid 31846)
-Compiled individual.js  (2ms)  (pid 31846)
-Compiled individual.css  (221ms)  (pid 31846)
-Compiled no-sprites.css  (756ms)  (pid 31846)
-Compiled twitter/bootstrap.css  (922ms)  (pid 31846)
-Compiled sprockets.css  (933ms)  (pid 31846)
-Compiled application.css  (1741ms)  (pid 10941)
-Compiled twitter/bootstrap/transition.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/alert.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/button.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/carousel.js  (12ms)  (pid 10941)
-Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/modal.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/popover.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/tab.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap/affix.js  (0ms)  (pid 10941)
-Compiled twitter/bootstrap.js  (62ms)  (pid 10941)
-Compiled application.js  (68ms)  (pid 10941)
-Compiled individual.js  (2ms)  (pid 10941)
-Compiled individual.css  (330ms)  (pid 10941)
-Compiled no-sprites.css  (758ms)  (pid 10941)
-Compiled twitter/bootstrap.css  (931ms)  (pid 10941)
-Compiled sprockets.css  (952ms)  (pid 10941)
-Compiled application.css  (838ms)  (pid 10998)
-Compiled twitter/bootstrap/transition.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/alert.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/button.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/modal.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/popover.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/tab.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap/affix.js  (0ms)  (pid 10998)
-Compiled twitter/bootstrap.js  (45ms)  (pid 10998)
-Compiled application.js  (50ms)  (pid 10998)
-Compiled individual.js  (2ms)  (pid 10998)
-Compiled individual.css  (227ms)  (pid 10998)
-Compiled no-sprites.css  (742ms)  (pid 10998)
-Compiled twitter/bootstrap.css  (924ms)  (pid 10998)
-Compiled sprockets.css  (930ms)  (pid 10998)
-Compiled application.css  (954ms)  (pid 11243)
-Compiled twitter/bootstrap/transition.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/alert.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/button.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/modal.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/popover.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/tab.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap/affix.js  (0ms)  (pid 11243)
-Compiled twitter/bootstrap.js  (45ms)  (pid 11243)
-Compiled application.js  (52ms)  (pid 11243)
-Compiled individual.js  (2ms)  (pid 11243)
-Compiled individual.css  (233ms)  (pid 11243)
-Compiled no-sprites.css  (747ms)  (pid 11243)
-Compiled twitter/bootstrap.css  (936ms)  (pid 11243)
-Compiled sprockets.css  (942ms)  (pid 11243)
-Compiled application.css  (836ms)  (pid 11300)
-Compiled twitter/bootstrap/transition.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/alert.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/button.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/modal.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/popover.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/tab.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap/affix.js  (0ms)  (pid 11300)
-Compiled twitter/bootstrap.js  (73ms)  (pid 11300)
-Compiled application.js  (78ms)  (pid 11300)
-Compiled individual.js  (3ms)  (pid 11300)
-Compiled individual.css  (229ms)  (pid 11300)
-Compiled no-sprites.css  (752ms)  (pid 11300)
-Compiled twitter/bootstrap.css  (938ms)  (pid 11300)
-Compiled sprockets.css  (944ms)  (pid 11300)
-Compiled twitter/bootstrap/transition.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/alert.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/button.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/modal.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/tooltip.js  (22ms)  (pid 11394)
-Compiled twitter/bootstrap/popover.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/tab.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap/affix.js  (0ms)  (pid 11394)
-Compiled twitter/bootstrap.js  (66ms)  (pid 11394)
-Compiled application.js  (71ms)  (pid 11394)
-Compiled individual.js  (2ms)  (pid 11394)
-Compiled application.css  (1552ms)  (pid 14362)
-Compiled twitter/bootstrap/transition.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/alert.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/button.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/modal.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/popover.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/tab.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap/affix.js  (0ms)  (pid 14362)
-Compiled twitter/bootstrap.js  (48ms)  (pid 14362)
-Compiled application.js  (54ms)  (pid 14362)
-Compiled individual.js  (2ms)  (pid 14362)
-Compiled individual.css  (300ms)  (pid 14362)
-Compiled no-sprites.css  (764ms)  (pid 14362)
-Compiled twitter/bootstrap.css  (926ms)  (pid 14362)
-Compiled sprockets.css  (932ms)  (pid 14362)

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-affix.js v2.2.2
+ * bootstrap-affix.js v2.3.0
  * 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.2.2
+ * bootstrap-alert.js v2.3.0
  * 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.2.2
+ * bootstrap-button.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.2.2
+ * bootstrap-carousel.js v2.3.0
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -28,6 +28,7 @@
 
   var Carousel = function (element, options) {
     this.$element = $(element)
+    this.$indicators = this.$element.find('.carousel-indicators')
     this.options = options
     this.options.pause == 'hover' && this.$element
       .on('mouseenter', $.proxy(this.pause, this))
@@ -38,19 +39,24 @@
 
     cycle: function (e) {
       if (!e) this.paused = false
+      if (this.interval) clearInterval(this.interval);
       this.options.interval
         && !this.paused
         && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
       return this
     }
 
+  , getActiveIndex: function () {
+      this.$active = this.$element.find('.item.active')
+      this.$items = this.$active.parent().children()
+      return this.$items.index(this.$active)
+    }
+
   , to: function (pos) {
-      var $active = this.$element.find('.item.active')
-        , children = $active.parent().children()
-        , activePos = children.index($active)
+      var activeIndex = this.getActiveIndex()
         , that = this
 
-      if (pos > (children.length - 1) || pos < 0) return
+      if (pos > (this.$items.length - 1) || pos < 0) return
 
       if (this.sliding) {
         return this.$element.one('slid', function () {
@@ -58,11 +64,11 @@
         })
       }
 
-      if (activePos == pos) {
+      if (activeIndex == pos) {
         return this.pause().cycle()
       }
 
-      return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
+      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
     }
 
   , pause: function (e) {
@@ -103,10 +109,19 @@
 
       e = $.Event('slide', {
         relatedTarget: $next[0]
+      , direction: direction
       })
 
       if ($next.hasClass('active')) return
 
+      if (this.$indicators.length) {
+        this.$indicators.find('.active').removeClass('active')
+        this.$element.one('slid', function () {
+          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+          $nextIndicator && $nextIndicator.addClass('active')
+        })
+      }
+
       if ($.support.transition && this.$element.hasClass('slide')) {
         this.$element.trigger(e)
         if (e.isDefaultPrevented()) return
@@ -151,7 +166,7 @@
       if (!data) $this.data('carousel', (data = new Carousel(this, options)))
       if (typeof option == 'number') data.to(option)
       else if (action) data[action]()
-      else if (options.interval) data.cycle()
+      else if (options.interval) data.pause().cycle()
     })
   }
 
@@ -174,11 +189,18 @@
  /* CAROUSEL DATA-API
   * ================= */
 
-  $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
+  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
     var $this = $(this), href
       , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
       , options = $.extend({}, $target.data(), $this.data())
+      , slideIndex
+
     $target.carousel(options)
+
+    if (slideIndex = $this.attr('data-slide-to')) {
+      $target.data('carousel').pause().to(slideIndex).cycle()
+    }
+
     e.preventDefault()
   })