From: Mark Otto <markotto@twitter.com>
Date: Sat, 7 Apr 2012 21:56:37 +0000 (-0700)
Subject: use yui-compress by default instead of regular compress
X-Git-Tag: v2.0.3~5^2~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5591a9b96668c0f151872ce5f473a968d042a73c;p=thirdparty%2Fbootstrap.git

use yui-compress by default instead of regular compress
---

diff --git a/Makefile b/Makefile
index 768d59e1f3..59cd451b72 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 45b05f39fa..0000000000
Binary files a/docs/assets/bootstrap.zip and /dev/null differ