diff options
| author | Mark Otto <[email protected]> | 2013-07-18 18:16:50 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-18 18:16:50 -0700 |
| commit | f771bf140d0ce64ccba63f5295a68600294fdc93 (patch) | |
| tree | 05771837343eda2259192fd07f5b30f3618f5499 /Makefile | |
| parent | 820558916f6b8d7d333de6d4d21404b75fd40fc2 (diff) | |
| parent | 7bb8817947dd6e453dc01a5131bc964a5d74e051 (diff) | |
| download | bootstrap-f771bf140d0ce64ccba63f5295a68600294fdc93.tar.xz bootstrap-f771bf140d0ce64ccba63f5295a68600294fdc93.zip | |
Merge branch 'bs3_rc1' into 3.0.0-wip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1,4 +1,4 @@ -BOOTSTRAP ?= ./docs/assets/css/bootstrap.css +BOOTSTRAP ?= ./dist/css/bootstrap.css BOOTSTRAP_LESS ?= ./less/bootstrap.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔ Done\033[39m @@ -22,14 +22,14 @@ build: @recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @echo " ${CHECK}" @printf "Prepping documentation assets..." - @cp js/tests/vendor/jquery.js docs/assets/js/ + @cp js/tests/vendor/jquery.js assets/js/ @echo " ${CHECK}" @printf "Compiling and minifying JavaScript..." - @cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > docs/assets/js/bootstrap.js - @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js - @echo "/**\n* Bootstrap.js v3.0.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 + @cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js + @uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.tmp.js + @echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > dist/js/copyright.js + @cat dist/js/copyright.js dist/js/bootstrap.min.tmp.js > dist/js/bootstrap.min.js + @rm dist/js/copyright.js dist/js/bootstrap.min.tmp.js @echo " ${CHECK}" @echo "${HR}" @echo "\033[36mSuccess!\n\033[39m" @@ -72,7 +72,7 @@ bootstrap/js/*.js: js/*.js mkdir -p bootstrap/js cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.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 + echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js |