Skip to content

Commit 1409cde

Browse files
committed
Bump versions, run grunt
1 parent 9a6b7ab commit 1409cde

29 files changed

+50
-50
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ To get started, check out <http://getbootstrap.com>!
2121

2222
Three quick start options are available:
2323

24-
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip).
24+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.1.0.zip).
2525
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
2626
- Install with [Bower](http://bower.io): `bower install bootstrap`.
2727

_config.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ encoding: UTF-8
1717
exclude: ["vendor"]
1818

1919
# Custom vars
20-
current_version: 3.0.3
20+
current_version: 3.1.0
2121
repo: https://github.com/twbs/bootstrap
2222
sass_repo: https://github.com/twbs/bootstrap-sass
2323

2424
download:
25-
source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip
26-
dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip
27-
sass: https://github.com/twbs/bootstrap-sass/archive/v3.0.3.0.tar.gz
25+
source: https://github.com/twbs/bootstrap/archive/v3.1.0.zip
26+
dist: https://github.com/twbs/bootstrap/releases/download/v3.1.0/bootstrap-3.1.0-dist.zip
27+
sass: https://github.com/twbs/bootstrap-sass/archive/v3.1.0.0.tar.gz
2828

2929
blog: http://blog.getbootstrap.com
3030
expo: http://expo.getbootstrap.com
3131

3232
cdn:
33-
css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css
34-
css_theme: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css
35-
js: //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js
33+
css: //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css
34+
css_theme: //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.min.css
35+
js: //netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap",
3-
"version": "3.0.3",
3+
"version": "3.1.0",
44
"main": [
55
"./dist/css/bootstrap.css",
66
"./dist/js/bootstrap.js",

dist/css/bootstrap-theme.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-theme.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/bootstrap.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*!
2-
* Bootstrap v3.0.3 (http://getbootstrap.com)
2+
* Bootstrap v3.1.0 (http://getbootstrap.com)
33
* Copyright 2011-2014 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
66

77
if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery') }
88

99
/* ========================================================================
10-
* Bootstrap: transition.js v3.0.3
10+
* Bootstrap: transition.js v3.1.0
1111
* http://getbootstrap.com/javascript/#transitions
1212
* ========================================================================
1313
* Copyright 2011-2014 Twitter, Inc.
@@ -56,7 +56,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
5656
}(jQuery);
5757

5858
/* ========================================================================
59-
* Bootstrap: alert.js v3.0.3
59+
* Bootstrap: alert.js v3.1.0
6060
* http://getbootstrap.com/javascript/#alerts
6161
* ========================================================================
6262
* Copyright 2011-2014 Twitter, Inc.
@@ -145,7 +145,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
145145
}(jQuery);
146146

147147
/* ========================================================================
148-
* Bootstrap: button.js v3.0.3
148+
* Bootstrap: button.js v3.1.0
149149
* http://getbootstrap.com/javascript/#buttons
150150
* ========================================================================
151151
* Copyright 2011-2014 Twitter, Inc.
@@ -253,7 +253,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
253253
}(jQuery);
254254

255255
/* ========================================================================
256-
* Bootstrap: carousel.js v3.0.3
256+
* Bootstrap: carousel.js v3.1.0
257257
* http://getbootstrap.com/javascript/#carousel
258258
* ========================================================================
259259
* Copyright 2011-2014 Twitter, Inc.
@@ -459,7 +459,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
459459
}(jQuery);
460460

461461
/* ========================================================================
462-
* Bootstrap: collapse.js v3.0.3
462+
* Bootstrap: collapse.js v3.1.0
463463
* http://getbootstrap.com/javascript/#collapse
464464
* ========================================================================
465465
* Copyright 2011-2014 Twitter, Inc.
@@ -630,7 +630,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
630630
}(jQuery);
631631

632632
/* ========================================================================
633-
* Bootstrap: dropdown.js v3.0.3
633+
* Bootstrap: dropdown.js v3.1.0
634634
* http://getbootstrap.com/javascript/#dropdowns
635635
* ========================================================================
636636
* Copyright 2011-2014 Twitter, Inc.
@@ -778,7 +778,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
778778
}(jQuery);
779779

780780
/* ========================================================================
781-
* Bootstrap: modal.js v3.0.3
781+
* Bootstrap: modal.js v3.1.0
782782
* http://getbootstrap.com/javascript/#modals
783783
* ========================================================================
784784
* Copyright 2011-2014 Twitter, Inc.
@@ -1022,7 +1022,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
10221022
}(jQuery);
10231023

10241024
/* ========================================================================
1025-
* Bootstrap: tooltip.js v3.0.3
1025+
* Bootstrap: tooltip.js v3.1.0
10261026
* http://getbootstrap.com/javascript/#tooltip
10271027
* Inspired by the original jQuery.tipsy by Jason Frame
10281028
* ========================================================================
@@ -1422,7 +1422,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
14221422
}(jQuery);
14231423

14241424
/* ========================================================================
1425-
* Bootstrap: popover.js v3.0.3
1425+
* Bootstrap: popover.js v3.1.0
14261426
* http://getbootstrap.com/javascript/#popovers
14271427
* ========================================================================
14281428
* Copyright 2011-2014 Twitter, Inc.
@@ -1533,7 +1533,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
15331533
}(jQuery);
15341534

15351535
/* ========================================================================
1536-
* Bootstrap: scrollspy.js v3.0.3
1536+
* Bootstrap: scrollspy.js v3.1.0
15371537
* http://getbootstrap.com/javascript/#scrollspy
15381538
* ========================================================================
15391539
* Copyright 2011-2014 Twitter, Inc.
@@ -1687,7 +1687,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
16871687
}(jQuery);
16881688

16891689
/* ========================================================================
1690-
* Bootstrap: tab.js v3.0.3
1690+
* Bootstrap: tab.js v3.1.0
16911691
* http://getbootstrap.com/javascript/#tabs
16921692
* ========================================================================
16931693
* Copyright 2011-2014 Twitter, Inc.
@@ -1813,7 +1813,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery'
18131813
}(jQuery);
18141814

18151815
/* ========================================================================
1816-
* Bootstrap: affix.js v3.0.3
1816+
* Bootstrap: affix.js v3.1.0
18171817
* http://getbootstrap.com/javascript/#affix
18181818
* ========================================================================
18191819
* Copyright 2011-2014 Twitter, Inc.

dist/js/bootstrap.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/customize.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/customizer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
window.onload = function () { // wait for load in a dumb way because B-0
1212
var cw = '/*!\n' +
13-
' * Bootstrap v3.0.3 (http://getbootstrap.com)\n' +
13+
' * Bootstrap v3.1.0 (http://getbootstrap.com)\n' +
1414
' * Copyright 2011-2014 Twitter, Inc.\n' +
1515
' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
1616
' */\n\n';

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

+2-2
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

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/bootstrap.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/js/bootstrap.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/affix.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: affix.js v3.0.3
2+
* Bootstrap: affix.js v3.1.0
33
* http://getbootstrap.com/javascript/#affix
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/alert.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: alert.js v3.0.3
2+
* Bootstrap: alert.js v3.1.0
33
* http://getbootstrap.com/javascript/#alerts
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/button.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: button.js v3.0.3
2+
* Bootstrap: button.js v3.1.0
33
* http://getbootstrap.com/javascript/#buttons
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/carousel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: carousel.js v3.0.3
2+
* Bootstrap: carousel.js v3.1.0
33
* http://getbootstrap.com/javascript/#carousel
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/collapse.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: collapse.js v3.0.3
2+
* Bootstrap: collapse.js v3.1.0
33
* http://getbootstrap.com/javascript/#collapse
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/dropdown.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: dropdown.js v3.0.3
2+
* Bootstrap: dropdown.js v3.1.0
33
* http://getbootstrap.com/javascript/#dropdowns
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/modal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: modal.js v3.0.3
2+
* Bootstrap: modal.js v3.1.0
33
* http://getbootstrap.com/javascript/#modals
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/popover.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: popover.js v3.0.3
2+
* Bootstrap: popover.js v3.1.0
33
* http://getbootstrap.com/javascript/#popovers
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/scrollspy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: scrollspy.js v3.0.3
2+
* Bootstrap: scrollspy.js v3.1.0
33
* http://getbootstrap.com/javascript/#scrollspy
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/tab.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: tab.js v3.0.3
2+
* Bootstrap: tab.js v3.1.0
33
* http://getbootstrap.com/javascript/#tabs
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

js/tooltip.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: tooltip.js v3.0.3
2+
* Bootstrap: tooltip.js v3.1.0
33
* http://getbootstrap.com/javascript/#tooltip
44
* Inspired by the original jQuery.tipsy by Jason Frame
55
* ========================================================================

js/transition.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================================
2-
* Bootstrap: transition.js v3.0.3
2+
* Bootstrap: transition.js v3.1.0
33
* http://getbootstrap.com/javascript/#transitions
44
* ========================================================================
55
* Copyright 2011-2014 Twitter, Inc.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap",
33
"description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
4-
"version": "3.0.3",
4+
"version": "3.1.0",
55
"keywords": [
66
"bootstrap",
77
"css"

test-infra/npm-shrinkwrap.canonical.json

+1-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)