diff options
| author | Mark Otto <[email protected]> | 2013-05-16 18:46:19 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-16 18:46:19 -0700 |
| commit | bdd50228331128668be6e9cd68e1f6794b620243 (patch) | |
| tree | ed94717ce410020a0389b20b2b49c363ab4fad1a /Makefile | |
| parent | c73588b3132b8c848f10561ad8f946f8c58a636b (diff) | |
| parent | 5ab72f76878a85f105702a24096268fea73fba2d (diff) | |
| download | bootstrap-bdd50228331128668be6e9cd68e1f6794b620243.tar.xz bootstrap-bdd50228331128668be6e9cd68e1f6794b620243.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -23,7 +23,6 @@ build: @echo " ${CHECK}" @printf "Prepping documentation assets..." @cp fonts/* docs/assets/fonts/ - @cp js/*.js docs/assets/js/ @cp js/tests/vendor/jquery.js docs/assets/js/ @echo " ${CHECK}" @printf "Compiling and minifying JavaScript..." @@ -120,5 +119,11 @@ watch: echo "Watching less files..."; \ watchr -e "watch('less/.*\.less') { system 'make' }" +# +# BUILD AND START SERVER +# + +run: build + jekyll build && jekyll server .PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js |