aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-15 17:25:38 -0700
committerMark Otto <[email protected]>2012-04-15 17:25:38 -0700
commit41b695b8cd171578c78f740d902abcfae62bf7e3 (patch)
tree94121f949dbf117a42f6ced75c3a9a8ff82a232a /Makefile
parenta184806538b102614626b0dd1683065db4ce07d3 (diff)
parent6cf9906a60faa17c0463932c761b8280e9dce63c (diff)
downloadbootstrap-41b695b8cd171578c78f740d902abcfae62bf7e3.tar.xz
bootstrap-41b695b8cd171578c78f740d902abcfae62bf7e3.zip
Merge branch '2.0.3-wip' of 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