Skip to content

Commit 4893815

Browse files
mdomdo
committed
Merge pull request twbs#18479 from twbs/v4a2
v4 alpha 2
2 parents 7f595a3 + d1bb763 commit 4893815

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+92
-92
lines changed

‎README.md‎

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

2828
Several quick start options are available:
2929

30-
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.zip).
30+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.2.zip).
3131
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
3232
- Install with [Bower](http://bower.io): `bower install bootstrap`.
3333
- Install with [npm](https://www.npmjs.com): `npm install bootstrap`.

‎_config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ gems:
2323
- jekyll-sitemap
2424

2525
# Custom vars
26-
current_version: 4.0.0-alpha
26+
current_version: 4.0.0-alpha.2
2727
repo: https://github.com/twbs/bootstrap
2828
slack: https://bootstrap-slack.herokuapp.com
2929

3030
download:
31-
source: https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.zip
32-
dist: https://github.com/twbs/bootstrap/releases/download/v4.0.0-alpha/bootstrap-4.0.0-alpha-dist.zip
31+
source: https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.2.zip
32+
dist: https://github.com/twbs/bootstrap/releases/download/v4.0.0-alpha.2/bootstrap-4.0.0-alpha.2-dist.zip
3333

3434
blog: http://blog.getbootstrap.com
3535
expo: http://expo.getbootstrap.com

‎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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
2+
* Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
33
* Copyright 2011-2015 Twitter, Inc.
44
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
55
*/
@@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') {
2020

2121
/**
2222
* --------------------------------------------------------------------------
23-
* Bootstrap (v4.0.0-alpha): util.js
23+
* Bootstrap (v4.0.0-alpha.2): util.js
2424
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2525
* --------------------------------------------------------------------------
2626
*/
@@ -185,7 +185,7 @@ var Util = (function ($) {
185185

186186
/**
187187
* --------------------------------------------------------------------------
188-
* Bootstrap (v4.0.0-alpha): alert.js
188+
* Bootstrap (v4.0.0-alpha.2): alert.js
189189
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
190190
* --------------------------------------------------------------------------
191191
*/
@@ -371,7 +371,7 @@ var Alert = (function ($) {
371371

372372
/**
373373
* --------------------------------------------------------------------------
374-
* Bootstrap (v4.0.0-alpha): button.js
374+
* Bootstrap (v4.0.0-alpha.2): button.js
375375
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
376376
* --------------------------------------------------------------------------
377377
*/
@@ -537,7 +537,7 @@ var Button = (function ($) {
537537

538538
/**
539539
* --------------------------------------------------------------------------
540-
* Bootstrap (v4.0.0-alpha): carousel.js
540+
* Bootstrap (v4.0.0-alpha.2): carousel.js
541541
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
542542
* --------------------------------------------------------------------------
543543
*/
@@ -1009,7 +1009,7 @@ var Carousel = (function ($) {
10091009

10101010
/**
10111011
* --------------------------------------------------------------------------
1012-
* Bootstrap (v4.0.0-alpha): collapse.js
1012+
* Bootstrap (v4.0.0-alpha.2): collapse.js
10131013
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
10141014
* --------------------------------------------------------------------------
10151015
*/
@@ -1367,7 +1367,7 @@ var Collapse = (function ($) {
13671367

13681368
/**
13691369
* --------------------------------------------------------------------------
1370-
* Bootstrap (v4.0.0-alpha): dropdown.js
1370+
* Bootstrap (v4.0.0-alpha.2): dropdown.js
13711371
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
13721372
* --------------------------------------------------------------------------
13731373
*/
@@ -1654,7 +1654,7 @@ var Dropdown = (function ($) {
16541654

16551655
/**
16561656
* --------------------------------------------------------------------------
1657-
* Bootstrap (v4.0.0-alpha): modal.js
1657+
* Bootstrap (v4.0.0-alpha.2): modal.js
16581658
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
16591659
* --------------------------------------------------------------------------
16601660
*/
@@ -2184,7 +2184,7 @@ var Modal = (function ($) {
21842184

21852185
/**
21862186
* --------------------------------------------------------------------------
2187-
* Bootstrap (v4.0.0-alpha): scrollspy.js
2187+
* Bootstrap (v4.0.0-alpha.2): scrollspy.js
21882188
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
21892189
* --------------------------------------------------------------------------
21902190
*/
@@ -2498,7 +2498,7 @@ var ScrollSpy = (function ($) {
24982498

24992499
/**
25002500
* --------------------------------------------------------------------------
2501-
* Bootstrap (v4.0.0-alpha): tab.js
2501+
* Bootstrap (v4.0.0-alpha.2): tab.js
25022502
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
25032503
* --------------------------------------------------------------------------
25042504
*/
@@ -2757,7 +2757,7 @@ var Tab = (function ($) {
27572757

27582758
/**
27592759
* --------------------------------------------------------------------------
2760-
* Bootstrap (v4.0.0-alpha): tooltip.js
2760+
* Bootstrap (v4.0.0-alpha.2): tooltip.js
27612761
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
27622762
* --------------------------------------------------------------------------
27632763
*/
@@ -3368,7 +3368,7 @@ var Tooltip = (function ($) {
33683368

33693369
/**
33703370
* --------------------------------------------------------------------------
3371-
* Bootstrap (v4.0.0-alpha): popover.js
3371+
* Bootstrap (v4.0.0-alpha.2): popover.js
33723372
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
33733373
* --------------------------------------------------------------------------
33743374
*/

‎dist/js/bootstrap.min.js‎

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/umd/alert.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/**
2525
* --------------------------------------------------------------------------
26-
* Bootstrap (v4.0.0-alpha): alert.js
26+
* Bootstrap (v4.0.0-alpha.2): alert.js
2727
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2828
* --------------------------------------------------------------------------
2929
*/

‎dist/js/umd/button.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
})(this, function (exports, module) {
1414
/**
1515
* --------------------------------------------------------------------------
16-
* Bootstrap (v4.0.0-alpha): button.js
16+
* Bootstrap (v4.0.0-alpha.2): button.js
1717
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
1818
* --------------------------------------------------------------------------
1919
*/

‎dist/js/umd/carousel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/**
2525
* --------------------------------------------------------------------------
26-
* Bootstrap (v4.0.0-alpha): carousel.js
26+
* Bootstrap (v4.0.0-alpha.2): carousel.js
2727
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2828
* --------------------------------------------------------------------------
2929
*/

‎dist/js/umd/collapse.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/**
2525
* --------------------------------------------------------------------------
26-
* Bootstrap (v4.0.0-alpha): collapse.js
26+
* Bootstrap (v4.0.0-alpha.2): collapse.js
2727
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
2828
* --------------------------------------------------------------------------
2929
*/

0 commit comments

Comments
 (0)