Skip to content

Commit

Permalink
bump to 3.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-mcdonald committed Jan 19, 2015
1 parent 98818eb commit aa44845
Show file tree
Hide file tree
Showing 22 changed files with 61 additions and 60 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Please see the appropriate guide for your environment of choice:
In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default.

```ruby
gem 'bootstrap-sass', '~> 3.3.1'
gem 'bootstrap-sass', '~> 3.3.2'
gem 'sass-rails', '>= 3.2'
```

Expand Down
48 changes: 24 additions & 24 deletions assets/javascripts/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Bootstrap v3.3.2 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (/~https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand All @@ -17,7 +17,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: transition.js v3.3.1
* Bootstrap: transition.js v3.3.2
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -77,7 +77,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: alert.js v3.3.1
* Bootstrap: alert.js v3.3.2
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -96,7 +96,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close)
}

Alert.VERSION = '3.3.1'
Alert.VERSION = '3.3.2'

Alert.TRANSITION_DURATION = 150

Expand Down Expand Up @@ -172,7 +172,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: button.js v3.3.1
* Bootstrap: button.js v3.3.2
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -192,7 +192,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false
}

Button.VERSION = '3.3.1'
Button.VERSION = '3.3.2'

Button.DEFAULTS = {
loadingText: 'loading...'
Expand Down Expand Up @@ -289,7 +289,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: carousel.js v3.3.1
* Bootstrap: carousel.js v3.3.2
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -320,7 +320,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}

Carousel.VERSION = '3.3.1'
Carousel.VERSION = '3.3.2'

Carousel.TRANSITION_DURATION = 600

Expand Down Expand Up @@ -527,7 +527,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: collapse.js v3.3.1
* Bootstrap: collapse.js v3.3.2
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -556,7 +556,7 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle()
}

Collapse.VERSION = '3.3.1'
Collapse.VERSION = '3.3.2'

Collapse.TRANSITION_DURATION = 350

Expand Down Expand Up @@ -739,7 +739,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: dropdown.js v3.3.1
* Bootstrap: dropdown.js v3.3.2
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -759,7 +759,7 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle)
}

Dropdown.VERSION = '3.3.1'
Dropdown.VERSION = '3.3.2'

Dropdown.prototype.toggle = function (e) {
var $this = $(this)
Expand Down Expand Up @@ -901,7 +901,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: modal.js v3.3.1
* Bootstrap: modal.js v3.3.2
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -932,7 +932,7 @@ if (typeof jQuery === 'undefined') {
}
}

Modal.VERSION = '3.3.1'
Modal.VERSION = '3.3.2'

Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
Expand Down Expand Up @@ -1226,7 +1226,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: tooltip.js v3.3.1
* Bootstrap: tooltip.js v3.3.2
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
Expand All @@ -1252,7 +1252,7 @@ if (typeof jQuery === 'undefined') {
this.init('tooltip', element, options)
}

Tooltip.VERSION = '3.3.1'
Tooltip.VERSION = '3.3.2'

Tooltip.TRANSITION_DURATION = 150

Expand Down Expand Up @@ -1699,7 +1699,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: popover.js v3.3.1
* Bootstrap: popover.js v3.3.2
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -1719,7 +1719,7 @@ if (typeof jQuery === 'undefined') {

if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')

Popover.VERSION = '3.3.1'
Popover.VERSION = '3.3.2'

Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
Expand Down Expand Up @@ -1813,7 +1813,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: scrollspy.js v3.3.1
* Bootstrap: scrollspy.js v3.3.2
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -1844,7 +1844,7 @@ if (typeof jQuery === 'undefined') {
this.process()
}

ScrollSpy.VERSION = '3.3.1'
ScrollSpy.VERSION = '3.3.2'

ScrollSpy.DEFAULTS = {
offset: 10
Expand Down Expand Up @@ -1989,7 +1989,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: tab.js v3.3.1
* Bootstrap: tab.js v3.3.2
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -2007,7 +2007,7 @@ if (typeof jQuery === 'undefined') {
this.element = $(element)
}

Tab.VERSION = '3.3.1'
Tab.VERSION = '3.3.2'

Tab.TRANSITION_DURATION = 150

Expand Down Expand Up @@ -2143,7 +2143,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);

/* ========================================================================
* Bootstrap: affix.js v3.3.1
* Bootstrap: affix.js v3.3.2
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -2172,7 +2172,7 @@ if (typeof jQuery === 'undefined') {
this.checkPosition()
}

Affix.VERSION = '3.3.1'
Affix.VERSION = '3.3.2'

Affix.RESET = 'affix affix-top affix-bottom'

Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/affix.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: affix.js v3.3.1
* Bootstrap: affix.js v3.3.2
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -28,7 +28,7 @@
this.checkPosition()
}

Affix.VERSION = '3.3.1'
Affix.VERSION = '3.3.2'

Affix.RESET = 'affix affix-top affix-bottom'

Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: alert.js v3.3.1
* Bootstrap: alert.js v3.3.2
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close)
}

Alert.VERSION = '3.3.1'
Alert.VERSION = '3.3.2'

Alert.TRANSITION_DURATION = 150

Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/button.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: button.js v3.3.1
* Bootstrap: button.js v3.3.2
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -19,7 +19,7 @@
this.isLoading = false
}

Button.VERSION = '3.3.1'
Button.VERSION = '3.3.2'

Button.DEFAULTS = {
loadingText: 'loading...'
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: carousel.js v3.3.1
* Bootstrap: carousel.js v3.3.2
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}

Carousel.VERSION = '3.3.1'
Carousel.VERSION = '3.3.2'

Carousel.TRANSITION_DURATION = 600

Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/collapse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: collapse.js v3.3.1
* Bootstrap: collapse.js v3.3.2
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -28,7 +28,7 @@
if (this.options.toggle) this.toggle()
}

Collapse.VERSION = '3.3.1'
Collapse.VERSION = '3.3.2'

Collapse.TRANSITION_DURATION = 350

Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: dropdown.js v3.3.1
* Bootstrap: dropdown.js v3.3.2
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -19,7 +19,7 @@
$(element).on('click.bs.dropdown', this.toggle)
}

Dropdown.VERSION = '3.3.1'
Dropdown.VERSION = '3.3.2'

Dropdown.prototype.toggle = function (e) {
var $this = $(this)
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: modal.js v3.3.1
* Bootstrap: modal.js v3.3.2
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -30,7 +30,7 @@
}
}

Modal.VERSION = '3.3.1'
Modal.VERSION = '3.3.2'

Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/popover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: popover.js v3.3.1
* Bootstrap: popover.js v3.3.2
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -19,7 +19,7 @@

if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')

Popover.VERSION = '3.3.1'
Popover.VERSION = '3.3.2'

Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/scrollspy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: scrollspy.js v3.3.1
* Bootstrap: scrollspy.js v3.3.2
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -30,7 +30,7 @@
this.process()
}

ScrollSpy.VERSION = '3.3.1'
ScrollSpy.VERSION = '3.3.2'

ScrollSpy.DEFAULTS = {
offset: 10
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: tab.js v3.3.1
* Bootstrap: tab.js v3.3.2
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -17,7 +17,7 @@
this.element = $(element)
}

Tab.VERSION = '3.3.1'
Tab.VERSION = '3.3.2'

Tab.TRANSITION_DURATION = 150

Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/tooltip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: tooltip.js v3.3.1
* Bootstrap: tooltip.js v3.3.2
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
Expand All @@ -25,7 +25,7 @@
this.init('tooltip', element, options)
}

Tooltip.VERSION = '3.3.1'
Tooltip.VERSION = '3.3.2'

Tooltip.TRANSITION_DURATION = 150

Expand Down
Loading

0 comments on commit aa44845

Please sign in to comment.