diff options
| author | Mark Otto <[email protected]> | 2012-01-31 14:30:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-31 14:30:07 -0800 |
| commit | c84b5cf5f52ad9be72adf9de2956baad1d6e025b (patch) | |
| tree | 60c9078f26909fb48ad714d227f2bd0014060543 /Makefile | |
| parent | 6cf79a5b8e13e8c1e2919da9e334cc6c9275ab9b (diff) | |
| parent | 80a752f52508ed8c2405da233c667210ed1d5379 (diff) | |
| download | bootstrap-c84b5cf5f52ad9be72adf9de2956baad1d6e025b.tar.xz bootstrap-c84b5cf5f52ad9be72adf9de2956baad1d6e025b.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -16,6 +16,8 @@ docs: bootstrap lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} node docs/build cp img/* docs/assets/img/ + cp js/*.js docs/assets/js/ + cp js/tests/vendor/jquery.js docs/assets/js/ # # BUILD SIMPLE BOOTSTRAP DIRECTORY @@ -38,9 +40,12 @@ bootstrap: # WATCH LESS FILES # +gh-pages: + cp -r docs/* ../bootstrap-gh-pages + watch: echo "Watching less files..."; \ watchr -e "watch('less/.*\.less') { system 'make' }" -.PHONY: dist docs watch
\ No newline at end of file +.PHONY: dist docs watch gh-pages
\ No newline at end of file |