Skip to content

Commit b4c4072

Browse files
mdomdo
committed
Merge pull request twbs#8637 from twitter/2.3.2-wip
Bump 2.3.2 dependencies and docs links for v3 RC1
2 parents d991ef2 + 04b0036 commit b4c4072

55 files changed

Lines changed: 167 additions & 162 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
## 2.3.2 re-release (July 26, 2013)
2+
3+
Patch to update jQuery in Bower and bump Recess to 1.1.9.
4+
15
## 2.3.2 (May 17, 2013)
2-
- Fix dropdown for firefox (middleclick) and mobile
6+
7+
Fix dropdown for firefox (middleclick) and mobile.
38

49
## 2.3.1 (February 28, 2013)
510

@@ -23,8 +28,8 @@ Minor release to add carousel indicators, improve tooltips, improve dev setup, a
2328
- **Added carousel indicators!** Add the HTML and it automagically works.
2429
- **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.
2530
- 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.
26-
- Improved tooltip alignment on edges with [#6713](https://github.com/twitter/bootstrap/pull/6713).
27-
- **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 `<a>` tags, as well as buttons, navs, dropdowns, and more.
31+
- Improved tooltip alignment on edges with [#6713](https://github.com/twbs/bootstrap/pull/6713).
32+
- **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 `<a>` tags, as well as buttons, navs, dropdowns, and more.
2833
- Added print utility classes to show and hide content between `screen` and `print` via CSS.
2934
- 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 `<input>` styles.
3035
- Added `.horizontal-three-colors()` gradient mixin (with example in the CSS tests file).
@@ -34,7 +39,7 @@ Minor release to add carousel indicators, improve tooltips, improve dev setup, a
3439
- Added [new justified navigation example](https://f.cloud.github.com/assets/98681/25869/5e2f812c-4afa-11e2-9293-501cd689232d.png).
3540
- Added sticky footer with fixed navbar example.
3641

37-
See more on the [2.3.0 pull request](https://github.com/twitter/bootstrap/pull/6346).
42+
See more on the [2.3.0 pull request](https://github.com/twbs/bootstrap/pull/6346).
3843

3944

4045
## 2.2.2 (December 8, 2012)
@@ -49,14 +54,14 @@ Bugfix release addressing docs, CSS, and some JavaScript issues. Key changes inc
4954
- No longer inherits `font-size: 0;` when placed in button groups.
5055
- Arrows refactored to work in IE8, and use less code.
5156
- Plugin no longer inserts popover content into a `<p>`, but rather directly into `.popover-content`.
52-
- **Labels and badges:** Now [automatically collapse](https://github.com/twitter/bootstrap/commit/ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256) if they have no content.
57+
- **Labels and badges:** Now [automatically collapse](https://github.com/twbs/bootstrap/commit/ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256) if they have no content.
5358
- **Tables:** Nesting support with `.table-bordered` and `.table-striped` greatly improved.
5459
- **Typeahead:**
55-
- Now [inserts dropdown menu after the input](https://github.com/twitter/bootstrap/commit/1747caf19d59cad7fdc90ae56a00e0e2849f95f4) instead of at the close of the document.
60+
- Now [inserts dropdown menu after the input](https://github.com/twbs/bootstrap/commit/1747caf19d59cad7fdc90ae56a00e0e2849f95f4) instead of at the close of the document.
5661
- Hitting escape will place focus back on the `<input>`.
5762
- Print styles, from HTML5 Boilerplate, have been added.
5863

59-
See more on the [2.2.2 milestone](https://github.com/twitter/bootstrap/issues?milestone=17&state=closed).
64+
See more on the [2.2.2 milestone](https://github.com/twbs/bootstrap/issues?milestone=17&state=closed).
6065

6166

6267
## 2.2.1 (October 30, 2012)
@@ -68,7 +73,7 @@ Hotfix release to address the carousel bug reports.
6873

6974
### tl;dr
7075

71-
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).
76+
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).
7277

7378
### Highlights
7479

@@ -86,13 +91,13 @@ Hotfix release to address the carousel bug reports.
8691
- Miscellaneous variable improvements across the board.
8792
- Miscellaneous documentation typos fixed.
8893

89-
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)
94+
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)
9095

9196

9297

9398
## 2.1.1 (September 4, 2012)
9499

95-
* 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`.
100+
* 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`.
96101
* Fixed a lot of typos in the docs. Spelling is hard.
97102
* 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.
98103
* Widened `.dl-horizontal dt` and `.horizontal-form .control-group` to better handle the increased font-size.
@@ -103,7 +108,7 @@ For the full list of issues included in this release, visit the [2.2.0 milestone
103108
* Fixed the vertical three color gradient in latest Firefox.
104109
* Reordered some variables that caused errors in certain Less compilers.
105110

106-
View all closed issues on the [2.1.1 milestone](https://github.com/twitter/bootstrap/issues?milestone=14&state=closed).
111+
View all closed issues on the [2.1.1 milestone](https://github.com/twbs/bootstrap/issues?milestone=14&state=closed).
107112

108113

109114
## 2.1.0 (August 20, 2012)
@@ -123,7 +128,7 @@ View all closed issues on the [2.1.1 milestone](https://github.com/twitter/boots
123128
* Fluid grid system variables are no longer fixed percentages
124129
* Removed LESS docs page
125130

126-
For full set of changes, see the completed milestone: https://github.com/twitter/bootstrap/issues?milestone=7&page=1&state=closed
131+
For full set of changes, see the completed milestone: https://github.com/twbs/bootstrap/issues?milestone=7&page=1&state=closed
127132

128133
## 2.0.4 (June 1, 2012)
129134

@@ -280,7 +285,7 @@ Overview of docs changes, bugfixes, and new features.
280285
- Added `.disabled` class support to the pager component (also added a mention of this to the docs)
281286
- Added `.well-large` and `.well-small` classes for extending the well component
282287

283-
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)
288+
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)
284289

285290
## v2.0.1 (February 17, 2012)
286291

@@ -296,10 +301,10 @@ Overview of changes:
296301
- Rearranged Scaffolding docs page to split fixed and fluid grid systems.
297302
- Tons of docs updates for typos and language changes.
298303

299-
For full list of changes, see the now closed [v2.0.1 milestone](https://github.com/twitter/bootstrap/issues?milestone=8&state=closed).
304+
For full list of changes, see the now closed [v2.0.1 milestone](https://github.com/twbs/bootstrap/issues?milestone=8&state=closed).
300305

301306
## v2.0.0 (January 28, 2012)
302-
Complete rewrite of the library. For full details, head to the upgrading doc at http://twitter.github.com/bootstrap/upgrading.html.
307+
Complete rewrite of the library. For full details, head to the upgrading doc at http://twbs.github.com/bootstrap/upgrading.html.
303308

304309
## v1.4.0
305310
### Key bug fixes and changes
@@ -308,7 +313,7 @@ Complete rewrite of the library. For full details, head to the upgrading doc at
308313
- New javascript plugin for button states
309314
- Switched to strict mode for Javascript plugins
310315
- Added more data attribute controls to our plugins
311-
- Full list of 25+ issues fixed: https://github.com/twitter/bootstrap/issues?milestone=6&state=closed
316+
- Full list of 25+ issues fixed: https://github.com/twbs/bootstrap/issues?milestone=6&state=closed
312317

313318
## v1.3.0
314319
### New features

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and bui
7272

7373
## License
7474

75-
By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twitter/bootstrap/blob/master/LICENSE
75+
By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ build:
2828
@echo "Compiling documentation... ${CHECK} Done"
2929
@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
3030
@./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
31-
@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
31+
@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
3232
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
3333
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
3434
@echo "Compiling and minifying javascript... ${CHECK} Done"
@@ -74,7 +74,7 @@ bootstrap/js/*.js: js/*.js
7474
mkdir -p bootstrap/js
7575
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
7676
./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
77-
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
77+
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
7878
cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
7979
rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
8080

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [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)
1+
# [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)
22

33
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).
44

@@ -10,8 +10,8 @@ To get started, checkout [http://getbootstrap.com](http://getbootstrap.com)!
1010

1111
Three quick start options are available:
1212

13-
* [Download the latest release](https://github.com/twitter/bootstrap/zipball/master).
14-
* Clone the repo: `git clone git://github.com/twitter/bootstrap.git`.
13+
* [Download the latest release](https://github.com/twbs/bootstrap/zipball/master).
14+
* Clone the repo: `git clone git://github.com/twbs/bootstrap.git`.
1515
* Install with Twitter's [Bower](http://bower.io): `bower install bootstrap`.
1616

1717

@@ -36,7 +36,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
3636

3737
## Bug tracker
3838

39-
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/).
39+
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/).
4040

4141

4242

component.json renamed to bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "2.3.2",
44
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
55
"dependencies": {
6-
"jquery": "~1.8.0"
6+
"jquery": ">=1.8.0 <2.1.0"
77
}
88
}

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "twitter/bootstrap"
2+
"name": "twbs/bootstrap"
33
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
44
, "keywords": ["bootstrap", "css"]
5-
, "homepage": "http://twitter.github.com/bootstrap/"
5+
, "homepage": "http://twbs.github.com/bootstrap/"
66
, "author": "Twitter Inc."
77
, "license": "Apache-2.0"
88

‎docs/assets/js/bootstrap-affix.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ==========================================================
22
* bootstrap-affix.js v2.3.2
3-
* http://twitter.github.com/bootstrap/javascript.html#affix
3+
* http://twbs.github.com/bootstrap/javascript.html#affix
44
* ==========================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎docs/assets/js/bootstrap-alert.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ==========================================================
22
* bootstrap-alert.js v2.3.2
3-
* http://twitter.github.com/bootstrap/javascript.html#alerts
3+
* http://twbs.github.com/bootstrap/javascript.html#alerts
44
* ==========================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎docs/assets/js/bootstrap-button.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ============================================================
22
* bootstrap-button.js v2.3.2
3-
* http://twitter.github.com/bootstrap/javascript.html#buttons
3+
* http://twbs.github.com/bootstrap/javascript.html#buttons
44
* ============================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎docs/assets/js/bootstrap-carousel.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ==========================================================
22
* bootstrap-carousel.js v2.3.2
3-
* http://twitter.github.com/bootstrap/javascript.html#carousel
3+
* http://twbs.github.com/bootstrap/javascript.html#carousel
44
* ==========================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)