Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: yabawock/bootstrap-sass-rails
base: 0045ad410b
...
head fork: yabawock/bootstrap-sass-rails
compare: 80cba62d19
  • 3 commits
  • 17 files changed
  • 0 commit comments
  • 1 contributor
2  lib/bootstrap/sass/rails/version.rb
View
@@ -1,7 +1,7 @@
module Bootstrap
module Sass
module Rails
- VERSION = '2.3.0.0'
+ VERSION = '2.3.1.0'
end
end
end
2  vendor/assets/javascripts/twitter/bootstrap/affix.js
View
@@ -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/twitter/bootstrap/alert.js
View
@@ -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/twitter/bootstrap/button.js
View
@@ -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/twitter/bootstrap/carousel.js
View
@@ -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/twitter/bootstrap/collapse.js
View
@@ -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/twitter/bootstrap/dropdown.js
View
@@ -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/twitter/bootstrap/modal.js
View
@@ -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/twitter/bootstrap/popover.js
View
@@ -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/twitter/bootstrap/scrollspy.js
View
@@ -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/twitter/bootstrap/tab.js
View
@@ -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/twitter/bootstrap/tooltip.js
View
@@ -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/twitter/bootstrap/transition.js
View
@@ -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/twitter/bootstrap/typeahead.js
View
@@ -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/twitter/bootstrap-no-sprites.css.scss
View
@@ -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/twitter/bootstrap.css.scss
View
@@ -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/twitter/bootstrap/_responsive.scss
View
@@ -1,6 +1,6 @@
/* Partial: twitter/bootstrap/_responsive.scss */
/*!
- * Bootstrap Responsive v2.3.0
+ * Bootstrap Responsive v2.3.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0

No commit comments for this range

Something went wrong with that request. Please try again.