Skip to content

Commit bcf7dd3

Browse files
mdomdo
committed
Merge pull request twbs#15604 from twbs/ship_v3.3.2
Ship v3.3.2
2 parents ce29def + fa47de7 commit bcf7dd3

32 files changed

+102
-102
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
2424

2525
Four quick start options are available:
2626

27-
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.1.zip).
27+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.2.zip).
2828
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
2929
- Install with [Bower](http://bower.io): `bower install bootstrap`.
3030
- Install with [npm](https://www.npmjs.org): `npm install bootstrap`.

‎_config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ url: http://getbootstrap.com
1414
encoding: UTF-8
1515

1616
# Custom vars
17-
current_version: 3.3.1
17+
current_version: 3.3.2
1818
repo: https://github.com/twbs/bootstrap
1919
sass_repo: https://github.com/twbs/bootstrap-sass
2020

2121
download:
22-
source: https://github.com/twbs/bootstrap/archive/v3.3.1.zip
23-
dist: https://github.com/twbs/bootstrap/releases/download/v3.3.1/bootstrap-3.3.1-dist.zip
24-
sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.1.tar.gz
22+
source: https://github.com/twbs/bootstrap/archive/v3.3.2.zip
23+
dist: https://github.com/twbs/bootstrap/releases/download/v3.3.2/bootstrap-3.3.2-dist.zip
24+
sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.2.tar.gz
2525

2626
blog: http://blog.getbootstrap.com
2727
expo: http://expo.getbootstrap.com
2828

2929
cdn:
30-
css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css
31-
css_theme: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css
32-
js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js
30+
css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css
31+
css_theme: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css
32+
js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap",
33
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
4-
"version": "3.3.1",
4+
"version": "3.3.2",
55
"keywords": [
66
"css",
77
"js",

‎dist/css/bootstrap-theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/bootstrap.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v3.3.1 (http://getbootstrap.com)
2+
* Bootstrap v3.3.2 (http://getbootstrap.com)
33
* Copyright 2011-2015 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
@@ -17,7 +17,7 @@ if (typeof jQuery === 'undefined') {
1717
}(jQuery);
1818

1919
/* ========================================================================
20-
* Bootstrap: transition.js v3.3.1
20+
* Bootstrap: transition.js v3.3.2
2121
* http://getbootstrap.com/javascript/#transitions
2222
* ========================================================================
2323
* Copyright 2011-2015 Twitter, Inc.
@@ -77,7 +77,7 @@ if (typeof jQuery === 'undefined') {
7777
}(jQuery);
7878

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

99-
Alert.VERSION = '3.3.1'
99+
Alert.VERSION = '3.3.2'
100100

101101
Alert.TRANSITION_DURATION = 150
102102

@@ -172,7 +172,7 @@ if (typeof jQuery === 'undefined') {
172172
}(jQuery);
173173

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

195-
Button.VERSION = '3.3.1'
195+
Button.VERSION = '3.3.2'
196196

197197
Button.DEFAULTS = {
198198
loadingText: 'loading...'
@@ -289,7 +289,7 @@ if (typeof jQuery === 'undefined') {
289289
}(jQuery);
290290

291291
/* ========================================================================
292-
* Bootstrap: carousel.js v3.3.1
292+
* Bootstrap: carousel.js v3.3.2
293293
* http://getbootstrap.com/javascript/#carousel
294294
* ========================================================================
295295
* Copyright 2011-2015 Twitter, Inc.
@@ -320,7 +320,7 @@ if (typeof jQuery === 'undefined') {
320320
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
321321
}
322322

323-
Carousel.VERSION = '3.3.1'
323+
Carousel.VERSION = '3.3.2'
324324

325325
Carousel.TRANSITION_DURATION = 600
326326

@@ -527,7 +527,7 @@ if (typeof jQuery === 'undefined') {
527527
}(jQuery);
528528

529529
/* ========================================================================
530-
* Bootstrap: collapse.js v3.3.1
530+
* Bootstrap: collapse.js v3.3.2
531531
* http://getbootstrap.com/javascript/#collapse
532532
* ========================================================================
533533
* Copyright 2011-2015 Twitter, Inc.
@@ -556,7 +556,7 @@ if (typeof jQuery === 'undefined') {
556556
if (this.options.toggle) this.toggle()
557557
}
558558

559-
Collapse.VERSION = '3.3.1'
559+
Collapse.VERSION = '3.3.2'
560560

561561
Collapse.TRANSITION_DURATION = 350
562562

@@ -739,7 +739,7 @@ if (typeof jQuery === 'undefined') {
739739
}(jQuery);
740740

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

762-
Dropdown.VERSION = '3.3.1'
762+
Dropdown.VERSION = '3.3.2'
763763

764764
Dropdown.prototype.toggle = function (e) {
765765
var $this = $(this)
@@ -901,7 +901,7 @@ if (typeof jQuery === 'undefined') {
901901
}(jQuery);
902902

903903
/* ========================================================================
904-
* Bootstrap: modal.js v3.3.1
904+
* Bootstrap: modal.js v3.3.2
905905
* http://getbootstrap.com/javascript/#modals
906906
* ========================================================================
907907
* Copyright 2011-2015 Twitter, Inc.
@@ -932,7 +932,7 @@ if (typeof jQuery === 'undefined') {
932932
}
933933
}
934934

935-
Modal.VERSION = '3.3.1'
935+
Modal.VERSION = '3.3.2'
936936

937937
Modal.TRANSITION_DURATION = 300
938938
Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -1226,7 +1226,7 @@ if (typeof jQuery === 'undefined') {
12261226
}(jQuery);
12271227

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

1255-
Tooltip.VERSION = '3.3.1'
1255+
Tooltip.VERSION = '3.3.2'
12561256

12571257
Tooltip.TRANSITION_DURATION = 150
12581258

@@ -1699,7 +1699,7 @@ if (typeof jQuery === 'undefined') {
16991699
}(jQuery);
17001700

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

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

1722-
Popover.VERSION = '3.3.1'
1722+
Popover.VERSION = '3.3.2'
17231723

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

18151815
/* ========================================================================
1816-
* Bootstrap: scrollspy.js v3.3.1
1816+
* Bootstrap: scrollspy.js v3.3.2
18171817
* http://getbootstrap.com/javascript/#scrollspy
18181818
* ========================================================================
18191819
* Copyright 2011-2015 Twitter, Inc.
@@ -1844,7 +1844,7 @@ if (typeof jQuery === 'undefined') {
18441844
this.process()
18451845
}
18461846

1847-
ScrollSpy.VERSION = '3.3.1'
1847+
ScrollSpy.VERSION = '3.3.2'
18481848

18491849
ScrollSpy.DEFAULTS = {
18501850
offset: 10
@@ -1989,7 +1989,7 @@ if (typeof jQuery === 'undefined') {
19891989
}(jQuery);
19901990

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

2010-
Tab.VERSION = '3.3.1'
2010+
Tab.VERSION = '3.3.2'
20112011

20122012
Tab.TRANSITION_DURATION = 150
20132013

@@ -2143,7 +2143,7 @@ if (typeof jQuery === 'undefined') {
21432143
}(jQuery);
21442144

21452145
/* ========================================================================
2146-
* Bootstrap: affix.js v3.3.1
2146+
* Bootstrap: affix.js v3.3.2
21472147
* http://getbootstrap.com/javascript/#affix
21482148
* ========================================================================
21492149
* Copyright 2011-2015 Twitter, Inc.
@@ -2172,7 +2172,7 @@ if (typeof jQuery === 'undefined') {
21722172
this.checkPosition()
21732173
}
21742174

2175-
Affix.VERSION = '3.3.1'
2175+
Affix.VERSION = '3.3.2'
21762176

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

‎dist/js/bootstrap.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/js/customize.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/js/raw-files.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/js/src/customizer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
window.onload = function () { // wait for load in a dumb way because B-0
1212
'use strict';
1313
var cw = '/*!\n' +
14-
' * Bootstrap v3.3.1 (http://getbootstrap.com)\n' +
14+
' * Bootstrap v3.3.2 (http://getbootstrap.com)\n' +
1515
' * Copyright 2011-' + new Date().getFullYear() + ' Twitter, Inc.\n' +
1616
' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
1717
' */\n\n'

‎docs/dist/css/bootstrap-theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/css/bootstrap-theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/css/bootstrap.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)