From 790cb187f1188c619d282e76ca9b1b496fd1974d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 18 Jul 2013 22:57:59 -0700 Subject: [PATCH 01/11] component.json -> bower.json; adjust jquery to >=1.8.0 <2.1.0 --- component.json => bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename component.json => bower.json (83%) diff --git a/component.json b/bower.json similarity index 83% rename from component.json rename to bower.json index 02396f656..1fea87990 100644 --- a/component.json +++ b/bower.json @@ -3,6 +3,6 @@ "version": "2.3.2", "main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"], "dependencies": { - "jquery": "~1.8.0" + "jquery": ">=1.8.0 <2.1.0" } } \ No newline at end of file From f0de5ad2ac9f62100eb7c756f1ef641882909760 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Jul 2013 21:29:09 -0700 Subject: [PATCH 02/11] Bump Recess to 1.1.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4fc52ca0f..a68b7b8cd 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ , "devDependencies": { "uglify-js": "1.3.4" , "jshint": "0.9.1" - , "recess": "1.1.8" + , "recess": "1.1.9" , "connect": "2.1.3" , "hogan.js": "2.0.0" } From 0822cc54581256e8361599759f4d9bf6070b3313 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 25 Jul 2013 22:12:22 -0700 Subject: [PATCH 03/11] twitter/bootstrap => twbs/bootstrap in links etc. --- CHANGELOG.md | 30 +++++++++---------- CONTRIBUTING.md | 2 +- README.md | 8 ++--- composer.json | 4 +-- docs/assets/js/bootstrap-affix.js | 2 +- docs/assets/js/bootstrap-alert.js | 2 +- docs/assets/js/bootstrap-button.js | 2 +- docs/assets/js/bootstrap-carousel.js | 2 +- docs/assets/js/bootstrap-collapse.js | 2 +- docs/assets/js/bootstrap-dropdown.js | 2 +- docs/assets/js/bootstrap-modal.js | 2 +- docs/assets/js/bootstrap-popover.js | 2 +- docs/assets/js/bootstrap-scrollspy.js | 2 +- docs/assets/js/bootstrap-tab.js | 2 +- docs/assets/js/bootstrap-tooltip.js | 2 +- docs/assets/js/bootstrap-transition.js | 2 +- docs/assets/js/bootstrap-typeahead.js | 2 +- docs/assets/js/bootstrap.js | 26 ++++++++-------- docs/base-css.html | 4 +-- docs/components.html | 4 +-- docs/customize.html | 6 ++-- docs/examples/carousel.html | 2 +- docs/extend.html | 6 ++-- docs/getting-started.html | 14 ++++----- docs/index.html | 10 +++---- docs/javascript.html | 6 ++-- docs/scaffolding.html | 4 +-- docs/templates/layout.mustache | 4 +-- docs/templates/pages/customize.mustache | 2 +- docs/templates/pages/extend.mustache | 2 +- docs/templates/pages/getting-started.mustache | 10 +++---- docs/templates/pages/index.mustache | 8 ++--- docs/templates/pages/javascript.mustache | 2 +- js/bootstrap-affix.js | 2 +- js/bootstrap-alert.js | 2 +- js/bootstrap-button.js | 2 +- js/bootstrap-carousel.js | 2 +- js/bootstrap-collapse.js | 2 +- js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 2 +- js/bootstrap-popover.js | 2 +- js/bootstrap-scrollspy.js | 2 +- js/bootstrap-tab.js | 2 +- js/bootstrap-tooltip.js | 2 +- js/bootstrap-transition.js | 2 +- js/bootstrap-typeahead.js | 2 +- less/mixins.less | 4 +-- less/tests/css-tests.html | 4 +-- less/type.less | 2 +- package.json | 4 +-- 50 files changed, 110 insertions(+), 110 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8def3ce7f..0d0c43d52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,8 +23,8 @@ Minor release to add carousel indicators, improve tooltips, improve dev setup, a - **Added carousel indicators!** Add the HTML and it automagically works. - **Added `container` option to tooltips.** The default option is still `insertAfter`, but now you may specify where to insert tooltips (and by extension, popovers) with the optional container parameter. - Improved popovers now utilize `max-width` instead of `width`, have been widened from 240px to 280px, and will automatically hide the title if one has not been set via CSS `:empty` selector. - - Improved tooltip alignment on edges with [#6713](https://github.com/twitter/bootstrap/pull/6713). - - **Improved accessibility for links in all components.** After merging [#6441](https://github.com/twitter/bootstrap/pull/6441), link hover states now apply to the `:focus` state as well. This goes for basic `` tags, as well as buttons, navs, dropdowns, and more. + - Improved tooltip alignment on edges with [#6713](https://github.com/twbs/bootstrap/pull/6713). + - **Improved accessibility for links in all components.** After merging [#6441](https://github.com/twbs/bootstrap/pull/6441), link hover states now apply to the `:focus` state as well. This goes for basic `` tags, as well as buttons, navs, dropdowns, and more. - Added print utility classes to show and hide content between `screen` and `print` via CSS. - Updated input groups to make them behave more like default form controls. Added `display: inline-block;`, increased `margin-bottom`, and added `vertical-align: middle;` to match `` styles. - Added `.horizontal-three-colors()` gradient mixin (with example in the CSS tests file). @@ -34,7 +34,7 @@ Minor release to add carousel indicators, improve tooltips, improve dev setup, a - Added [new justified navigation example](https://f.cloud.github.com/assets/98681/25869/5e2f812c-4afa-11e2-9293-501cd689232d.png). - Added sticky footer with fixed navbar example. -See more on the [2.3.0 pull request](https://github.com/twitter/bootstrap/pull/6346). +See more on the [2.3.0 pull request](https://github.com/twbs/bootstrap/pull/6346). ## 2.2.2 (December 8, 2012) @@ -49,14 +49,14 @@ Bugfix release addressing docs, CSS, and some JavaScript issues. Key changes inc - No longer inherits `font-size: 0;` when placed in button groups. - Arrows refactored to work in IE8, and use less code. - Plugin no longer inserts popover content into a `

`, but rather directly into `.popover-content`. -- **Labels and badges:** Now [automatically collapse](https://github.com/twitter/bootstrap/commit/ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256) if they have no content. +- **Labels and badges:** Now [automatically collapse](https://github.com/twbs/bootstrap/commit/ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256) if they have no content. - **Tables:** Nesting support with `.table-bordered` and `.table-striped` greatly improved. - **Typeahead:** - - Now [inserts dropdown menu after the input](https://github.com/twitter/bootstrap/commit/1747caf19d59cad7fdc90ae56a00e0e2849f95f4) instead of at the close of the document. + - Now [inserts dropdown menu after the input](https://github.com/twbs/bootstrap/commit/1747caf19d59cad7fdc90ae56a00e0e2849f95f4) instead of at the close of the document. - Hitting escape will place focus back on the ``. - Print styles, from HTML5 Boilerplate, have been added. -See more on the [2.2.2 milestone](https://github.com/twitter/bootstrap/issues?milestone=17&state=closed). +See more on the [2.2.2 milestone](https://github.com/twbs/bootstrap/issues?milestone=17&state=closed). ## 2.2.1 (October 30, 2012) @@ -68,7 +68,7 @@ Hotfix release to address the carousel bug reports. ### tl;dr -2.1.2 is now 2.2.0: four new example templates, added media component, new typographic scale, fixed that box-shadow mixin bug, fixed z-index issues, and [more](https://github.com/twitter/bootstrap/issues?milestone=15&page=1&state=closed). +2.1.2 is now 2.2.0: four new example templates, added media component, new typographic scale, fixed that box-shadow mixin bug, fixed z-index issues, and [more](https://github.com/twbs/bootstrap/issues?milestone=15&page=1&state=closed). ### Highlights @@ -86,13 +86,13 @@ Hotfix release to address the carousel bug reports. - Miscellaneous variable improvements across the board. - Miscellaneous documentation typos fixed. -For the full list of issues included in this release, visit the [2.2.0 milestone on GitHub](https://github.com/twitter/bootstrap/issues?milestone=15&page=1&state=closed) +For the full list of issues included in this release, visit the [2.2.0 milestone on GitHub](https://github.com/twbs/bootstrap/issues?milestone=15&page=1&state=closed) ## 2.1.1 (September 4, 2012) -* New feature: alert text. We documented these new classes, like `.text-success`, at the bottom of the [Typography section](http://twitter.github.com/bootstrap/base-css.html#typography) along with the long undocumented `.muted`. +* New feature: alert text. We documented these new classes, like `.text-success`, at the bottom of the [Typography section](http://twbs.github.com/bootstrap/base-css.html#typography) along with the long undocumented `.muted`. * Fixed a lot of typos in the docs. Spelling is hard. * Made the `.box-shadow()` mixin more durable. It no longer requires escaping for multiple shadows, meaning you can easily use variables and functions in them once again. * Widened `.dl-horizontal dt` and `.horizontal-form .control-group` to better handle the increased font-size. @@ -103,7 +103,7 @@ For the full list of issues included in this release, visit the [2.2.0 milestone * Fixed the vertical three color gradient in latest Firefox. * Reordered some variables that caused errors in certain Less compilers. -View all closed issues on the [2.1.1 milestone](https://github.com/twitter/bootstrap/issues?milestone=14&state=closed). +View all closed issues on the [2.1.1 milestone](https://github.com/twbs/bootstrap/issues?milestone=14&state=closed). ## 2.1.0 (August 20, 2012) @@ -123,7 +123,7 @@ View all closed issues on the [2.1.1 milestone](https://github.com/twitter/boots * Fluid grid system variables are no longer fixed percentages * Removed LESS docs page -For full set of changes, see the completed milestone: https://github.com/twitter/bootstrap/issues?milestone=7&page=1&state=closed +For full set of changes, see the completed milestone: https://github.com/twbs/bootstrap/issues?milestone=7&page=1&state=closed ## 2.0.4 (June 1, 2012) @@ -280,7 +280,7 @@ Overview of docs changes, bugfixes, and new features. - Added `.disabled` class support to the pager component (also added a mention of this to the docs) - Added `.well-large` and `.well-small` classes for extending the well component -For a full issue-by-issue rundown of the release, check out the now closed [2.0.2 milestone on GitHub](https://github.com/twitter/bootstrap/issues?sort=created&direction=desc&state=closed&page=1&milestone=9) +For a full issue-by-issue rundown of the release, check out the now closed [2.0.2 milestone on GitHub](https://github.com/twbs/bootstrap/issues?sort=created&direction=desc&state=closed&page=1&milestone=9) ## v2.0.1 (February 17, 2012) @@ -296,10 +296,10 @@ Overview of changes: - Rearranged Scaffolding docs page to split fixed and fluid grid systems. - Tons of docs updates for typos and language changes. -For full list of changes, see the now closed [v2.0.1 milestone](https://github.com/twitter/bootstrap/issues?milestone=8&state=closed). +For full list of changes, see the now closed [v2.0.1 milestone](https://github.com/twbs/bootstrap/issues?milestone=8&state=closed). ## v2.0.0 (January 28, 2012) -Complete rewrite of the library. For full details, head to the upgrading doc at http://twitter.github.com/bootstrap/upgrading.html. +Complete rewrite of the library. For full details, head to the upgrading doc at http://twbs.github.com/bootstrap/upgrading.html. ## v1.4.0 ### Key bug fixes and changes @@ -308,7 +308,7 @@ Complete rewrite of the library. For full details, head to the upgrading doc at - New javascript plugin for button states - Switched to strict mode for Javascript plugins - Added more data attribute controls to our plugins -- Full list of 25+ issues fixed: https://github.com/twitter/bootstrap/issues?milestone=6&state=closed +- Full list of 25+ issues fixed: https://github.com/twbs/bootstrap/issues?milestone=6&state=closed ## v1.3.0 ### New features diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 463bfca78..17386f95a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,4 +72,4 @@ As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and bui ## License -By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twitter/bootstrap/blob/master/LICENSE +By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE diff --git a/README.md b/README.md index de5bdcee7..884432d83 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bootstrap v2.3.2](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) +# [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 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). @@ -10,8 +10,8 @@ To get started, checkout [http://getbootstrap.com](http://getbootstrap.com)! Three quick start options are available: -* [Download the latest release](https://github.com/twitter/bootstrap/zipball/master). -* Clone the repo: `git clone git://github.com/twitter/bootstrap.git`. +* [Download the latest release](https://github.com/twbs/bootstrap/zipball/master). +* Clone the repo: `git clone git://github.com/twbs/bootstrap.git`. * Install with Twitter's [Bower](http://bower.io): `bower install bootstrap`. @@ -36,7 +36,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver. ## Bug tracker -Have a bug or a feature request? [Please open a new issue](https://github.com/twitter/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/). +Have a bug or a feature request? [Please open a new issue](https://github.com/twbs/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/). diff --git a/composer.json b/composer.json index abde63128..6840a4a6e 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "twitter/bootstrap" + "name": "twbs/bootstrap" , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." , "keywords": ["bootstrap", "css"] - , "homepage": "http://twitter.github.com/bootstrap/" + , "homepage": "http://twbs.github.com/bootstrap/" , "author": "Twitter Inc." , "license": "Apache-2.0" diff --git a/docs/assets/js/bootstrap-affix.js b/docs/assets/js/bootstrap-affix.js index 91c9ced13..46cb2fcb8 100644 --- a/docs/assets/js/bootstrap-affix.js +++ b/docs/assets/js/bootstrap-affix.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-affix.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#affix + * 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 0cefe5fc5..4f560def4 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-alert.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#alerts + * 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 ce4599164..f8b52eb41 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -1,6 +1,6 @@ /* ============================================================ * bootstrap-button.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#buttons + * 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 476494ad6..300b86ed2 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-carousel.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#carousel + * 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 74a73a890..1b6804441 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-collapse.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#collapse + * 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 6cc122113..f5e3e31f2 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -1,6 +1,6 @@ /* ============================================================ * bootstrap-dropdown.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * 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 c3648d8b7..1ad9a1640 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -1,6 +1,6 @@ /* ========================================================= * bootstrap-modal.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#modals + * 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 e6a23d210..7d0e27747 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-popover.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#popovers + * 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 7dd60c426..aae25aca9 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-scrollspy.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * 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 a5161515a..bb3fc439e 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -1,6 +1,6 @@ /* ======================================================== * bootstrap-tab.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tabs + * 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 a3bbd580b..dbbf7d27f 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-tooltip.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tooltips + * http://twbs.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index e12cf6e5a..bf89aac8c 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -1,6 +1,6 @@ /* =================================================== * bootstrap-transition.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions + * 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 abc48d505..d45e6ed57 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-typeahead.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#typeahead + * 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 643e71cdf..5d35ba817 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1,6 +1,6 @@ /* =================================================== * bootstrap-transition.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions + * http://twbs.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. * @@ -59,7 +59,7 @@ }(window.jQuery);/* ========================================================== * bootstrap-alert.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#alerts + * http://twbs.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. * @@ -157,7 +157,7 @@ }(window.jQuery);/* ============================================================ * bootstrap-button.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#buttons + * http://twbs.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. * @@ -261,7 +261,7 @@ }(window.jQuery);/* ========================================================== * bootstrap-carousel.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#carousel + * http://twbs.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. * @@ -467,7 +467,7 @@ }(window.jQuery);/* ============================================================= * bootstrap-collapse.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#collapse + * http://twbs.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. * @@ -633,7 +633,7 @@ }(window.jQuery);/* ============================================================ * bootstrap-dropdown.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. * @@ -802,7 +802,7 @@ }(window.jQuery); /* ========================================================= * bootstrap-modal.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#modals + * http://twbs.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. * @@ -1049,7 +1049,7 @@ }(window.jQuery); /* =========================================================== * bootstrap-tooltip.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tooltips + * http://twbs.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1410,7 +1410,7 @@ }(window.jQuery); /* =========================================================== * bootstrap-popover.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#popovers + * http://twbs.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. * @@ -1524,7 +1524,7 @@ }(window.jQuery); /* ============================================================= * bootstrap-scrollspy.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. * @@ -1685,7 +1685,7 @@ }(window.jQuery);/* ======================================================== * bootstrap-tab.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tabs + * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. * @@ -1828,7 +1828,7 @@ }(window.jQuery);/* ============================================================= * bootstrap-typeahead.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#typeahead + * http://twbs.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. * @@ -2163,7 +2163,7 @@ }(window.jQuery); /* ========================================================== * bootstrap-affix.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#affix + * http://twbs.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/docs/base-css.html b/docs/base-css.html index 052c7167d..2656ddde3 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -2186,9 +2186,9 @@ For example, <code>&lt;section&gt;</code> should be wrapped

diff --git a/docs/components.html b/docs/components.html index 035d15207..210fea044 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2597,9 +2597,9 @@ class="clearfix" diff --git a/docs/customize.html b/docs/customize.html index 5076a09a5..77ec6cc0f 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -84,7 +84,7 @@

Customize and download

-

Download Bootstrap or customize variables, components, JavaScript plugins, and more.

+

Download Bootstrap or customize variables, components, JavaScript plugins, and more.

@@ -485,9 +485,9 @@ diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 81d1a28a1..3a7e00583 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -291,7 +291,7 @@
  • Home
  • About
  • Contact
    • - +
  • Dropdown
      diff --git a/docs/extend.html b/docs/extend.html index 163793eb9..f0b4465b3 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -147,7 +147,7 @@

      Tools for compiling

      Command line

      -

      Follow the instructions in the project readme on GitHub for compiling via command line.

      +

      Follow the instructions in the project readme on GitHub for compiling via command line.

      JavaScript

      Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

      @@ -253,9 +253,9 @@ diff --git a/docs/getting-started.html b/docs/getting-started.html index 65c0cb450..a34a90b69 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -125,7 +125,7 @@

      Download source

      Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.

      -

      Download Bootstrap source

      +

      Download Bootstrap source

      @@ -167,13 +167,13 @@

      Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation.

      Docs sections

      -

      Scaffolding

      +

      Scaffolding

      Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.

      -

      Base CSS

      +

      Base CSS

      Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.

      -

      Components

      +

      Components

      Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.

      -

      JavaScript plugins

      +

      JavaScript plugins

      Similar to Components, these JavaScript plugins are interactive components for things like tooltips, popovers, modals, and more.

      List of components

      @@ -348,9 +348,9 @@ diff --git a/docs/index.html b/docs/index.html index 0ce37cfe8..69498b501 100644 --- a/docs/index.html +++ b/docs/index.html @@ -107,16 +107,16 @@
      @@ -192,9 +192,9 @@ diff --git a/docs/javascript.html b/docs/javascript.html index d7fb8fc54..8e5f6ec0c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1238,7 +1238,7 @@ $('#my-alert').bind('closed', function () { 
      <button type="button" class="btn" data-loading-text="loading stuff..." >...</button>
      Heads up! - Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off". + Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".

      $().button('reset')

      Resets button state - swaps text to original text.

      @@ -1751,9 +1751,9 @@ $('.carousel').carousel({ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 215620527..a30de0298 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -573,9 +573,9 @@ diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 993b44620..493ee17b1 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -95,9 +95,9 @@ diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 8d8a2f92a..23de4cef6 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -3,7 +3,7 @@

      {{_i}}Customize and download{{/i}}

      -

      {{_i}}Download Bootstrap or customize variables, components, JavaScript plugins, and more.{{/i}}

      +

      {{_i}}Download Bootstrap or customize variables, components, JavaScript plugins, and more.{{/i}}

      diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache index b5c8d5747..5f7dc8c5c 100644 --- a/docs/templates/pages/extend.mustache +++ b/docs/templates/pages/extend.mustache @@ -66,7 +66,7 @@

      {{_i}}Tools for compiling{{/i}}

      {{_i}}Command line{{/i}}

      -

      {{_i}}Follow the instructions in the project readme on GitHub for compiling via command line.{{/i}}

      +

      {{_i}}Follow the instructions in the project readme on GitHub for compiling via command line.{{/i}}

      {{_i}}JavaScript{{/i}}

      {{_i}}Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.{{/i}}

      diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index ae1534ce3..32d61f74a 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -44,7 +44,7 @@

      Download source

      Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.

      -

      {{_i}}Download Bootstrap source{{/i}}

      +

      {{_i}}Download Bootstrap source{{/i}}

      @@ -86,13 +86,13 @@

      {{_i}}Bootstrap comes equipped with HTML, CSS, and JS for all sorts of things, but they can be summarized with a handful of categories visible at the top of the Bootstrap documentation.{{/i}}

      {{_i}}Docs sections{{/i}}

      -

      {{_i}}Scaffolding{{/i}}

      +

      {{_i}}Scaffolding{{/i}}

      {{_i}}Global styles for the body to reset type and background, link styles, grid system, and two simple layouts.{{/i}}

      -

      {{_i}}Base CSS{{/i}}

      +

      {{_i}}Base CSS{{/i}}

      {{_i}}Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.{{/i}}

      -

      {{_i}}Components{{/i}}

      +

      {{_i}}Components{{/i}}

      {{_i}}Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.{{/i}}

      -

      {{_i}}JavaScript plugins{{/i}}

      +

      {{_i}}JavaScript plugins{{/i}}

      {{_i}}Similar to Components, these JavaScript plugins are interactive components for things like tooltips, popovers, modals, and more.{{/i}}

      {{_i}}List of components{{/i}}

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

      • - {{_i}}GitHub project{{/i}} + {{_i}}GitHub project{{/i}}
      • {{_i}}Examples{{/i}} @@ -26,16 +26,16 @@
        diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 744988f4b..2b16c9401 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1158,7 +1158,7 @@ $('#my-alert').bind('closed', function () { 
        <button type="button" class="btn" data-loading-text="loading stuff..." >...</button>
        {{_i}}Heads up!{{/i}} - {{_i}}Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".{{/i}} + {{_i}}Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".{{/i}}

        $().button('reset')

        {{_i}}Resets button state - swaps text to original text.{{/i}}

        diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js index 91c9ced13..46cb2fcb8 100644 --- a/js/bootstrap-affix.js +++ b/js/bootstrap-affix.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-affix.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#affix + * http://twbs.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 0cefe5fc5..4f560def4 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-alert.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#alerts + * http://twbs.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index ce4599164..f8b52eb41 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,6 +1,6 @@ /* ============================================================ * bootstrap-button.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#buttons + * http://twbs.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 476494ad6..300b86ed2 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-carousel.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#carousel + * http://twbs.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 74a73a890..1b6804441 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-collapse.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#collapse + * http://twbs.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 6cc122113..f5e3e31f2 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,6 +1,6 @@ /* ============================================================ * bootstrap-dropdown.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index c3648d8b7..1ad9a1640 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,6 +1,6 @@ /* ========================================================= * bootstrap-modal.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#modals + * http://twbs.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index e6a23d210..7d0e27747 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-popover.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#popovers + * http://twbs.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 7dd60c426..aae25aca9 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-scrollspy.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index a5161515a..bb3fc439e 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,6 +1,6 @@ /* ======================================================== * bootstrap-tab.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tabs + * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index a3bbd580b..dbbf7d27f 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-tooltip.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#tooltips + * http://twbs.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index e12cf6e5a..bf89aac8c 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,6 +1,6 @@ /* =================================================== * bootstrap-transition.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions + * http://twbs.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index abc48d505..d45e6ed57 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-typeahead.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#typeahead + * http://twbs.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. * diff --git a/less/mixins.less b/less/mixins.less index 79d889219..857561e9a 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -300,10 +300,10 @@ .skew(@x, @y) { -webkit-transform: skew(@x, @y); -moz-transform: skew(@x, @y); - -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 + -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885 -o-transform: skew(@x, @y); transform: skew(@x, @y); - -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319 + -webkit-backface-visibility: hidden; // See https://github.com/twbs/bootstrap/issues/5319 } .translate3d(@x, @y, @z) { -webkit-transform: translate3d(@x, @y, @z); diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index c69688c76..6778e9e68 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -1365,8 +1365,8 @@

        Icons from Glyphicons Free, licensed under CC BY 3.0.

        diff --git a/less/type.less b/less/type.less index 337138ac8..6a472db49 100644 --- a/less/type.less +++ b/less/type.less @@ -178,7 +178,7 @@ hr { // Abbreviations and acronyms abbr[title], -// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257 +// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257 abbr[data-original-title] { cursor: help; border-bottom: 1px dotted @grayLight; diff --git a/package.json b/package.json index 4fc52ca0f..02e9b450b 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,12 @@ , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." , "version": "2.3.2" , "keywords": ["bootstrap", "css"] - , "homepage": "http://twitter.github.com/bootstrap/" + , "homepage": "http://twbs.github.com/bootstrap/" , "author": "Twitter Inc." , "scripts": { "test": "make test" } , "repository": { "type": "git" - , "url": "https://github.com/twitter/bootstrap.git" + , "url": "https://github.com/twbs/bootstrap.git" } , "licenses": [ { From 7d59745955f0070c3a1536ac8b725f67adf493bf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Jul 2013 22:53:57 -0700 Subject: [PATCH 04/11] Update URLs to account for v3 rc1 soft launch --- Makefile | 4 ++-- js/bootstrap-affix.js | 4 ++-- js/bootstrap-alert.js | 4 ++-- js/bootstrap-button.js | 4 ++-- js/bootstrap-carousel.js | 4 ++-- js/bootstrap-collapse.js | 4 ++-- js/bootstrap-dropdown.js | 4 ++-- js/bootstrap-modal.js | 4 ++-- js/bootstrap-popover.js | 4 ++-- js/bootstrap-scrollspy.js | 4 ++-- js/bootstrap-tab.js | 4 ++-- js/bootstrap-tooltip.js | 4 ++-- js/bootstrap-transition.js | 4 ++-- js/bootstrap-typeahead.js | 4 ++-- less/bootstrap.less | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 1ad0ba567..9f5116617 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 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.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 @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" @@ -74,7 +74,7 @@ bootstrap/js/*.js: js/*.js mkdir -p bootstrap/js 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 > bootstrap/js/bootstrap.js ./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js - echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js + echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js index 46cb2fcb8..f305c2ec3 100644 --- a/js/bootstrap-affix.js +++ b/js/bootstrap-affix.js @@ -1,8 +1,8 @@ /* ========================================================== * bootstrap-affix.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#affix + * http://getbootstrap.com/2.3.3/javascript.html#affix * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 4f560def4..020d2a796 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -1,8 +1,8 @@ /* ========================================================== * bootstrap-alert.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#alerts + * http://getbootstrap.com/2.3.3/javascript.html#alerts * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index f8b52eb41..668948d69 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,8 +1,8 @@ /* ============================================================ * bootstrap-button.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#buttons + * http://getbootstrap.com/2.3.3/javascript.html#buttons * ============================================================ - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 300b86ed2..6882d6d42 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,8 +1,8 @@ /* ========================================================== * bootstrap-carousel.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#carousel + * http://getbootstrap.com/2.3.3/javascript.html#carousel * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 1b6804441..0ee53053d 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,8 +1,8 @@ /* ============================================================= * bootstrap-collapse.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#collapse + * http://getbootstrap.com/2.3.3/javascript.html#collapse * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index f5e3e31f2..a77698dc2 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,8 +1,8 @@ /* ============================================================ * bootstrap-dropdown.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * http://getbootstrap.com/2.3.3/javascript.html#dropdowns * ============================================================ - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 1ad9a1640..db3f2785a 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,8 +1,8 @@ /* ========================================================= * bootstrap-modal.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#modals + * http://getbootstrap.com/2.3.3/javascript.html#modals * ========================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 7d0e27747..078cd8221 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,8 +1,8 @@ /* =========================================================== * bootstrap-popover.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#popovers + * http://getbootstrap.com/2.3.3/javascript.html#popovers * =========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index aae25aca9..de2bc8b37 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -1,8 +1,8 @@ /* ============================================================= * bootstrap-scrollspy.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#scrollspy + * http://getbootstrap.com/2.3.3/javascript.html#scrollspy * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index bb3fc439e..7dc43130a 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,8 +1,8 @@ /* ======================================================== * bootstrap-tab.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#tabs + * http://getbootstrap.com/2.3.3/javascript.html#tabs * ======================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index dbbf7d27f..f0af4d314 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,9 +1,9 @@ /* =========================================================== * bootstrap-tooltip.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#tooltips + * http://getbootstrap.com/2.3.3/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index bf89aac8c..cb3c7f146 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,8 +1,8 @@ /* =================================================== * bootstrap-transition.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#transitions + * http://getbootstrap.com/2.3.3/javascript.html#transitions * =================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index d45e6ed57..3f1a20d9b 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,8 +1,8 @@ /* ============================================================= * bootstrap-typeahead.js v2.3.2 - * http://twbs.github.com/bootstrap/javascript.html#typeahead + * http://getbootstrap.com/2.3.3/javascript.html#typeahead * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/less/bootstrap.less b/less/bootstrap.less index d4ebf37ac..3eabae144 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,11 +1,11 @@ /*! * Bootstrap v2.3.2 * - * Copyright 2012 Twitter, Inc + * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * - * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Designed and built with all the love in the world by @mdo and @fat. */ // Core variables and mixins From 573b3f44159a2127af3a539fc43095bbdb472603 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Jul 2013 22:56:28 -0700 Subject: [PATCH 05/11] Version bump --- Makefile | 2 +- README.md | 2 +- bower.json | 2 +- docs/assets/css/bootstrap-responsive.css | 2 +- docs/assets/css/bootstrap.css | 2 +- docs/assets/js/bootstrap-affix.js | 2 +- docs/assets/js/bootstrap-alert.js | 2 +- docs/assets/js/bootstrap-button.js | 2 +- docs/assets/js/bootstrap-carousel.js | 2 +- docs/assets/js/bootstrap-collapse.js | 2 +- docs/assets/js/bootstrap-dropdown.js | 2 +- docs/assets/js/bootstrap-modal.js | 2 +- docs/assets/js/bootstrap-popover.js | 2 +- docs/assets/js/bootstrap-scrollspy.js | 2 +- docs/assets/js/bootstrap-tab.js | 2 +- docs/assets/js/bootstrap-tooltip.js | 2 +- docs/assets/js/bootstrap-transition.js | 2 +- docs/assets/js/bootstrap-typeahead.js | 2 +- docs/assets/js/bootstrap.js | 26 ++++++++++++------------ docs/assets/js/bootstrap.min.js | 2 +- docs/index.html | 4 ++-- docs/templates/pages/index.mustache | 4 ++-- js/bootstrap-affix.js | 2 +- js/bootstrap-alert.js | 2 +- js/bootstrap-button.js | 2 +- js/bootstrap-carousel.js | 2 +- js/bootstrap-collapse.js | 2 +- js/bootstrap-dropdown.js | 2 +- js/bootstrap-modal.js | 2 +- js/bootstrap-popover.js | 2 +- js/bootstrap-scrollspy.js | 2 +- js/bootstrap-tab.js | 2 +- js/bootstrap-tooltip.js | 2 +- js/bootstrap-transition.js | 2 +- js/bootstrap-typeahead.js | 2 +- less/bootstrap.less | 2 +- less/responsive.less | 2 +- package.json | 2 +- 38 files changed, 52 insertions(+), 52 deletions(-) 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

        • @@ -97,7 +97,7 @@ Extend
        • - Version 2.3.2 + Version 2.3.3
        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}}

        • @@ -16,7 +16,7 @@ {{_i}}Extend{{/i}}
        • - {{_i}}Version 2.3.2{{/i}} + {{_i}}Version 2.3.3{{/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." From 87e2f0bbc5013643baf121785da6fca7ab1144ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Jul 2013 22:56:34 -0700 Subject: [PATCH 06/11] Add changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d0c43d52..f1415fa9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.3.3 (July 26, 2013) + +Patch to update jQuery in Bower and bump Recess to 1.1.9 + ## 2.3.2 (May 17, 2013) - Fix dropdown for firefox (middleclick) and mobile From 14c1e926a67e51358e03f38a629d2665a28679b5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Jul 2013 23:04:01 -0700 Subject: [PATCH 07/11] More date changes --- less/responsive.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/responsive.less b/less/responsive.less index 512bc764a..4e766095d 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,11 +1,11 @@ /*! * Bootstrap Responsive v2.3.3 * - * Copyright 2012 Twitter, Inc + * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * - * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Designed and built with all the love in the world by @mdo and @fat. */ From 4be4e8ec355cc00982b2881975d1a7ce5b06225e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Jul 2013 23:07:23 -0700 Subject: [PATCH 08/11] Point changelog in docs to releases on GitHub --- docs/base-css.html | 2 +- docs/components.html | 2 +- docs/customize.html | 4 ++-- docs/extend.html | 2 +- docs/getting-started.html | 2 +- docs/index.html | 2 +- docs/javascript.html | 6 +++--- docs/scaffolding.html | 2 +- docs/templates/layout.mustache | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 2656ddde3..e7ba257db 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -2188,7 +2188,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped
      • ·
      • Issues
      • ·
        • -
      • Changelog
        • +
      • Changelog
      diff --git a/docs/components.html b/docs/components.html index 210fea044..68c34cb0b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2599,7 +2599,7 @@ class="clearfix"
    • ·
    • Issues
    • ·
      • -
    • Changelog
      • +
    • Changelog
    diff --git a/docs/customize.html b/docs/customize.html index 77ec6cc0f..8f769a9cc 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -84,7 +84,7 @@

    Customize and download

    -

    Download Bootstrap or customize variables, components, JavaScript plugins, and more.

    +

    Download Bootstrap or customize variables, components, JavaScript plugins, and more.

    @@ -487,7 +487,7 @@
  • ·
  • Issues
  • ·
    • -
  • Changelog
    • +
  • Changelog
    • diff --git a/docs/extend.html b/docs/extend.html index f0b4465b3..f60c7ecd2 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -255,7 +255,7 @@
  • ·
  • Issues
  • ·
    • -
  • Changelog
    • +
  • Changelog
    • diff --git a/docs/getting-started.html b/docs/getting-started.html index a34a90b69..85327bc74 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -350,7 +350,7 @@
  • ·
  • Issues
  • ·
    • -
  • Changelog
    • +
  • Changelog
    • diff --git a/docs/index.html b/docs/index.html index 0946d6ea7..9ef774a03 100644 --- a/docs/index.html +++ b/docs/index.html @@ -194,7 +194,7 @@
  • ·
  • Issues
  • ·
    • -
  • Changelog
    • +
  • Changelog
    • diff --git a/docs/javascript.html b/docs/javascript.html index 8e5f6ec0c..9166fe35c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -448,7 +448,7 @@ $('#myModal').on('hidden', function () { - +

    Within tabs

    @@ -485,7 +485,7 @@ $('#myModal').on('hidden', function () { -
    +
    @@ -1753,7 +1753,7 @@ $('.carousel').carousel({
  • ·
  • Issues
  • ·
    • -
  • Changelog
    • +
  • Changelog
    • diff --git a/docs/scaffolding.html b/docs/scaffolding.html index a30de0298..8db4fa5eb 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -575,7 +575,7 @@
  • ·
  • Issues
  • ·
    • -
  • Changelog
    • +
  • Changelog
    • diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 493ee17b1..5254fc069 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -97,7 +97,7 @@
  • ·
  • {{_i}}Issues{{/i}}
  • ·
    • -
  • {{_i}}Changelog{{/i}}
    • +
  • {{_i}}Changelog{{/i}}
    • From aadc76694df1b530da78e87896eefbafed0ee53e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Jul 2013 23:10:22 -0700 Subject: [PATCH 09/11] Point docs downloads to tag in twbs org --- docs/templates/pages/customize.mustache | 2 +- docs/templates/pages/index.mustache | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 23de4cef6..90c7537fc 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -3,7 +3,7 @@

    {{_i}}Customize and download{{/i}}

    -

    {{_i}}Download Bootstrap or customize variables, components, JavaScript plugins, and more.{{/i}}

    +

    {{_i}}Download Bootstrap or customize variables, components, JavaScript plugins, and more.{{/i}}

    diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index ac3f8ef2b..35f1b4e8e 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}}

    From 92fd785e9713dd141bb42d2c601fb41fb46165af Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 Jul 2013 23:12:54 -0700 Subject: [PATCH 10/11] revert to 2.3.2 tag instead --- CHANGELOG.md | 7 ++++--- Makefile | 2 +- README.md | 2 +- bower.json | 2 +- docs/assets/css/bootstrap-responsive.css | 2 +- docs/assets/css/bootstrap.css | 2 +- docs/assets/js/bootstrap-affix.js | 2 +- docs/assets/js/bootstrap-alert.js | 2 +- docs/assets/js/bootstrap-button.js | 2 +- docs/assets/js/bootstrap-carousel.js | 2 +- docs/assets/js/bootstrap-collapse.js | 2 +- docs/assets/js/bootstrap-dropdown.js | 2 +- docs/assets/js/bootstrap-modal.js | 2 +- docs/assets/js/bootstrap-popover.js | 2 +- docs/assets/js/bootstrap-scrollspy.js | 2 +- docs/assets/js/bootstrap-tab.js | 2 +- docs/assets/js/bootstrap-tooltip.js | 2 +- docs/assets/js/bootstrap-transition.js | 2 +- docs/assets/js/bootstrap-typeahead.js | 2 +- docs/assets/js/bootstrap.js | 26 ++++++++++++------------ docs/assets/js/bootstrap.min.js | 2 +- docs/customize.html | 2 +- docs/index.html | 4 ++-- docs/templates/pages/customize.mustache | 2 +- docs/templates/pages/index.mustache | 4 ++-- js/bootstrap-affix.js | 4 ++-- js/bootstrap-alert.js | 4 ++-- js/bootstrap-button.js | 4 ++-- js/bootstrap-carousel.js | 4 ++-- js/bootstrap-collapse.js | 4 ++-- js/bootstrap-dropdown.js | 4 ++-- js/bootstrap-modal.js | 4 ++-- js/bootstrap-popover.js | 4 ++-- js/bootstrap-scrollspy.js | 4 ++-- js/bootstrap-tab.js | 4 ++-- js/bootstrap-tooltip.js | 4 ++-- js/bootstrap-transition.js | 4 ++-- js/bootstrap-typeahead.js | 4 ++-- less/bootstrap.less | 2 +- less/responsive.less | 2 +- package.json | 2 +- 41 files changed, 71 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1415fa9e..9af956135 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -## 2.3.3 (July 26, 2013) +## 2.3.2 re-release (July 26, 2013) -Patch to update jQuery in Bower and bump Recess to 1.1.9 +Patch to update jQuery in Bower and bump Recess to 1.1.9. ## 2.3.2 (May 17, 2013) -- Fix dropdown for firefox (middleclick) and mobile + +Fix dropdown for firefox (middleclick) and mobile. ## 2.3.1 (February 28, 2013) diff --git a/Makefile b/Makefile index 1b25f7b32..9f5116617 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.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 + @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 @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 28c9a48c4..884432d83 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [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 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 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 328268a7f..1fea87990 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "version": "2.3.3", + "version": "2.3.2", "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 9e862b46e..09e88ce3f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.3.3 + * Bootstrap Responsive v2.3.2 * * 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 50440e93c..b725064aa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.3.3 + * Bootstrap v2.3.2 * * 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 ff6d29c98..46cb2fcb8 100644 --- a/docs/assets/js/bootstrap-affix.js +++ b/docs/assets/js/bootstrap-affix.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-affix.js v2.3.3 + * bootstrap-affix.js v2.3.2 * 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 a7eafc7b2..4f560def4 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-alert.js v2.3.3 + * bootstrap-alert.js v2.3.2 * 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 421fdbaf7..f8b52eb41 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-button.js v2.3.3 + * bootstrap-button.js v2.3.2 * 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 d179f480e..300b86ed2 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-carousel.js v2.3.3 + * bootstrap-carousel.js v2.3.2 * 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 f7d0bc801..1b6804441 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-collapse.js v2.3.3 + * bootstrap-collapse.js v2.3.2 * 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 cc491e1ff..f5e3e31f2 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v2.3.3 + * bootstrap-dropdown.js v2.3.2 * 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 6a1183a55..1ad9a1640 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -1,5 +1,5 @@ /* ========================================================= - * bootstrap-modal.js v2.3.3 + * bootstrap-modal.js v2.3.2 * 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 47eef7eb4..7d0e27747 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v2.3.3 + * bootstrap-popover.js v2.3.2 * 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 d48de9f7d..aae25aca9 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.3.3 + * bootstrap-scrollspy.js v2.3.2 * 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 749ff3e2d..bb3fc439e 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tab.js v2.3.3 + * bootstrap-tab.js v2.3.2 * 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 b5968dd59..dbbf7d27f 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-tooltip.js v2.3.3 + * bootstrap-tooltip.js v2.3.2 * 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 4376133dc..bf89aac8c 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.3.3 + * bootstrap-transition.js v2.3.2 * 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 d3f5ee396..d45e6ed57 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-typeahead.js v2.3.3 + * bootstrap-typeahead.js v2.3.2 * 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 31156f67d..5d35ba817 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.3.3 + * bootstrap-transition.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -58,7 +58,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.3 + * bootstrap-alert.js v2.3.2 * 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.3 + * bootstrap-button.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -260,7 +260,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.3 + * bootstrap-carousel.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -466,7 +466,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.3 + * bootstrap-collapse.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -632,7 +632,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.3 + * bootstrap-dropdown.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -801,7 +801,7 @@ }(window.jQuery); /* ========================================================= - * bootstrap-modal.js v2.3.3 + * bootstrap-modal.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -1048,7 +1048,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-tooltip.js v2.3.3 + * bootstrap-tooltip.js v2.3.2 * 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.3 + * bootstrap-popover.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1523,7 +1523,7 @@ }(window.jQuery); /* ============================================================= - * bootstrap-scrollspy.js v2.3.3 + * bootstrap-scrollspy.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1684,7 +1684,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.3.3 + * bootstrap-tab.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1827,7 +1827,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.3.3 + * bootstrap-typeahead.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -2162,7 +2162,7 @@ }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.3.3 + * bootstrap-affix.js v2.3.2 * 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 0dae42fba..af4eef796 100644 --- a/docs/assets/js/bootstrap.min.js +++ b/docs/assets/js/bootstrap.min.js @@ -1,5 +1,5 @@ /** -* Bootstrap.js v2.3.3 by @fat & @mdo +* Bootstrap.js v2.3.2 by @fat & @mdo * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ diff --git a/docs/customize.html b/docs/customize.html index 8f769a9cc..79b02c0c5 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -84,7 +84,7 @@

    Customize and download

    -

    Download Bootstrap or customize variables, components, JavaScript plugins, and more.

    +

    Download Bootstrap or customize variables, components, JavaScript plugins, and more.

    diff --git a/docs/index.html b/docs/index.html index 9ef774a03..11564566f 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

    • @@ -97,7 +97,7 @@ Extend
    • - Version 2.3.3 + Version 2.3.2
    diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 90c7537fc..213b5dbc9 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -3,7 +3,7 @@

    {{_i}}Customize and download{{/i}}

    -

    {{_i}}Download Bootstrap or customize variables, components, JavaScript plugins, and more.{{/i}}

    +

    {{_i}}Download Bootstrap or customize variables, components, JavaScript plugins, and more.{{/i}}

    diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 35f1b4e8e..4fb7f1cb0 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}}

    • @@ -16,7 +16,7 @@ {{_i}}Extend{{/i}}
    • - {{_i}}Version 2.3.3{{/i}} + {{_i}}Version 2.3.2{{/i}}
    diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js index 51c04bd20..c1059a83e 100644 --- a/js/bootstrap-affix.js +++ b/js/bootstrap-affix.js @@ -1,6 +1,6 @@ /* ========================================================== - * bootstrap-affix.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#affix + * bootstrap-affix.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#affix * ========================================================== * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 4d7ce8b3e..9577e62de 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -1,6 +1,6 @@ /* ========================================================== - * bootstrap-alert.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#alerts + * bootstrap-alert.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#alerts * ========================================================== * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 40e294cb4..4b2a90ab8 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,6 +1,6 @@ /* ============================================================ - * bootstrap-button.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#buttons + * bootstrap-button.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#buttons * ============================================================ * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 92ee6acef..c1e8ade8b 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,6 +1,6 @@ /* ========================================================== - * bootstrap-carousel.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#carousel + * bootstrap-carousel.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#carousel * ========================================================== * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index d58fb9c4e..ae3e4c63f 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,6 +1,6 @@ /* ============================================================= - * bootstrap-collapse.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#collapse + * bootstrap-collapse.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#collapse * ============================================================= * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 4e5bb777c..d04da5d7b 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,6 +1,6 @@ /* ============================================================ - * bootstrap-dropdown.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#dropdowns + * bootstrap-dropdown.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#dropdowns * ============================================================ * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 21d02127d..fb0b0db83 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,6 +1,6 @@ /* ========================================================= - * bootstrap-modal.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#modals + * bootstrap-modal.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#modals * ========================================================= * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index c532df6a9..2b323b49d 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,6 +1,6 @@ /* =========================================================== - * bootstrap-popover.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#popovers + * bootstrap-popover.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#popovers * =========================================================== * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index 45e2cd107..3ce546118 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -1,6 +1,6 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#scrollspy + * bootstrap-scrollspy.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#scrollspy * ============================================================= * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index ef5f91484..3a132c095 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,6 +1,6 @@ /* ======================================================== - * bootstrap-tab.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#tabs + * bootstrap-tab.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#tabs * ======================================================== * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index b29892c70..acd6096e6 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,6 +1,6 @@ /* =========================================================== - * bootstrap-tooltip.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#tooltips + * bootstrap-tooltip.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== * Copyright 2013 Twitter, Inc. diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index c960ece8e..c4fd401f0 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,6 +1,6 @@ /* =================================================== - * bootstrap-transition.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#transitions + * bootstrap-transition.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#transitions * =================================================== * Copyright 2013 Twitter, Inc. * diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index e7b7ed4e6..9cc84d8e3 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,6 +1,6 @@ /* ============================================================= - * bootstrap-typeahead.js v2.3.3 - * http://getbootstrap.com/2.3.3/javascript.html#typeahead + * bootstrap-typeahead.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#typeahead * ============================================================= * Copyright 2013 Twitter, Inc. * diff --git a/less/bootstrap.less b/less/bootstrap.less index b2b674f66..3eabae144 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.3.3 + * Bootstrap v2.3.2 * * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/less/responsive.less b/less/responsive.less index 4e766095d..3d4c58cab 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.3.3 + * Bootstrap Responsive v2.3.2 * * Copyright 2013 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/package.json b/package.json index 499d37ce8..ff560b1a2 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.3" + , "version": "2.3.2" , "keywords": ["bootstrap", "css"] , "homepage": "http://twbs.github.com/bootstrap/" , "author": "Twitter Inc." From 04b00365da0da573b7cac3c4f0222885700ecef7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 26 Jul 2013 23:16:25 -0700 Subject: [PATCH 11/11] finish bumping copyright --- docs/assets/js/bootstrap-affix.js | 2 +- docs/assets/js/bootstrap-alert.js | 2 +- docs/assets/js/bootstrap-button.js | 2 +- docs/assets/js/bootstrap-carousel.js | 2 +- docs/assets/js/bootstrap-collapse.js | 2 +- docs/assets/js/bootstrap-dropdown.js | 2 +- docs/assets/js/bootstrap-modal.js | 2 +- docs/assets/js/bootstrap-popover.js | 2 +- docs/assets/js/bootstrap-scrollspy.js | 2 +- docs/assets/js/bootstrap-tab.js | 2 +- docs/assets/js/bootstrap-tooltip.js | 2 +- docs/assets/js/bootstrap-transition.js | 2 +- docs/assets/js/bootstrap-typeahead.js | 2 +- docs/assets/js/bootstrap.js | 26 +++++++++++++------------- docs/assets/js/bootstrap.min.js | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/assets/js/bootstrap-affix.js b/docs/assets/js/bootstrap-affix.js index 46cb2fcb8..68ac9e5cf 100644 --- a/docs/assets/js/bootstrap-affix.js +++ b/docs/assets/js/bootstrap-affix.js @@ -2,7 +2,7 @@ * bootstrap-affix.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#affix * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 4f560def4..6711f56f5 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -2,7 +2,7 @@ * bootstrap-alert.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#alerts * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index f8b52eb41..6d7b53d41 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -2,7 +2,7 @@ * bootstrap-button.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 300b86ed2..851c02043 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -2,7 +2,7 @@ * bootstrap-carousel.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#carousel * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 1b6804441..b95ca57fd 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -2,7 +2,7 @@ * bootstrap-collapse.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#collapse * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index f5e3e31f2..a9827dcaa 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -2,7 +2,7 @@ * bootstrap-dropdown.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ============================================================ - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index 1ad9a1640..515767936 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -2,7 +2,7 @@ * bootstrap-modal.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#modals * ========================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index 7d0e27747..aa48b6c9a 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -2,7 +2,7 @@ * bootstrap-popover.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#popovers * =========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index aae25aca9..48eb73829 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -2,7 +2,7 @@ * bootstrap-scrollspy.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index bb3fc439e..d09a6469c 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -2,7 +2,7 @@ * bootstrap-tab.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index dbbf7d27f..c6e130519 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -3,7 +3,7 @@ * http://twbs.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index bf89aac8c..9d5c0e8c8 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -2,7 +2,7 @@ * bootstrap-transition.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#transitions * =================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index d45e6ed57..c5c1597ff 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -2,7 +2,7 @@ * bootstrap-typeahead.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#typeahead * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 5d35ba817..5f7b31857 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -2,7 +2,7 @@ * bootstrap-transition.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#transitions * =================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ * bootstrap-alert.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#alerts * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -159,7 +159,7 @@ * bootstrap-button.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -263,7 +263,7 @@ * bootstrap-carousel.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#carousel * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -469,7 +469,7 @@ * bootstrap-collapse.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#collapse * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -635,7 +635,7 @@ * bootstrap-dropdown.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ============================================================ - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -804,7 +804,7 @@ * bootstrap-modal.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#modals * ========================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1052,7 +1052,7 @@ * http://twbs.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1412,7 +1412,7 @@ * bootstrap-popover.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#popovers * =========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1526,7 +1526,7 @@ * bootstrap-scrollspy.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1687,7 +1687,7 @@ * bootstrap-tab.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1830,7 +1830,7 @@ * bootstrap-typeahead.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#typeahead * ============================================================= - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -2165,7 +2165,7 @@ * bootstrap-affix.js v2.3.2 * http://twbs.github.com/bootstrap/javascript.html#affix * ========================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js index af4eef796..01ae67306 100644 --- a/docs/assets/js/bootstrap.min.js +++ b/docs/assets/js/bootstrap.min.js @@ -1,6 +1,6 @@ /** * Bootstrap.js v2.3.2 by @fat & @mdo -* Copyright 2012 Twitter, Inc. +* Copyright 2013 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ !function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(".dropdown-backdrop").remove(),e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||("ontouchstart"in document.documentElement&&e('
    ').insertBefore(e(this)).on("click",r),s.toggleClass("open")),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

    '}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • ',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file