• Mark Otto's avatar
    Merge branch '2.2.3' into 3.0.0-wip · 72f13e28
    Mark Otto authored
    Conflicts:
    	Makefile
    	README.md
    	component.json
    	docs/assets/css/bootstrap-responsive.css
    	docs/assets/css/bootstrap.css
    	docs/assets/js/bootstrap-affix.js
    	docs/assets/js/bootstrap-alert.js
    	docs/assets/js/bootstrap-button.js
    	docs/assets/js/bootstrap-carousel.js
    	docs/assets/js/bootstrap-collapse.js
    	docs/assets/js/bootstrap-dropdown.js
    	docs/assets/js/bootstrap-modal.js
    	docs/assets/js/bootstrap-popover.js
    	docs/assets/js/bootstrap-scrollspy.js
    	docs/assets/js/bootstrap-tab.js
    	docs/assets/js/bootstrap-tooltip.js
    	docs/assets/js/bootstrap-transition.js
    	docs/assets/js/bootstrap-typeahead.js
    	docs/assets/js/bootstrap.js
    	docs/assets/js/bootstrap.min.js
    	docs/index.html
    	docs/templates/pages/base-css.mustache
    	docs/templates/pages/index.mustache
    	docs/templates/pages/javascript.mustache
    	js/bootstrap-affix.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-popover.js
    	js/bootstrap-scrollspy.js
    	js/bootstrap-tab.js
    	js/bootstrap-tooltip.js
    	js/bootstrap-transition.js
    	js/bootstrap-typeahead.js
    	less/bootstrap.less
    	less/responsive.less
    	less/type.less
    	package.json
    72f13e28
Makefile 3.69 KiB
BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
DATE=$(shell date +%I:%M%p)
CHECK=\033[32m✔\033[39m
HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
# BUILD DOCS
build:
	@echo "\n${HR}"
	@echo "Building Bootstrap..."
	@echo "${HR}\n"
	@jshint js/*.js --config js/.jshintrc
	@jshint js/tests/unit/*.js --config js/.jshintrc
	@echo "Running JSHint on javascript...             ${CHECK} Done"
	@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
	@echo "Compiling LESS with Recess...               ${CHECK} Done"
	@node docs/build
	@cp fonts/* docs/assets/fonts/
	@cp js/*.js docs/assets/js/
	@cp js/tests/vendor/jquery.js docs/assets/js/
	@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
	@./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
	@echo "/**\n* Bootstrap.js v2.2.3 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
	@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
	@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
	@echo "Compiling and minifying javascript...       ${CHECK} Done"
	@echo "\n${HR}"
	@echo "Bootstrap successfully built at ${DATE}."
	@echo "${HR}\n"
	@echo "Thanks for using Bootstrap,"
	@echo "<3 @mdo and @fat\n"
# RUN JSHINT & QUNIT TESTS IN PHANTOMJS
test:
	./node_modules/.bin/jshint js/*.js --config js/.jshintrc
	./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc
	node js/tests/server.js &
	phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
	kill -9 `cat js/tests/pid.txt`
	rm js/tests/pid.txt
# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
clean:
	rm -r bootstrap
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# recess & uglifyjs are required
bootstrap:
	mkdir -p bootstrap/fonts
	mkdir -p bootstrap/css
	mkdir -p bootstrap/js
	cp fonts/* bootstrap/fonts/
	./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
	./node_modules/.bin/recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
	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 > bootstrap/js/bootstrap.js
	./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
7172737475767778798081828384858687888990919293949596
echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js # # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O ) # gh-pages: bootstrap docs rm -f docs/assets/bootstrap.zip zip -r docs/assets/bootstrap.zip bootstrap rm -r bootstrap rm -f ../bootstrap-gh-pages/assets/bootstrap.zip 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' }" .PHONY: docs watch gh-pages