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.

Sign up for GitHub

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

v4 alpha 2 #18479

Merged
merged 4 commits into from
Dec 8, 2015
Merged

v4 alpha 2 #18479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d3144e
manually bump versions because npm script wasn't working for me
mdo Dec 8, 2015
ef00fa0
grunt after version bump
mdo Dec 8, 2015
8ce5da3
bump more versions in config
mdo Dec 8, 2015
d1bb763
Merge branch 'v4-dev' into v4a2
mdo Dec 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To get started, check out <http://getbootstrap.com>!

Several quick start options are available:

- [Download the latest release](https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.zip).
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v4.0.0-alpha.2.zip).
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
- Install with [Bower](http://bower.io): `bower install bootstrap`.
- Install with [npm](https://www.npmjs.com): `npm install bootstrap`.
Expand Down
6 changes: 3 additions & 3 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ gems:
- jekyll-sitemap

# Custom vars
current_version: 4.0.0-alpha
current_version: 4.0.0-alpha.2
repo: https://github.com/twbs/bootstrap
slack: https://bootstrap-slack.herokuapp.com

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

blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com
Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions dist/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand All @@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): util.js
* Bootstrap (v4.0.0-alpha.2): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -185,7 +185,7 @@ var Util = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): alert.js
* Bootstrap (v4.0.0-alpha.2): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -371,7 +371,7 @@ var Alert = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): button.js
* Bootstrap (v4.0.0-alpha.2): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -537,7 +537,7 @@ var Button = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): carousel.js
* Bootstrap (v4.0.0-alpha.2): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1009,7 +1009,7 @@ var Carousel = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): collapse.js
* Bootstrap (v4.0.0-alpha.2): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1367,7 +1367,7 @@ var Collapse = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): dropdown.js
* Bootstrap (v4.0.0-alpha.2): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1654,7 +1654,7 @@ var Dropdown = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): modal.js
* Bootstrap (v4.0.0-alpha.2): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -2184,7 +2184,7 @@ var Modal = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): scrollspy.js
* Bootstrap (v4.0.0-alpha.2): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -2498,7 +2498,7 @@ var ScrollSpy = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): tab.js
* Bootstrap (v4.0.0-alpha.2): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -2757,7 +2757,7 @@ var Tab = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): tooltip.js
* Bootstrap (v4.0.0-alpha.2): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -3368,7 +3368,7 @@ var Tooltip = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): popover.js
* Bootstrap (v4.0.0-alpha.2): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/umd/alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): alert.js
* Bootstrap (v4.0.0-alpha.2): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
})(this, function (exports, module) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): button.js
* Bootstrap (v4.0.0-alpha.2): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): carousel.js
* Bootstrap (v4.0.0-alpha.2): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/collapse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): collapse.js
* Bootstrap (v4.0.0-alpha.2): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): dropdown.js
* Bootstrap (v4.0.0-alpha.2): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): modal.js
* Bootstrap (v4.0.0-alpha.2): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): popover.js
* Bootstrap (v4.0.0-alpha.2): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/scrollspy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): scrollspy.js
* Bootstrap (v4.0.0-alpha.2): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): tab.js
* Bootstrap (v4.0.0-alpha.2): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): tooltip.js
* Bootstrap (v4.0.0-alpha.2): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/umd/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
})(this, function (exports, module) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): util.js
* Bootstrap (v4.0.0-alpha.2): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/nav-home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
v{{ site.current_version }}
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions">
<a class="dropdown-item" href="#">v4.0.0-alpha</a>
<a class="dropdown-item" href="#">v4.0.0-alpha.2</a>
<a class="dropdown-item" href="#">v3.3.5</a>
<a class="dropdown-item" href="#">v3.3.4</a>
<a class="dropdown-item" href="#">v3.3.2</a>
Expand Down
2 changes: 1 addition & 1 deletion docs/dist/css/bootstrap.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions docs/dist/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand All @@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): util.js
* Bootstrap (v4.0.0-alpha.2): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -185,7 +185,7 @@ var Util = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): alert.js
* Bootstrap (v4.0.0-alpha.2): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -371,7 +371,7 @@ var Alert = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): button.js
* Bootstrap (v4.0.0-alpha.2): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -537,7 +537,7 @@ var Button = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): carousel.js
* Bootstrap (v4.0.0-alpha.2): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1009,7 +1009,7 @@ var Carousel = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): collapse.js
* Bootstrap (v4.0.0-alpha.2): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1367,7 +1367,7 @@ var Collapse = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): dropdown.js
* Bootstrap (v4.0.0-alpha.2): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -1654,7 +1654,7 @@ var Dropdown = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): modal.js
* Bootstrap (v4.0.0-alpha.2): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -2184,7 +2184,7 @@ var Modal = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): scrollspy.js
* Bootstrap (v4.0.0-alpha.2): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -2498,7 +2498,7 @@ var ScrollSpy = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): tab.js
* Bootstrap (v4.0.0-alpha.2): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -2757,7 +2757,7 @@ var Tab = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): tooltip.js
* Bootstrap (v4.0.0-alpha.2): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -3368,7 +3368,7 @@ var Tooltip = (function ($) {

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): popover.js
* Bootstrap (v4.0.0-alpha.2): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion docs/dist/js/bootstrap.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/dist/js/umd/alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): alert.js
* Bootstrap (v4.0.0-alpha.2): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion docs/dist/js/umd/button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
})(this, function (exports, module) {
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.0.0-alpha): button.js
* Bootstrap (v4.0.0-alpha.2): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
Loading