kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

bump version to v3.3.1

Browse source
This commit is contained in:
Gleb Mazovetskiy 2014-11-12 18:18:30 +01:00
parent f0fc412cf3
commit 93f42bc913
19 changed files with 57 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,5 +1,10 @@
# Changelog
## 3.3.1.0
* Variables override template at templates/project/_bootstrap-variables.sass
* Readme: Bower + Rails configuration
## 3.3.0.1
* Fix loading issue with the ruby gem version

2
README.md
View file

@ -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.0'
gem 'bootstrap-sass', '~> 3.3.1'
gem 'sass-rails', '>= 3.2'
```

46
assets/javascripts/bootstrap.js vendored
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: affix.js v3.3.0
* Bootstrap: affix.js v3.3.1
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -28,7 +28,7 @@
this.checkPosition()
}
Affix.VERSION = '3.3.0'
Affix.VERSION = '3.3.1'
Affix.RESET = 'affix affix-top affix-bottom'
@ -162,7 +162,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: alert.js v3.3.0
* Bootstrap: alert.js v3.3.1
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -181,7 +181,7 @@
$(el).on('click', dismiss, this.close)
}
Alert.VERSION = '3.3.0'
Alert.VERSION = '3.3.1'
Alert.TRANSITION_DURATION = 150
@ -257,7 +257,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: button.js v3.3.0
* Bootstrap: button.js v3.3.1
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -277,7 +277,7 @@
this.isLoading = false
}
Button.VERSION = '3.3.0'
Button.VERSION = '3.3.1'
Button.DEFAULTS = {
loadingText: 'loading...'
@ -374,7 +374,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: carousel.js v3.3.0
* Bootstrap: carousel.js v3.3.1
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -405,7 +405,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
Carousel.VERSION = '3.3.0'
Carousel.VERSION = '3.3.1'
Carousel.TRANSITION_DURATION = 600
@ -615,7 +615,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: collapse.js v3.3.0
* Bootstrap: collapse.js v3.3.1
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -644,7 +644,7 @@
if (this.options.toggle) this.toggle()
}
Collapse.VERSION = '3.3.0'
Collapse.VERSION = '3.3.1'
Collapse.TRANSITION_DURATION = 350
@ -827,7 +827,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: dropdown.js v3.3.0
* Bootstrap: dropdown.js v3.3.1
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -847,7 +847,7 @@
$(element).on('click.bs.dropdown', this.toggle)
}
Dropdown.VERSION = '3.3.0'
Dropdown.VERSION = '3.3.1'
Dropdown.prototype.toggle = function (e) {
var $this = $(this)
@ -989,7 +989,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: tab.js v3.3.0
* Bootstrap: tab.js v3.3.1
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -1007,7 +1007,7 @@
this.element = $(element)
}
Tab.VERSION = '3.3.0'
Tab.VERSION = '3.3.1'
Tab.TRANSITION_DURATION = 150
@ -1143,7 +1143,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: transition.js v3.3.0
* Bootstrap: transition.js v3.3.1
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -1203,7 +1203,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: scrollspy.js v3.3.0
* Bootstrap: scrollspy.js v3.3.1
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -1234,7 +1234,7 @@
this.process()
}
ScrollSpy.VERSION = '3.3.0'
ScrollSpy.VERSION = '3.3.1'
ScrollSpy.DEFAULTS = {
offset: 10
@ -1379,7 +1379,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: modal.js v3.3.0
* Bootstrap: modal.js v3.3.1
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -1410,7 +1410,7 @@
}
}
Modal.VERSION = '3.3.0'
Modal.VERSION = '3.3.1'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
@ -1704,7 +1704,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: tooltip.js v3.3.0
* Bootstrap: tooltip.js v3.3.1
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@ -1730,7 +1730,7 @@
this.init('tooltip', element, options)
}
Tooltip.VERSION = '3.3.0'
Tooltip.VERSION = '3.3.1'
Tooltip.TRANSITION_DURATION = 150
@ -2183,7 +2183,7 @@
}(jQuery);
/* ========================================================================
* Bootstrap: popover.js v3.3.0
* Bootstrap: popover.js v3.3.1
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -2203,7 +2203,7 @@
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.0'
Popover.VERSION = '3.3.1'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',

4
assets/javascripts/bootstrap/affix.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: affix.js v3.3.0
* Bootstrap: affix.js v3.3.1
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -28,7 +28,7 @@
this.checkPosition()
}
Affix.VERSION = '3.3.0'
Affix.VERSION = '3.3.1'
Affix.RESET = 'affix affix-top affix-bottom'

4
assets/javascripts/bootstrap/alert.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: alert.js v3.3.0
* Bootstrap: alert.js v3.3.1
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close)
}
Alert.VERSION = '3.3.0'
Alert.VERSION = '3.3.1'
Alert.TRANSITION_DURATION = 150

4
assets/javascripts/bootstrap/button.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: button.js v3.3.0
* Bootstrap: button.js v3.3.1
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -19,7 +19,7 @@
this.isLoading = false
}
Button.VERSION = '3.3.0'
Button.VERSION = '3.3.1'
Button.DEFAULTS = {
loadingText: 'loading...'

4
assets/javascripts/bootstrap/carousel.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: carousel.js v3.3.0
* Bootstrap: carousel.js v3.3.1
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
Carousel.VERSION = '3.3.0'
Carousel.VERSION = '3.3.1'
Carousel.TRANSITION_DURATION = 600

4
assets/javascripts/bootstrap/collapse.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: collapse.js v3.3.0
* Bootstrap: collapse.js v3.3.1
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -28,7 +28,7 @@
if (this.options.toggle) this.toggle()
}
Collapse.VERSION = '3.3.0'
Collapse.VERSION = '3.3.1'
Collapse.TRANSITION_DURATION = 350

4
assets/javascripts/bootstrap/dropdown.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: dropdown.js v3.3.0
* Bootstrap: dropdown.js v3.3.1
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -19,7 +19,7 @@
$(element).on('click.bs.dropdown', this.toggle)
}
Dropdown.VERSION = '3.3.0'
Dropdown.VERSION = '3.3.1'
Dropdown.prototype.toggle = function (e) {
var $this = $(this)

4
assets/javascripts/bootstrap/modal.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: modal.js v3.3.0
* Bootstrap: modal.js v3.3.1
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -30,7 +30,7 @@
}
}
Modal.VERSION = '3.3.0'
Modal.VERSION = '3.3.1'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150

4
assets/javascripts/bootstrap/popover.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: popover.js v3.3.0
* Bootstrap: popover.js v3.3.1
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -19,7 +19,7 @@
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.0'
Popover.VERSION = '3.3.1'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',

4
assets/javascripts/bootstrap/scrollspy.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: scrollspy.js v3.3.0
* Bootstrap: scrollspy.js v3.3.1
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -30,7 +30,7 @@
this.process()
}
ScrollSpy.VERSION = '3.3.0'
ScrollSpy.VERSION = '3.3.1'
ScrollSpy.DEFAULTS = {
offset: 10

4
assets/javascripts/bootstrap/tab.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: tab.js v3.3.0
* Bootstrap: tab.js v3.3.1
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.
@ -17,7 +17,7 @@
this.element = $(element)
}
Tab.VERSION = '3.3.0'
Tab.VERSION = '3.3.1'
Tab.TRANSITION_DURATION = 150

4
assets/javascripts/bootstrap/tooltip.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: tooltip.js v3.3.0
* Bootstrap: tooltip.js v3.3.1
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@ -25,7 +25,7 @@
this.init('tooltip', element, options)
}
Tooltip.VERSION = '3.3.0'
Tooltip.VERSION = '3.3.1'
Tooltip.TRANSITION_DURATION = 150

2
assets/javascripts/bootstrap/transition.js
View file

@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: transition.js v3.3.0
* Bootstrap: transition.js v3.3.1
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2014 Twitter, Inc.

2
bower.json
View file

@ -1,6 +1,6 @@
{
"name": "bootstrap-sass",
"version": "3.3.0",
"version": "3.3.1",
"homepage": "https://github.com/twbs/bootstrap-sass",
"authors": [
"Thomas McDonald",

4
lib/bootstrap-sass/version.rb
View file

@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.3.0.1'
BOOTSTRAP_SHA = '07c1881bc27eacba74f4d975ca3428a24abd4940'
VERSION = '3.3.1.0'
BOOTSTRAP_SHA = '9a7e365c2c4360335d25246dac11afb1f577210a'
end

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "bootstrap-sass",
"version": "3.3.0",
"version": "3.3.1",
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
"main": "index.js",
"repository": {

2
templates/project/_bootstrap-variables.sass
View file

@ -1,4 +1,4 @@
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.0.1):
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.1.0):
// When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
// When there no function is defined, `fn('')` is parsed as string that equals the right hand side