Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Dec 23, 2012
1 parent 7f70393 commit f74990d
Show file tree
Hide file tree
Showing 38 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
@echo "/**\n* Bootstrap.js v2.3.0 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"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img src="http://twitter.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px">
</a>

# [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 v2.3.0](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).

Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
"version": "2.2.3",
"version": "2.3.0",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"dependencies": {
"jquery": "~1.8.0"
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/css/bootstrap-responsive.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.2.3
* Bootstrap Responsive v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/css/bootstrap.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.2.3
* Bootstrap v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-affix.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.2.3
* bootstrap-affix.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.2.3
* bootstrap-alert.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-button.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.2.3
* bootstrap-button.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.2.3
* bootstrap-carousel.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-collapse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.2.3
* bootstrap-collapse.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.2.3
* bootstrap-dropdown.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.2.3
* bootstrap-modal.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-popover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.2.3
* bootstrap-popover.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-scrollspy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.2.3
* bootstrap-scrollspy.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.2.3
* bootstrap-tab.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-tooltip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.2.3
* bootstrap-tooltip.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-transition.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.3
* bootstrap-transition.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap-typeahead.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.2.3
* bootstrap-typeahead.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
26 changes: 13 additions & 13 deletions docs/assets/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.3
* bootstrap-transition.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -58,7 +58,7 @@
})

}(window.jQuery);/* ==========================================================
* bootstrap-alert.js v2.2.3
* bootstrap-alert.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -156,7 +156,7 @@
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)

}(window.jQuery);/* ============================================================
* bootstrap-button.js v2.2.3
* bootstrap-button.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -260,7 +260,7 @@
})

}(window.jQuery);/* ==========================================================
* bootstrap-carousel.js v2.2.3
* bootstrap-carousel.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -458,7 +458,7 @@
})

}(window.jQuery);/* =============================================================
* bootstrap-collapse.js v2.2.3
* bootstrap-collapse.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -624,7 +624,7 @@
})

}(window.jQuery);/* ============================================================
* bootstrap-dropdown.js v2.2.3
* bootstrap-dropdown.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -785,7 +785,7 @@
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

}(window.jQuery);/* =========================================================
* bootstrap-modal.js v2.2.3
* bootstrap-modal.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -1029,7 +1029,7 @@

}(window.jQuery);
/* ===========================================================
* bootstrap-tooltip.js v2.2.3
* bootstrap-tooltip.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
Expand Down Expand Up @@ -1313,7 +1313,7 @@
}

}(window.jQuery);/* ===========================================================
* bootstrap-popover.js v2.2.3
* bootstrap-popover.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -1426,7 +1426,7 @@
}

}(window.jQuery);/* =============================================================
* bootstrap-scrollspy.js v2.2.3
* bootstrap-scrollspy.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -1587,7 +1587,7 @@
})

}(window.jQuery);/* ========================================================
* bootstrap-tab.js v2.2.3
* bootstrap-tab.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -1730,7 +1730,7 @@
})

}(window.jQuery);/* =============================================================
* bootstrap-typeahead.js v2.2.3
* bootstrap-typeahead.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -2066,7 +2066,7 @@

}(window.jQuery);
/* ==========================================================
* bootstrap-affix.js v2.2.3
* bootstrap-affix.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/bootstrap.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h1>Bootstrap</h1>
<a href="./extend.html" >Extend</a>
</li>
<li>
Version 2.2.3
Version 2.3.0
</li>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/templates/pages/index.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -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.3']);"{{/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.0']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
</p>
<ul class="masthead-links">
<li>
Expand All @@ -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.3{{/i}}
{{_i}}Version 2.3.0{{/i}}
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-affix.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.2.3
* bootstrap-affix.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.2.3
* bootstrap-alert.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-button.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.2.3
* bootstrap-button.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.2.3
* bootstrap-carousel.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-collapse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.2.3
* bootstrap-collapse.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.2.3
* bootstrap-dropdown.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.2.3
* bootstrap-modal.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-popover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.2.3
* bootstrap-popover.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-scrollspy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.2.3
* bootstrap-scrollspy.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.2.3
* bootstrap-tab.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-tooltip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.2.3
* bootstrap-tooltip.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-transition.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.2.3
* bootstrap-transition.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-typeahead.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.2.3
* bootstrap-typeahead.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
Expand Down
2 changes: 1 addition & 1 deletion less/bootstrap.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.2.3
* Bootstrap v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down
2 changes: 1 addition & 1 deletion less/responsive.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.2.3
* Bootstrap Responsive v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "version": "2.2.3"
, "version": "2.3.0"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twitter.github.com/bootstrap/"
, "author": "Twitter Inc."
Expand Down

0 comments on commit f74990d

Please sign in to comment.