aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-04-16 15:09:26 -0700
committerJacob Thornton <[email protected]>2012-04-16 15:09:26 -0700
commit457859feba3ca9a64a23dd38a4d65e3faad11b04 (patch)
tree988a2054ece443f35d3e83f65013288a3eb08753 /Makefile
parent498b7d984a8182442e2f543eedff6542c628cd55 (diff)
parent5fa0fcc888bdeb5210b03445045ba61bdf7b0034 (diff)
downloadbootstrap-457859feba3ca9a64a23dd38a4d65e3faad11b04.tar.xz
bootstrap-457859feba3ca9a64a23dd38a4d65e3faad11b04.zip
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 78d1a8407..ecb7a0040 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,11 @@ docs:
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
+ 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 > docs/assets/js/bootstrap.js
+ uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/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*/" > 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
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY