Commit 573b3f44 authored by Mark Otto's avatar Mark Otto

Version bump

parent 7d597459
......@@ -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"
......
# [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).
......
{
"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"
......
/*!
* Bootstrap Responsive v2.3.2
* Bootstrap Responsive v2.3.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
......
/*!
* Bootstrap v2.3.2
* Bootstrap v2.3.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
......
/* ==========================================================
* bootstrap-affix.js v2.3.2
* bootstrap-affix.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
......
/* ==========================================================
* bootstrap-alert.js v2.3.2
* bootstrap-alert.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
......
/* ============================================================
* bootstrap-button.js v2.3.2
* bootstrap-button.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
......
/* ==========================================================
* bootstrap-carousel.js v2.3.2
* bootstrap-carousel.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
......
/* =============================================================
* bootstrap-collapse.js v2.3.2
* bootstrap-collapse.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
......
/* ============================================================
* bootstrap-dropdown.js v2.3.2
* bootstrap-dropdown.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
......
/* =========================================================
* bootstrap-modal.js v2.3.2
* bootstrap-modal.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
......
/* ===========================================================
* bootstrap-popover.js v2.3.2
* bootstrap-popover.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
......
/* =============================================================
* bootstrap-scrollspy.js v2.3.2
* bootstrap-scrollspy.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
......
/* ========================================================
* bootstrap-tab.js v2.3.2
* bootstrap-tab.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
......
/* ===========================================================
* 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
* ===========================================================
......
/* ===================================================
* bootstrap-transition.js v2.3.2
* bootstrap-transition.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
......
/* =============================================================
* bootstrap-typeahead.js v2.3.2
* bootstrap-typeahead.js v2.3.3
* http://twbs.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
......
/* ===================================================
* 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.
......
/**
* 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
*/
......
......@@ -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.2']);">Download Bootstrap</a>
<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>
</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.2
Version 2.3.3
</li>
</ul>
</div>
......
......@@ -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="assets/bootstrap.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>
<a href="assets/bootstrap.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>
</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.2{{/i}}
{{_i}}Version 2.3.3{{/i}}
</li>
</ul>
</div>
......
/* ==========================================================
* 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.
......
/* ==========================================================
* 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.
......
/* ============================================================
* 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.
......
/* ==========================================================
* 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.
......
/* =============================================================
* 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.
......
/* ============================================================
* 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.
......
/* =========================================================
* 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.
......
/* ===========================================================
* 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.
......
/* =============================================================
* 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.
......
/* ========================================================
* 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.
......
/* ===========================================================
* 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
* ===========================================================
......
/* ===================================================
* 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.
......
/* =============================================================
* 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.
......
/*!
* Bootstrap v2.3.2
* Bootstrap v2.3.3
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
......
/*!
* Bootstrap Responsive v2.3.2
* Bootstrap Responsive v2.3.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
......
{
"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."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment