aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-01 16:45:25 -0800
committerMark Otto <[email protected]>2012-02-01 16:45:25 -0800
commitf166c5a35b9a037fa0e314ce111812f4b7ef741e (patch)
tree0db9a2a3729291a6c2c57fcbc27105e3b81e9174 /Makefile
parent9b9e1d309bada7983434b092b40b088147a42a2e (diff)
parent87df2304083b7e2da0cc0d43e77a1199948fb3e3 (diff)
downloadbootstrap-f166c5a35b9a037fa0e314ce111812f4b7ef741e.tar.xz
bootstrap-f166c5a35b9a037fa0e314ce111812f4b7ef741e.zip
Merge branch 'master' of github.com:twitter/bootstrap
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5492b8e11..6537aae81 100644
--- a/Makefile
+++ b/Makefile
@@ -38,12 +38,17 @@ bootstrap:
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
#
-# WATCH LESS FILES
+# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
#
-gh-pages:
+gh-pages: docs
+ node docs/build production
cp -r docs/* ../bootstrap-gh-pages
+#
+# WATCH LESS FILES
+#
+
watch:
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"