diff --git a/Makefile b/Makefile index 9f5116617..1b25f7b32 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ build: @echo "Compiling documentation... ${CHECK} Done" @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js @./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js - @echo "/**\n* Bootstrap.js v2.3.2 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js + @echo "/**\n* Bootstrap.js v2.3.3 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js @echo "Compiling and minifying javascript... ${CHECK} Done" diff --git a/README.md b/README.md index 884432d83..28c9a48c4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bootstrap v2.3.2](http://twbs.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) +# [Bootstrap v2.3.3](http://twbs.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). diff --git a/bower.json b/bower.json index 1fea87990..328268a7f 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "version": "2.3.2", + "version": "2.3.3", "main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"], "dependencies": { "jquery": ">=1.8.0 <2.1.0" diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 09e88ce3f..9e862b46e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.3.2 + * Bootstrap Responsive v2.3.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b725064aa..50440e93c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.3.2 + * Bootstrap v2.3.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/docs/assets/js/bootstrap-affix.js b/docs/assets/js/bootstrap-affix.js index 46cb2fcb8..ff6d29c98 100644 --- a/docs/assets/js/bootstrap-affix.js +++ b/docs/assets/js/bootstrap-affix.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-affix.js v2.3.2 + * bootstrap-affix.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 4f560def4..a7eafc7b2 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-alert.js v2.3.2 + * bootstrap-alert.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index f8b52eb41..421fdbaf7 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-button.js v2.3.2 + * bootstrap-button.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 300b86ed2..d179f480e 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-carousel.js v2.3.2 + * bootstrap-carousel.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 1b6804441..f7d0bc801 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-collapse.js v2.3.2 + * bootstrap-collapse.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index f5e3e31f2..cc491e1ff 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v2.3.2 + * bootstrap-dropdown.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index 1ad9a1640..6a1183a55 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -1,5 +1,5 @@ /* ========================================================= - * bootstrap-modal.js v2.3.2 + * bootstrap-modal.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index 7d0e27747..47eef7eb4 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v2.3.2 + * bootstrap-popover.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index aae25aca9..d48de9f7d 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.3.2 + * bootstrap-scrollspy.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index bb3fc439e..749ff3e2d 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tab.js v2.3.2 + * bootstrap-tab.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index dbbf7d27f..b5968dd59 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-tooltip.js v2.3.2 + * bootstrap-tooltip.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index bf89aac8c..4376133dc 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.3.2 + * bootstrap-transition.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index d45e6ed57..d3f5ee396 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-typeahead.js v2.3.2 + * bootstrap-typeahead.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 5d35ba817..31156f67d 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.3.2 + * bootstrap-transition.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -58,7 +58,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.2 + * bootstrap-alert.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -156,7 +156,7 @@ $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.2 + * bootstrap-button.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -260,7 +260,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.2 + * bootstrap-carousel.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -466,7 +466,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.2 + * bootstrap-collapse.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -632,7 +632,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.2 + * bootstrap-dropdown.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -801,7 +801,7 @@ }(window.jQuery); /* ========================================================= - * bootstrap-modal.js v2.3.2 + * bootstrap-modal.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -1048,7 +1048,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-tooltip.js v2.3.2 + * bootstrap-tooltip.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1409,7 +1409,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-popover.js v2.3.2 + * bootstrap-popover.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1523,7 +1523,7 @@ }(window.jQuery); /* ============================================================= - * bootstrap-scrollspy.js v2.3.2 + * bootstrap-scrollspy.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1684,7 +1684,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.3.2 + * bootstrap-tab.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1827,7 +1827,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.3.2 + * bootstrap-typeahead.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -2162,7 +2162,7 @@ }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.3.2 + * bootstrap-affix.js v2.3.3 * http://twbs.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js index af4eef796..0dae42fba 100644 --- a/docs/assets/js/bootstrap.min.js +++ b/docs/assets/js/bootstrap.min.js @@ -1,5 +1,5 @@ /** -* Bootstrap.js v2.3.2 by @fat & @mdo +* Bootstrap.js v2.3.3 by @fat & @mdo * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ diff --git a/docs/index.html b/docs/index.html index 69498b501..0946d6ea7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -84,7 +84,7 @@

Bootstrap

Sleek, intuitive, and powerful front-end framework for faster and easier web development.

- Download Bootstrap + Download Bootstrap

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 6f45650a7..ac3f8ef2b 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -3,7 +3,7 @@

{{_i}}Bootstrap{{/i}}

{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}

- {{_i}}Download Bootstrap{{/i}} + {{_i}}Download Bootstrap{{/i}}

diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js index f305c2ec3..51c04bd20 100644 --- a/js/bootstrap-affix.js +++ b/js/bootstrap-affix.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-affix.js v2.3.2 + * bootstrap-affix.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#affix * ========================================================== * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 020d2a796..4d7ce8b3e 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-alert.js v2.3.2 + * bootstrap-alert.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#alerts * ========================================================== * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 668948d69..40e294cb4 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-button.js v2.3.2 + * bootstrap-button.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#buttons * ============================================================ * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 6882d6d42..92ee6acef 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-carousel.js v2.3.2 + * bootstrap-carousel.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#carousel * ========================================================== * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 0ee53053d..d58fb9c4e 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-collapse.js v2.3.2 + * bootstrap-collapse.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#collapse * ============================================================= * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index a77698dc2..4e5bb777c 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v2.3.2 + * bootstrap-dropdown.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#dropdowns * ============================================================ * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index db3f2785a..21d02127d 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,5 +1,5 @@ /* ========================================================= - * bootstrap-modal.js v2.3.2 + * bootstrap-modal.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#modals * ========================================================= * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 078cd8221..c532df6a9 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v2.3.2 + * bootstrap-popover.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#popovers * =========================================================== * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index de2bc8b37..45e2cd107 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.3.2 + * bootstrap-scrollspy.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#scrollspy * ============================================================= * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index 7dc43130a..ef5f91484 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tab.js v2.3.2 + * bootstrap-tab.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#tabs * ======================================================== * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index f0af4d314..b29892c70 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-tooltip.js v2.3.2 + * bootstrap-tooltip.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index cb3c7f146..c960ece8e 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.3.2 + * bootstrap-transition.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#transitions * =================================================== * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 3f1a20d9b..e7b7ed4e6 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-typeahead.js v2.3.2 + * bootstrap-typeahead.js v2.3.3 * http://getbootstrap.com/2.3.3/javascript.html#typeahead * ============================================================= * Copyright 2013 Twitter, Inc. diff --git a/less/bootstrap.less b/less/bootstrap.less index 3eabae144..b2b674f66 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.3.2 + * Bootstrap v2.3.3 * * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/less/responsive.less b/less/responsive.less index 9e5f9b1f4..512bc764a 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.3.2 + * Bootstrap Responsive v2.3.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/package.json b/package.json index ff560b1a2..499d37ce8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap" , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." - , "version": "2.3.2" + , "version": "2.3.3" , "keywords": ["bootstrap", "css"] , "homepage": "http://twbs.github.com/bootstrap/" , "author": "Twitter Inc."