rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert to 2.3.2 tag instead

Browse source
This commit is contained in:
Mark Otto 2013-07-26 23:12:54 -07:00
parent aadc76694d
commit 92fd785e97
41 changed files with 71 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -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)

2
Makefile
View file

@ -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"

2
README.md
View file

@ -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).

2
bower.json
View file

@ -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"

2
docs/assets/css/bootstrap-responsive.css vendored
View file

@ -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

2
docs/assets/css/bootstrap.css vendored
View file

@ -1,5 +1,5 @@
/*!
* Bootstrap v2.3.3
* Bootstrap v2.3.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0

2
docs/assets/js/bootstrap-affix.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-alert.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-button.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-carousel.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-collapse.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-dropdown.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-modal.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-popover.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-scrollspy.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-tab.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-tooltip.js vendored
View file

@ -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
* ===========================================================

2
docs/assets/js/bootstrap-transition.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap-typeahead.js vendored
View file

@ -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.

26
docs/assets/js/bootstrap.js vendored
View file

@ -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.

2
docs/assets/js/bootstrap.min.js vendored
View file

@ -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
*/

2
docs/customize.html
View file

@ -84,7 +84,7 @@
<header class="jumbotron subhead" id="overview">
<div class="container">
<h1>Customize and download</h1>
<p class="lead"><a href="https://github.com/twitter/bootstrap/archive/v2.3.3.zip">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.</p>
<p class="lead"><a href="https://github.com/twitter/bootstrap/archive/v2.3.2.zip">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.</p>
</div>
</header>

4
docs/index.html
View file

@ -84,7 +84,7 @@
<h1>Bootstrap</h1>
<p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
<p>
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.3.3']);">Download Bootstrap</a>
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.3.2']);">Download Bootstrap</a>
</p>
<ul class="masthead-links">
<li>
@ -97,7 +97,7 @@
<a href="./extend.html" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);">Extend</a>
</li>
<li>
Version 2.3.3
Version 2.3.2
</li>
</ul>
</div>

2
docs/templates/pages/customize.mustache vendored
View file

@ -3,7 +3,7 @@
<header class="jumbotron subhead" id="overview">
<div class="container">
<h1>{{_i}}Customize and download{{/i}}</h1>
<p class="lead">{{_i}}<a href="https://github.com/twbs/bootstrap/archive/v2.3.3.zip">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.{{/i}}</p>
<p class="lead">{{_i}}<a href="https://github.com/twbs/bootstrap/archive/v2.3.2.zip">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.{{/i}}</p>
</div>
</header>

4
docs/templates/pages/index.mustache vendored
View file

@ -3,7 +3,7 @@
<h1>{{_i}}Bootstrap{{/i}}</h1>
<p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p>
<p>
<a href="https://github.com/twbs/bootstrap/archive/v2.3.3.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.3.3']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
<a href="https://github.com/twbs/bootstrap/archive/v2.3.2.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.3.2']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
</p>
<ul class="masthead-links">
<li>
@ -16,7 +16,7 @@
<a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a>
</li>
<li>
{{_i}}Version 2.3.3{{/i}}
{{_i}}Version 2.3.2{{/i}}
</li>
</ul>
</div>

4
js/bootstrap-affix.js vendored
View file

@ -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.
*

4
js/bootstrap-alert.js vendored
View file

@ -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.
*

4
js/bootstrap-button.js vendored
View file

@ -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.
*

4
js/bootstrap-carousel.js vendored
View file

@ -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.
*

4
js/bootstrap-collapse.js vendored
View file

@ -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.
*

4
js/bootstrap-dropdown.js vendored
View file

@ -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.
*

4
js/bootstrap-modal.js vendored
View file

@ -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.
*

4
js/bootstrap-popover.js vendored
View file

@ -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.
*

4
js/bootstrap-scrollspy.js vendored
View file

@ -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.
*

4
js/bootstrap-tab.js vendored
View file

@ -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.
*

4
js/bootstrap-tooltip.js vendored
View file

@ -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.

4
js/bootstrap-transition.js vendored
View file

@ -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.
*

4
js/bootstrap-typeahead.js vendored
View file

@ -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.
*

2
less/bootstrap.less vendored
View file

@ -1,5 +1,5 @@
/*!
* Bootstrap v2.3.3
* Bootstrap v2.3.2
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0

2
less/responsive.less
View file

@ -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

2
package.json
View file

@ -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."