Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bootstrap to 2.2.2 (our 2.2.2.0) #270

Merged
merged 3 commits into from Dec 22, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -13,7 +13,7 @@ Enjoy.
In your Gemfile:

gem 'sass-rails', '~> 3.2'
gem 'bootstrap-sass', '~> 2.2.1.1'
gem 'bootstrap-sass', '~> 2.2.2.0'

#### CSS

Expand Down Expand Up @@ -94,7 +94,7 @@ Basically this means you should expect to append a separate patch version to the

### Bundler?

gem 'bootstrap-sass', '~> 2.2.1.1'
gem 'bootstrap-sass', '~> 2.2.2.0'

Don't use the standard `~> 2.x.y`. Your apps may break.

Expand Down
2 changes: 1 addition & 1 deletion bootstrap-sass.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "bootstrap-sass"
s.version = '2.2.1.1'
s.version = '2.2.2.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"
Expand Down
6 changes: 5 additions & 1 deletion update-bootstrap.sh
Expand Up @@ -13,9 +13,13 @@ cp -r $TMP/js/* $ROOT/javascripts
cp -r $TMP/img/* $ROOT/images
# Remove tests
rm -r $ROOT/javascripts/tests
rm -r $ROOT/stylesheets/tests
rm -r $ROOT/stylesheets/bootstrap/tests

# Patch the asset-url in _variables.scss
patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch

# Patch paths in bootstrap.scss and responsive.scss
sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss
rm $ROOT/stylesheets/bootstrap/*.bak

rm -rf $TMP
13 changes: 12 additions & 1 deletion vendor/assets/javascripts/bootstrap-affix.js
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.2.1
* bootstrap-affix.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -68,6 +68,8 @@
/* AFFIX PLUGIN DEFINITION
* ======================= */

var old = $.fn.affix

$.fn.affix = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -85,6 +87,15 @@
}


/* AFFIX NO CONFLICT
* ================= */

$.fn.affix.noConflict = function () {
$.fn.affix = old
return this
}


/* AFFIX DATA-API
* ============== */

Expand Down
13 changes: 12 additions & 1 deletion vendor/assets/javascripts/bootstrap-alert.js
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.2.1
* bootstrap-alert.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -68,6 +68,8 @@
/* ALERT PLUGIN DEFINITION
* ======================= */

var old = $.fn.alert

$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -80,6 +82,15 @@
$.fn.alert.Constructor = Alert


/* ALERT NO CONFLICT
* ================= */

$.fn.alert.noConflict = function () {
$.fn.alert = old
return this
}


/* ALERT DATA-API
* ============== */

Expand Down
13 changes: 12 additions & 1 deletion vendor/assets/javascripts/bootstrap-button.js
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.2.1
* bootstrap-button.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -64,6 +64,8 @@
/* BUTTON PLUGIN DEFINITION
* ======================== */

var old = $.fn.button

$.fn.button = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -82,6 +84,15 @@
$.fn.button.Constructor = Button


/* BUTTON NO CONFLICT
* ================== */

$.fn.button.noConflict = function () {
$.fn.button = old
return this
}


/* BUTTON DATA-API
* =============== */

Expand Down
13 changes: 11 additions & 2 deletions vendor/assets/javascripts/bootstrap-carousel.js
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.2.1
* bootstrap-carousel.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -29,7 +29,6 @@
var Carousel = function (element, options) {
this.$element = $(element)
this.options = options
this.options.slide && this.slide(this.options.slide)
this.options.pause == 'hover' && this.$element
.on('mouseenter', $.proxy(this.pause, this))
.on('mouseleave', $.proxy(this.cycle, this))
Expand Down Expand Up @@ -141,6 +140,8 @@
/* CAROUSEL PLUGIN DEFINITION
* ========================== */

var old = $.fn.carousel

$.fn.carousel = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -162,6 +163,14 @@
$.fn.carousel.Constructor = Carousel


/* CAROUSEL NO CONFLICT
* ==================== */

$.fn.carousel.noConflict = function () {
$.fn.carousel = old
return this
}

/* CAROUSEL DATA-API
* ================= */

Expand Down
19 changes: 15 additions & 4 deletions vendor/assets/javascripts/bootstrap-collapse.js
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.2.1
* bootstrap-collapse.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -120,8 +120,10 @@
}


/* COLLAPSIBLE PLUGIN DEFINITION
* ============================== */
/* COLLAPSE PLUGIN DEFINITION
* ========================== */

var old = $.fn.collapse

$.fn.collapse = function (option) {
return this.each(function () {
Expand All @@ -140,9 +142,18 @@
$.fn.collapse.Constructor = Collapse


/* COLLAPSIBLE DATA-API
/* COLLAPSE NO CONFLICT
* ==================== */

$.fn.collapse.noConflict = function () {
$.fn.collapse = old
return this
}


/* COLLAPSE DATA-API
* ================= */

$(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
var $this = $(this), href
, target = $this.attr('data-target')
Expand Down
19 changes: 16 additions & 3 deletions vendor/assets/javascripts/bootstrap-dropdown.js
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.2.1
* bootstrap-dropdown.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -53,9 +53,10 @@

if (!isActive) {
$parent.toggleClass('open')
$this.focus()
}

$this.focus()

return false
}

Expand All @@ -82,7 +83,7 @@

if (!isActive || (isActive && e.keyCode == 27)) return $this.click()

$items = $('[role=menu] li:not(.divider) a', $parent)
$items = $('[role=menu] li:not(.divider):visible a', $parent)

if (!$items.length) return

Expand Down Expand Up @@ -124,6 +125,8 @@
/* DROPDOWN PLUGIN DEFINITION
* ========================== */

var old = $.fn.dropdown

$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -136,12 +139,22 @@
$.fn.dropdown.Constructor = Dropdown


/* DROPDOWN NO CONFLICT
* ==================== */

$.fn.dropdown.noConflict = function () {
$.fn.dropdown = old
return this
}


/* APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */

$(document)
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

Expand Down
13 changes: 12 additions & 1 deletion vendor/assets/javascripts/bootstrap-modal.js
@@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.2.1
* bootstrap-modal.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -193,6 +193,8 @@
/* MODAL PLUGIN DEFINITION
* ======================= */

var old = $.fn.modal

$.fn.modal = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -213,6 +215,15 @@
$.fn.modal.Constructor = Modal


/* MODAL NO CONFLICT
* ================= */

$.fn.modal.noConflict = function () {
$.fn.modal = old
return this
}


/* MODAL DATA-API
* ============== */

Expand Down
17 changes: 14 additions & 3 deletions vendor/assets/javascripts/bootstrap-popover.js
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.2.1
* bootstrap-popover.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -44,7 +44,7 @@
, content = this.getContent()

$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
$tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content)
$tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)

$tip.removeClass('fade top bottom left right in')
}
Expand Down Expand Up @@ -81,6 +81,8 @@
/* POPOVER PLUGIN DEFINITION
* ======================= */

var old = $.fn.popover

$.fn.popover = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -97,7 +99,16 @@
placement: 'right'
, trigger: 'click'
, content: ''
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'
})


/* POPOVER NO CONFLICT
* =================== */

$.fn.popover.noConflict = function () {
$.fn.popover = old
return this
}

}(window.jQuery);
15 changes: 13 additions & 2 deletions vendor/assets/javascripts/bootstrap-scrollspy.js
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.2.1
* bootstrap-scrollspy.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -59,7 +59,7 @@
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& $href.length
&& [[ $href.position().top, href ]] ) || null
&& [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
Expand Down Expand Up @@ -121,6 +121,8 @@
/* SCROLLSPY PLUGIN DEFINITION
* =========================== */

var old = $.fn.scrollspy

$.fn.scrollspy = function (option) {
return this.each(function () {
var $this = $(this)
Expand All @@ -138,6 +140,15 @@
}


/* SCROLLSPY NO CONFLICT
* ===================== */

$.fn.scrollspy.noConflict = function () {
$.fn.scrollspy = old
return this
}


/* SCROLLSPY DATA-API
* ================== */

Expand Down