diff options
-rw-r--r-- | Makefile | 53 | ||||
-rw-r--r-- | docs/assets/bootstrap.zip | bin | 0 -> 50335 bytes | |||
-rw-r--r-- | docs/index.html | 2 | ||||
-rw-r--r-- | docs/templates/pages/index.mustache | 2 |
4 files changed, 34 insertions, 23 deletions
@@ -6,31 +6,42 @@ LESS_COMPRESSOR ?= `which lessc` WATCHR ?= `which watchr` # -# Build less files + docs +# BUILD DOCS # -build: - @if test ! -z ${LESS_COMPRESSOR}; then \ - lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \ - lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \ - node docs/build; \ - cp img/* docs/assets/img/; \ - else \ - echo "You must have the LESS compiler installed in order to build Bootstrap."; \ - echo "You can install it by running: npm install less -g"; \ - fi +docs: dist + cp -r dist bootstrap + zip -r docs/assets/bootstrap.zip bootstrap + rm -r bootstrap + lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP} + lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} + node docs/build + cp img/* docs/assets/img/ # -# Watch less files +# BUILD SIMPLE DIST DIRECTORY +# lessc & uglifyjs are required +# + +dist: + mkdir -p dist/img + mkdir -p dist/css + mkdir -p dist/js + cp img/* dist/img/ + lessc ${BOOTSTRAP_LESS} > dist/css/bootstrap.css + lessc --compress ${BOOTSTRAP_LESS} > dist/css/bootstrap.min.css + lessc ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.responsive + lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.min.responsive + 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 > dist/js/bootstrap.js + uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.js + +# +# WATCH LESS FILES # watch: - @if test ! -z ${WATCHR}; then \ - echo "Watching less files..."; \ - watchr -e "watch('less/.*\.less') { system 'make' }"; \ - else \ - echo "You must have the watchr installed in order to watch Bootstrap Less files."; \ - echo "You can install it by running: gem install watchr"; \ - fi - -.PHONY: build watch
\ No newline at end of file + echo "Watching less files..."; \ + watchr -e "watch('less/.*\.less') { system 'make' }" + + +.PHONY: dist docs watch
\ No newline at end of file diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differnew file mode 100644 index 0000000000..0e691e2907 --- /dev/null +++ b/docs/assets/bootstrap.zip diff --git a/docs/index.html b/docs/index.html index 89f5accd68..3ecc7718f8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -80,7 +80,7 @@ <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p> <p class="download-info"> <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View project on GitHub</a> - <a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">Download Bootstrap</a> + <a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap</a> </p> <div class="benefits"> <h4>Feature highlights</h4> diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 5fa70645a6..7a98afa07d 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -8,7 +8,7 @@ <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p> <p class="download-info"> <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a> - <a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a> + <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a> </p> <div class="benefits"> <h4>{{_i}}Feature highlights{{/i}}</h4> |