diff options
| author | Mark Otto <[email protected]> | 2012-04-14 17:16:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-14 17:16:37 -0700 |
| commit | ce30d19c1507e71199f7dbbf680cf0d2b0ea6477 (patch) | |
| tree | 1279731abc8cf141a3fd683282ad2cae32ae6653 /Makefile | |
| parent | dbde2dc9e40f077af4fcaa1714ade7bc94398da9 (diff) | |
| parent | 3408064d00bc1e4322c3ea1575bc2cab5aaa2be2 (diff) | |
| download | bootstrap-ce30d19c1507e71199f7dbbf680cf0d2b0ea6477.tar.xz bootstrap-ce30d19c1507e71199f7dbbf680cf0d2b0ea6477.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -34,6 +34,8 @@ bootstrap: lessc --yui-compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css lessc --yui-compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css + jshint js/*.js --config js/.jshintrc + jshint js/tests/unit/*.js --config js/.jshintrc 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 > bootstrap/js/bootstrap.js uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js 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 |