Version bump

This commit is contained in:
Mark Otto 2012-12-10 18:31:04 -08:00
parent cddca18f12
commit 529ecc5a77
38 changed files with 51 additions and 51 deletions

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
@uglifyjs docs/assets/js/bootstrap.js -nc > docs/assets/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js v2.2.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.2.3 by @fat & @mdo\n* Copyright 2012 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"

View File

@ -1,4 +1,4 @@
# [Twitter Bootstrap v2.2.2](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
# [Twitter Bootstrap v2.2.3](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/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).

View File

@ -1,6 +1,6 @@
{
"name": "bootstrap",
"version": "2.2.2",
"version": "2.2.3",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"dependencies": {
"jquery": "~1.8.0"

View File

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

View File

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

View File

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.2.2
* bootstrap-affix.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.2.2
* bootstrap-alert.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.2.2
* bootstrap-button.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.2.2
* bootstrap-carousel.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.2.2
* bootstrap-collapse.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.2.2
* bootstrap-dropdown.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.2.2
* bootstrap-modal.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.2.2
* bootstrap-popover.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.2.2
* bootstrap-scrollspy.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.2.2
* bootstrap-tab.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.2.2
* bootstrap-tooltip.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================

View File

@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.2
* bootstrap-transition.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.2.2
* bootstrap-typeahead.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.2
* bootstrap-transition.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@ -58,7 +58,7 @@
})
}(window.jQuery);/* ==========================================================
* bootstrap-alert.js v2.2.2
* bootstrap-alert.js v2.2.3
* http://twitter.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.2.2
* bootstrap-button.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@ -260,7 +260,7 @@
})
}(window.jQuery);/* ==========================================================
* bootstrap-carousel.js v2.2.2
* bootstrap-carousel.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@ -444,7 +444,7 @@
})
}(window.jQuery);/* =============================================================
* bootstrap-collapse.js v2.2.2
* bootstrap-collapse.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@ -610,7 +610,7 @@
})
}(window.jQuery);/* ============================================================
* bootstrap-dropdown.js v2.2.2
* bootstrap-dropdown.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@ -770,7 +770,7 @@
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery);/* =========================================================
* bootstrap-modal.js v2.2.2
* bootstrap-modal.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@ -1015,7 +1015,7 @@
}(window.jQuery);
/* ===========================================================
* bootstrap-tooltip.js v2.2.2
* bootstrap-tooltip.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@ -1301,7 +1301,7 @@
}
}(window.jQuery);/* ===========================================================
* bootstrap-popover.js v2.2.2
* bootstrap-popover.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@ -1414,7 +1414,7 @@
}
}(window.jQuery);/* =============================================================
* bootstrap-scrollspy.js v2.2.2
* bootstrap-scrollspy.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@ -1575,7 +1575,7 @@
})
}(window.jQuery);/* ========================================================
* bootstrap-tab.js v2.2.2
* bootstrap-tab.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
@ -1718,7 +1718,7 @@
})
}(window.jQuery);/* =============================================================
* bootstrap-typeahead.js v2.2.2
* bootstrap-typeahead.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
@ -2041,7 +2041,7 @@
}(window.jQuery);
/* ==========================================================
* bootstrap-affix.js v2.2.2
* bootstrap-affix.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/**
* Bootstrap.js v2.2.2 by @fat & @mdo
* Bootstrap.js v2.2.3 by @fat & @mdo
* Copyright 2012 Twitter, Inc.
* http://www.apache.org/licenses/LICENSE-2.0.txt
*/

View File

@ -87,7 +87,7 @@
<a href="./extend.html" >Extend</a>
</li>
<li>
Version 2.2.2
Version 2.2.3
</li>
</ul>
</div>

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="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.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.2.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.2.2{{/i}}
{{_i}}Version 2.2.3{{/i}}
</li>
</ul>
</div>

View File

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.2.2
* bootstrap-affix.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.2.2
* bootstrap-alert.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.2.2
* bootstrap-button.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.2.2
* bootstrap-carousel.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.2.2
* bootstrap-collapse.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.2.2
* bootstrap-dropdown.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.2.2
* bootstrap-modal.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.2.2
* bootstrap-popover.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.2.2
* bootstrap-scrollspy.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.

2
js/bootstrap-tab.js vendored
View File

@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.2.2
* bootstrap-tab.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.2.2
* bootstrap-tooltip.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================

View File

@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.2
* bootstrap-transition.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.

View File

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.2.2
* bootstrap-typeahead.js v2.2.3
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.

2
less/bootstrap.less vendored
View File

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

View File

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

View File

@ -1,7 +1,7 @@
{
"name": "bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "version": "2.2.2"
, "version": "2.2.3"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twitter.github.com/bootstrap/"
, "author": "Twitter Inc."