Permalink
Browse files

Merge pull request #18479 from twbs/v4a2

v4 alpha 2
  • Loading branch information...
2 parents 7f595a3 + d1bb763 commit 48938155eb24b4ccdde09426066869504c6dab3c @mdo mdo committed Dec 8, 2015
Showing with 92 additions and 92 deletions.
  1. +1 −1 README.md
  2. +3 −3 _config.yml
  3. +1 −1 dist/css/bootstrap.css
  4. +1 −1 dist/css/bootstrap.min.css
  5. +12 −12 dist/js/bootstrap.js
  6. +1 −1 dist/js/bootstrap.min.js
  7. +1 −1 dist/js/umd/alert.js
  8. +1 −1 dist/js/umd/button.js
  9. +1 −1 dist/js/umd/carousel.js
  10. +1 −1 dist/js/umd/collapse.js
  11. +1 −1 dist/js/umd/dropdown.js
  12. +1 −1 dist/js/umd/modal.js
  13. +1 −1 dist/js/umd/popover.js
  14. +1 −1 dist/js/umd/scrollspy.js
  15. +1 −1 dist/js/umd/tab.js
  16. +1 −1 dist/js/umd/tooltip.js
  17. +1 −1 dist/js/umd/util.js
  18. +1 −1 docs/_includes/nav-home.html
  19. +1 −1 docs/dist/css/bootstrap.css
  20. +1 −1 docs/dist/css/bootstrap.min.css
  21. +12 −12 docs/dist/js/bootstrap.js
  22. +1 −1 docs/dist/js/bootstrap.min.js
  23. +1 −1 docs/dist/js/umd/alert.js
  24. +1 −1 docs/dist/js/umd/button.js
  25. +1 −1 docs/dist/js/umd/carousel.js
  26. +1 −1 docs/dist/js/umd/collapse.js
  27. +1 −1 docs/dist/js/umd/dropdown.js
  28. +1 −1 docs/dist/js/umd/modal.js
  29. +1 −1 docs/dist/js/umd/popover.js
  30. +1 −1 docs/dist/js/umd/scrollspy.js
  31. +1 −1 docs/dist/js/umd/tab.js
  32. +1 −1 docs/dist/js/umd/tooltip.js
  33. +1 −1 docs/dist/js/umd/util.js
  34. +1 −1 js/dist/alert.js
  35. +1 −1 js/dist/alert.js.map
  36. +1 −1 js/dist/button.js
  37. +1 −1 js/dist/button.js.map
  38. +1 −1 js/dist/carousel.js
  39. +1 −1 js/dist/carousel.js.map
  40. +1 −1 js/dist/collapse.js
  41. +1 −1 js/dist/collapse.js.map
  42. +1 −1 js/dist/dropdown.js
  43. +1 −1 js/dist/dropdown.js.map
  44. +1 −1 js/dist/modal.js
  45. +1 −1 js/dist/modal.js.map
  46. +1 −1 js/dist/popover.js
  47. +1 −1 js/dist/popover.js.map
  48. +1 −1 js/dist/scrollspy.js
  49. +1 −1 js/dist/scrollspy.js.map
  50. +1 −1 js/dist/tab.js
  51. +1 −1 js/dist/tab.js.map
  52. +1 −1 js/dist/tooltip.js
  53. +1 −1 js/dist/tooltip.js.map
  54. +1 −1 js/dist/util.js
  55. +1 −1 js/dist/util.js.map
  56. +1 −1 js/src/alert.js
  57. +1 −1 js/src/button.js
  58. +1 −1 js/src/carousel.js
  59. +1 −1 js/src/collapse.js
  60. +1 −1 js/src/dropdown.js
  61. +1 −1 js/src/modal.js
  62. +1 −1 js/src/popover.js
  63. +1 −1 js/src/scrollspy.js
  64. +1 −1 js/src/tab.js
  65. +1 −1 js/src/tooltip.js
  66. +1 −1 js/src/util.js
  67. +1 −1 package.json
  68. +1 −1 scss/bootstrap.scss
View
@@ -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`.
View
@@ -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
@@ -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)
*/
Oops, something went wrong.
View
@@ -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)
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
View
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
View
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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>
@@ -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)
*/
Oops, something went wrong.
@@ -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)
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
*/
@@ -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)
* --------------------------------------------------------------------------
*/
@@ -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)
* --------------------------------------------------------------------------
*/
Oops, something went wrong.

0 comments on commit 4893815

Please sign in to comment.