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

Upgrade to 2.3.1 from official upstream.

Browse source 
Overrides thomas-mcdonald/bootstrap-sass#307, thomas-mcdonald/bootstrap-sass#306
This commit is contained in:
Tristan Harward 2013-03-12 13:22:07 -04:00
parent 993dcf0ccf
commit 4884e9a217
17 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -14,7 +14,7 @@ In your Gemfile:
```ruby
gem 'sass-rails', '~> 3.2'
gem 'bootstrap-sass', '~> 2.3.0.1'
gem 'bootstrap-sass', '~> 2.3.1.0'
```
#### CSS
@ -115,7 +115,7 @@ Basically this means you should expect to append a separate patch version to the
### Bundler?
```ruby
gem 'bootstrap-sass', '~> 2.3.0.1'
gem 'bootstrap-sass', '~> 2.3.1.0'
```
Don't use the standard `~> 2.x.y`. Your apps may break.

2
bootstrap-sass.gemspec
View file

@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "bootstrap-sass"
s.version = '2.3.0.1'
s.version = '2.3.1.0'
s.authors = ["Thomas McDonald"]
s.email = 'tom@conceptcoding.co.uk'
s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"

2
vendor/assets/javascripts/bootstrap-affix.js vendored
View file

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.3.0
* bootstrap-affix.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-alert.js vendored
View file

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.3.0
* bootstrap-alert.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-button.js vendored
View file

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.3.0
* bootstrap-button.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.

4
vendor/assets/javascripts/bootstrap-carousel.js vendored
View file

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.3.0
* bootstrap-carousel.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@ -75,7 +75,7 @@
if (!e) this.paused = true
if (this.$element.find('.next, .prev').length && $.support.transition.end) {
this.$element.trigger($.support.transition.end)
this.cycle()
this.cycle(true)
}
clearInterval(this.interval)
this.interval = null

2
vendor/assets/javascripts/bootstrap-collapse.js vendored
View file

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.3.0
* bootstrap-collapse.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.

4
vendor/assets/javascripts/bootstrap-dropdown.js vendored
View file

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.3.0
* bootstrap-dropdown.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@ -158,7 +158,7 @@
$(document)
.on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

4
vendor/assets/javascripts/bootstrap-modal.js vendored
View file

@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.3.0
* bootstrap-modal.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@ -148,7 +148,7 @@
}
, removeBackdrop: function () {
this.$backdrop.remove()
this.$backdrop && this.$backdrop.remove()
this.$backdrop = null
}

2
vendor/assets/javascripts/bootstrap-popover.js vendored
View file

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.3.0
* bootstrap-popover.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-scrollspy.js vendored
View file

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.3.0
* bootstrap-scrollspy.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-tab.js vendored
View file

@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.3.0
* bootstrap-tab.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.

12
vendor/assets/javascripts/bootstrap-tooltip.js vendored
View file

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.3.0
* bootstrap-tooltip.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@ -80,7 +80,15 @@
}
, enter: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
var defaults = $.fn[this.type].defaults
, options = {}
, self
this._options && $.each(this._options, function (key, value) {
if (defaults[key] != value) options[key] = value
}, this)
self = $(e.currentTarget)[this.type](options).data(this.type)
if (!self.options.delay || !self.options.delay.show) return self.show()

2
vendor/assets/javascripts/bootstrap-transition.js vendored
View file

@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.3.0
* bootstrap-transition.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-typeahead.js vendored
View file

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.3.0
* bootstrap-typeahead.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/stylesheets/bootstrap/bootstrap.scss vendored
View file

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

2
vendor/assets/stylesheets/bootstrap/responsive.scss vendored
View file

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