Commit 96953c20 authored by Mark Otto's avatar Mark Otto

update makefile to work again; gitignore the compiled docs _gh_pages folder;...

update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg
parent b57c20a0
# Ignore compiled docs
_gh_pages
# Numerous always-ignore extensions # Numerous always-ignore extensions
*.diff *.diff
*.err *.err
......
BOOTSTRAP = ./assets/css/bootstrap.css BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_LESS = ./less/bootstrap.less
DATE=$(shell date +%I:%M%p) DATE=$(shell date +%I:%M%p)
CHECK=\033[32m✔\033[39m CHECK=\033[32m✔\033[39m
...@@ -18,16 +18,15 @@ build: ...@@ -18,16 +18,15 @@ build:
@echo "Running JSHint on javascript... ${CHECK} Done" @echo "Running JSHint on javascript... ${CHECK} Done"
@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@echo "Compiling LESS with Recess... ${CHECK} Done" @echo "Compiling LESS with Recess... ${CHECK} Done"
# @node docs/build @cp fonts/* docs/assets/fonts/
# @cp fonts/* docs/assets/fonts/ @cp js/*.js docs/assets/js/
# @cp js/*.js docs/assets/js/ @cp js/tests/vendor/jquery.js docs/assets/js/
# @cp js/tests/vendor/jquery.js docs/assets/js/ @echo "Compiling documentation... ${CHECK} Done"
# @echo "Compiling documentation... ${CHECK} Done" @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 js/bootstrap-affix.js > docs/assets/js/bootstrap.js
@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 js/bootstrap-affix.js > assets/js/bootstrap.js @./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
@./node_modules/.bin/uglifyjs -nc assets/js/bootstrap.js > assets/js/bootstrap.min.tmp.js @echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
@echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@cat assets/js/copyright.js assets/js/bootstrap.min.tmp.js > assets/js/bootstrap.min.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
@rm assets/js/copyright.js assets/js/bootstrap.min.tmp.js
@echo "Compiling and minifying javascript... ${CHECK} Done" @echo "Compiling and minifying javascript... ${CHECK} Done"
@echo "\n${HR}" @echo "\n${HR}"
@echo "Bootstrap successfully built at ${DATE}." @echo "Bootstrap successfully built at ${DATE}."
...@@ -103,13 +102,13 @@ bootstrap/fonts/*: fonts/* ...@@ -103,13 +102,13 @@ bootstrap/fonts/*: fonts/*
# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O ) # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
# #
# gh-pages: bootstrap docs gh-pages: bootstrap docs
# rm -f docs/assets/bootstrap.zip rm -f docs/assets/bootstrap.zip
# zip -r docs/assets/bootstrap.zip bootstrap zip -r docs/assets/bootstrap.zip bootstrap
# rm -r bootstrap rm -r bootstrap
# rm -f ../bootstrap-gh-pages/assets/bootstrap.zip rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
# node docs/build production node docs/build production
# cp -r docs/* ../bootstrap-gh-pages cp -r docs/* ../bootstrap-gh-pages
# #
# WATCH LESS FILES # WATCH LESS FILES
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment