aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-07 14:56:37 -0700
committerMark Otto <[email protected]>2012-04-07 14:56:37 -0700
commit5591a9b96668c0f151872ce5f473a968d042a73c (patch)
tree6d74cdae153716a7102efe58b2d4018425d22339
parent798363eda743f4e04bf8dd30964ee97f49e86a79 (diff)
downloadbootstrap-5591a9b96668c0f151872ce5f473a968d042a73c.tar.xz
bootstrap-5591a9b96668c0f151872ce5f473a968d042a73c.zip
use yui-compress by default instead of regular compress
-rw-r--r--Makefile4
-rw-r--r--docs/assets/bootstrap.zipbin57304 -> 0 bytes
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 768d59e1f..59cd451b7 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ bootstrap:
mkdir -p bootstrap/js
cp img/* bootstrap/img/
lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
- lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
+ lessc --yui-compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
- lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
+ lessc --yui-compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
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
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
deleted file mode 100644
index 45b05f39f..000000000
--- a/docs/assets/bootstrap.zip
+++ /dev/null
Binary files differ