From: Mark Otto <otto@github.com>
Date: Mon, 18 Feb 2013 00:56:30 +0000 (-0800)
Subject: Resolve conflicts
X-Git-Tag: v3.0.0-rc1~609^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6663a35562a19d659fc16c8e2711479300a439f4;p=thirdparty%2Fbootstrap.git

Resolve conflicts
---

6663a35562a19d659fc16c8e2711479300a439f4
diff --cc Makefile
index 57393d1049,19ddd3a29b..8beabf75fe
--- a/Makefile
+++ b/Makefile
@@@ -1,36 -1,44 +1,42 @@@
- BOOTSTRAP = ./docs/assets/css/bootstrap.css
- BOOTSTRAP_LESS = ./less/bootstrap.less
+ BOOTSTRAP ?= ./docs/assets/css/bootstrap.css
+ BOOTSTRAP_LESS ?= ./less/bootstrap.less
  DATE=$(shell date +%I:%M%p)
 -CHECK=\033[32m✔\033[39m
 -HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
 +CHECK=\033[32m✔ Done\033[39m
 +HR=\033[37m--------------------------------------------------\033[39m
+ PATH := ./node_modules/.bin:$(PATH)
+ 
  
  #
  # BUILD DOCS
  #
  
  build:
 -	@echo "\n${HR}"
 -	@echo "Building Bootstrap..."
 -	@echo "${HR}\n"
 +	@echo "\n\n"
 +	@echo "\033[36mBuilding Bootstrap...\033[39m"
 +	@echo "${HR}"
+ 	@printf "Running JSHint on javascript..."
  	@jshint js/*.js --config js/.jshintrc
  	@jshint js/tests/unit/*.js --config js/.jshintrc
- 	@echo "Running JSHint on javascript...             ${CHECK}"
- 	@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
- 	@echo "Compiling LESS with Recess...               ${CHECK}"
+ 	@echo "             ${CHECK} Done"
+ 	@printf "Compiling LESS with Recess..."
+ 	@recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
+ 	@echo "               ${CHECK} Done"
 -	@printf "Compiling documentation..."
 -	@node docs/build
++	@printf "Prepping fonts and JavaScript..."
  	@cp fonts/* docs/assets/fonts/
  	@cp js/*.js docs/assets/js/
  	@cp js/tests/vendor/jquery.js docs/assets/js/
- 	@echo "Prepping fonts and JavaScript...            ${CHECK}"
 -	@echo "                  ${CHECK} Done"
++	@echo "            ${CHECK} Done"
+ 	@printf "Compiling and minifying javascript..."
  	@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 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
+ 	@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
+ 	@echo "/**\n* Bootstrap.js v2.3.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
  	@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}"
+ 	@echo "       ${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"
 +	@echo "${HR}"
 +	@echo "\033[36mSuccess!\n\033[39m"
 +	@echo "\033[37mThanks for using Bootstrap,"
 +	@echo "<3 @mdo and @fat\n\033[39m"
  
  #
  # RUN JSHINT & QUNIT TESTS IN PHANTOMJS