diff --git a/Makefile b/Makefile index 923c0ced34ab..0331964230d5 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,10 @@ bootstrap: lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css lessc --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.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 + 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 # # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O ) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c07368a2aa4b..48e8324e3987 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index 4ecd5c12f395..5041b8043b9c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - Bootstrap, from Twitter + Bootstrap