diff options
| author | fat-kun <[email protected]> | 2013-02-28 21:24:27 -0800 |
|---|---|---|
| committer | fat-kun <[email protected]> | 2013-02-28 21:24:27 -0800 |
| commit | eb24718add4dd36fe92fdbdb79e6ff4ce5919300 (patch) | |
| tree | c85d91c9cb9b0b54f48f6747aa08d7db81eafce0 /Makefile | |
| parent | 16111a5e454a8af4407f4217b5defb6d7a9bdbd3 (diff) | |
| parent | 6b2a010357e184e670a2f4768e37d4886e8a6597 (diff) | |
| download | bootstrap-2.3.1.tar.xz bootstrap-2.3.1.zip | |
Merge pull request #7111 from twitter/2.3.1-wipv2.3.1
2.3.1 wip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -15,8 +15,8 @@ build: @echo "\n${HR}" @echo "Building Bootstrap..." @echo "${HR}\n" - @jshint js/*.js --config js/.jshintrc - @jshint js/tests/unit/*.js --config js/.jshintrc + @./node_modules/.bin/jshint js/*.js --config js/.jshintrc + @./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc @echo "Running JSHint on javascript... ${CHECK} Done" @./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} @@ -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.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 + @echo "/**\n* Bootstrap.js v2.3.1 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" |