From bc65b58551575c9dfb2e4d9f4f7af97009e39432 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 20 Nov 2011 20:58:04 -0800
Subject: merge in js from 1.4... start working through js docs

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b3dce89ac..294f0ed72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.2.0
+VERSION=2.0.0
 DATE=$(shell DATE)
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
-- 
cgit v1.2.3


From 36a7eb3851855b608266f301a63b561ac316bca9 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 20 Nov 2011 21:36:26 -0800
Subject: add build script for minified files and allow elements to be returned
 to getContent and title in popovers

---
 Makefile | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 294f0ed72..e5c083ae6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
 LESS_COMPESSOR ?= `which lessc`
+UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
 
 build:
@@ -18,6 +19,24 @@ build:
 		echo "You can install it by running: npm install less -g"; \
 	fi
 
+uglify:
+	@@if test ! -z ${UGLIFY_JS}; then \
+		mkdir -p js/min; \
+		uglifyjs -o js/min/bootstrap-accordion.js js/bootstrap-accordion.js;\
+		uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alerts.js;\
+		uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-buttons.js;\
+		uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\
+		uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\
+		uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\
+		uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\
+		uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tabs.js;\
+		uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transitions.js;\
+		uglifyjs -o js/min/bootstrap-twipsy.js js/bootstrap-twipsy.js;\
+	else \
+		echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
+		echo "You can install it by running: npm install uglify-js -g"; \
+	fi
+
 watch:
 	@@if test ! -z ${WATCHR}; then \
 	  echo "Watching less files..."; \
-- 
cgit v1.2.3


From 6d5b5065176a9e46ce71ec5fc16ae4a079e9e636 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 21 Dec 2011 17:38:05 -0800
Subject: minor cleanups

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e5c083ae6..1f38338f8 100644
--- a/Makefile
+++ b/Makefile
@@ -22,15 +22,16 @@ build:
 uglify:
 	@@if test ! -z ${UGLIFY_JS}; then \
 		mkdir -p js/min; \
-		uglifyjs -o js/min/bootstrap-accordion.js js/bootstrap-accordion.js;\
-		uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alerts.js;\
-		uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-buttons.js;\
+		uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alert.js;\
+		uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-button.js;\
+		uglifyjs -o js/min/bootstrap-carousel.js js/bootstrap-carousel.js;\
+		uglifyjs -o js/min/bootstrap-collapse.js js/bootstrap-collapse.js;\
 		uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\
 		uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\
 		uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\
 		uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\
-		uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tabs.js;\
-		uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transitions.js;\
+		uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tab.js;\
+		uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transition.js;\
 		uglifyjs -o js/min/bootstrap-twipsy.js js/bootstrap-twipsy.js;\
 	else \
 		echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
-- 
cgit v1.2.3


From 076370f3f9076b177a1f9c8ba9f536faa1a58957 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 24 Dec 2011 22:31:39 -0800
Subject: fix for linux

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1f38338f8..3d24eb1c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 VERSION=2.0.0
-DATE=$(shell DATE)
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
@@ -9,7 +8,7 @@ WATCHR ?= `which watchr`
 
 build:
 	@@if test ! -z ${LESS_COMPESSOR}; then \
-		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
+		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
 		rm -f ${BOOTSTRAP_LESS}.tmp; \
-- 
cgit v1.2.3


From 5801c4d766205c6f1579b9c45e733df5dba3b1fe Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 27 Dec 2011 13:51:50 -0600
Subject: capitalize Less in makefile, add print less file (not yet compiled)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3d24eb1c5..5eee74f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ watch:
 	  echo "Watching less files..."; \
 	  watchr -e "watch('lib/.*\.less') { system 'make' }"; \
 	else \
-		echo "You must have the watchr installed in order to watch Bootstrap less files."; \
+		echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
 		echo "You can install it by running: gem install watchr"; \
 	fi
 
-- 
cgit v1.2.3


From 6f2f947a4309a8fdeb7067612447c0f1a15dcfd9 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 11 Jan 2012 21:42:55 -0800
Subject: add build tool for js +  rename twipsy to tooltip + lots of little
 doc cleanup

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5eee74f2e..0dddb13dd 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ uglify:
 		uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\
 		uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tab.js;\
 		uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transition.js;\
-		uglifyjs -o js/min/bootstrap-twipsy.js js/bootstrap-twipsy.js;\
+		uglifyjs -o js/min/bootstrap-tooltip.js js/bootstrap-tooltip.js;\
 	else \
 		echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
 		echo "You can install it by running: npm install uglify-js -g"; \
-- 
cgit v1.2.3


From f764aee4b919c28974dba7b91edac9a04172ba25 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 23 Jan 2012 14:14:16 -0800
Subject: add templates for doc generation

---
 Makefile | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0dddb13dd..05ac49168 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,10 @@ LESS_COMPESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
 
+#
+# Build less files
+#
+
 build:
 	@@if test ! -z ${LESS_COMPESSOR}; then \
 		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
@@ -18,24 +22,9 @@ build:
 		echo "You can install it by running: npm install less -g"; \
 	fi
 
-uglify:
-	@@if test ! -z ${UGLIFY_JS}; then \
-		mkdir -p js/min; \
-		uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alert.js;\
-		uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-button.js;\
-		uglifyjs -o js/min/bootstrap-carousel.js js/bootstrap-carousel.js;\
-		uglifyjs -o js/min/bootstrap-collapse.js js/bootstrap-collapse.js;\
-		uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\
-		uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\
-		uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\
-		uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\
-		uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tab.js;\
-		uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transition.js;\
-		uglifyjs -o js/min/bootstrap-tooltip.js js/bootstrap-tooltip.js;\
-	else \
-		echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
-		echo "You can install it by running: npm install uglify-js -g"; \
-	fi
+#
+# Watch less files
+#
 
 watch:
 	@@if test ! -z ${WATCHR}; then \
@@ -46,4 +35,12 @@ watch:
 		echo "You can install it by running: gem install watchr"; \
 	fi
 
-.PHONY: build watch
\ No newline at end of file
+#
+# Build docs from templates
+#
+
+docs:
+	@ node docs/build
+
+
+.PHONY: build watch docs
\ No newline at end of file
-- 
cgit v1.2.3


From 54f04d3b13a1103a1e45e5ad2290cd55fe96ffea Mon Sep 17 00:00:00 2001
From: Marc Chung <mchung@gmail.com>
Date: Tue, 24 Jan 2012 12:37:57 -0700
Subject: Fixed typo in Makefile

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 05ac49168..f4324e566 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION=2.0.0
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
-LESS_COMPESSOR ?= `which lessc`
+LESS_COMPRESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
 
@@ -11,7 +11,7 @@ WATCHR ?= `which watchr`
 #
 
 build:
-	@@if test ! -z ${LESS_COMPESSOR}; then \
+	@@if test ! -z ${LESS_COMPRESSOR}; then \
 		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
-- 
cgit v1.2.3


From 9553b1e3e9457a48b6da3724c906a36f935aa526 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 10:02:52 -0800
Subject: update docs to include separate responsive css, update docs to
 highlight proper file name, updated makefile to build responsive separately

---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f4324e566..612f77fdf 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ VERSION=2.0.0
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
+BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css
+BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css
+BOOTSTRAP_RESPONSIVE_LESS = ./lib/responsive.less
 LESS_COMPRESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
@@ -16,6 +19,10 @@ build:
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
 		rm -f ${BOOTSTRAP_LESS}.tmp; \
+		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
+		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
+		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE_MIN} --compress; \
+		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
 		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
-- 
cgit v1.2.3


From dc2deb9a1b1995bbabee91bfd579d9b466fe78f2 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 26 Jan 2012 21:48:46 -0800
Subject: moving structure around + more work on builder...

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 612f77fdf..337baf03f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 VERSION=2.0.0
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
-BOOTSTRAP_LESS = ./lib/bootstrap.less
+BOOTSTRAP_LESS = ./less/bootstrap.less
 BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css
 BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css
-BOOTSTRAP_RESPONSIVE_LESS = ./lib/responsive.less
+BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
 LESS_COMPRESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
@@ -36,7 +36,7 @@ build:
 watch:
 	@@if test ! -z ${WATCHR}; then \
 	  echo "Watching less files..."; \
-	  watchr -e "watch('lib/.*\.less') { system 'make' }"; \
+	  watchr -e "watch('less/.*\.less') { system 'make' }"; \
 	else \
 		echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
 		echo "You can install it by running: gem install watchr"; \
-- 
cgit v1.2.3


From ed64276e5be1bbf808f2ab1451aa02522cc3aff0 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 26 Jan 2012 22:05:45 -0800
Subject: move doc building into base make method + build bootstrap to doc
 assets

---
 Makefile | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 337baf03f..127d6affe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,25 @@
 VERSION=2.0.0
-BOOTSTRAP = ./bootstrap.css
-BOOTSTRAP_MIN = ./bootstrap.min.css
+BOOTSTRAP = ./docs/assets/css/bootstrap.css
 BOOTSTRAP_LESS = ./less/bootstrap.less
-BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css
-BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css
+BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
 BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
 LESS_COMPRESSOR ?= `which lessc`
 UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
 
 #
-# Build less files
+# Build less files + docs
 #
 
 build:
 	@@if test ! -z ${LESS_COMPRESSOR}; then \
 		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
 		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
-		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
 		rm -f ${BOOTSTRAP_LESS}.tmp; \
 		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
 		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
-		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE_MIN} --compress; \
 		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
+		node docs/build; \
 		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
@@ -42,12 +39,5 @@ watch:
 		echo "You can install it by running: gem install watchr"; \
 	fi
 
-#
-# Build docs from templates
-#
-
-docs:
-	@ node docs/build
-
 
-.PHONY: build watch docs
\ No newline at end of file
+.PHONY: build watch
\ No newline at end of file
-- 
cgit v1.2.3


From 815a2ae9f26f49137382fd4b186d174c7b1b8c5b Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 26 Jan 2012 22:39:17 -0800
Subject: rebuild + copy images to docs when making

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 127d6affe..f2213103a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ build:
 		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
 		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
 		node docs/build; \
+		cp img/* docs/assets/img/; \
 		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
-- 
cgit v1.2.3


From 15d3a4797f3435d1531804369df87fa4e574b874 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 27 Jan 2012 21:06:09 -0800
Subject: simplify build process more - remove really annoying date.

---
 Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f2213103a..879d59440 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-VERSION=2.0.0
 BOOTSTRAP = ./docs/assets/css/bootstrap.css
 BOOTSTRAP_LESS = ./less/bootstrap.less
 BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
@@ -12,16 +11,11 @@ WATCHR ?= `which watchr`
 #
 
 build:
-	@@if test ! -z ${LESS_COMPRESSOR}; then \
-		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
-		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
-		rm -f ${BOOTSTRAP_LESS}.tmp; \
-		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
-		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
-		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
+	@if test ! -z ${LESS_COMPRESSOR}; then \
+		lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \
+		lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \
 		node docs/build; \
 		cp img/* docs/assets/img/; \
-		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
 		echo "You can install it by running: npm install less -g"; \
@@ -32,7 +26,7 @@ build:
 #
 
 watch:
-	@@if test ! -z ${WATCHR}; then \
+	@if test ! -z ${WATCHR}; then \
 	  echo "Watching less files..."; \
 	  watchr -e "watch('less/.*\.less') { system 'make' }"; \
 	else \
@@ -40,5 +34,4 @@ watch:
 		echo "You can install it by running: gem install watchr"; \
 	fi
 
-
 .PHONY: build watch
\ No newline at end of file
-- 
cgit v1.2.3


From 616cbf93d2ba2b21a72d81d2c9148a0f25e4810c Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sat, 28 Jan 2012 14:47:59 -0800
Subject: remove uglify variable from makefile

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 879d59440..399b57c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ BOOTSTRAP_LESS = ./less/bootstrap.less
 BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
 BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
 LESS_COMPRESSOR ?= `which lessc`
-UGLIFY_JS ?= `which uglifyjs`
 WATCHR ?= `which watchr`
 
 #
-- 
cgit v1.2.3


From 49d565a6da38359a776f83f31a1f1ccd658c88a7 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 29 Jan 2012 13:15:37 -0800
Subject: move building zip file into docs/makefile

---
 Makefile | 53 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 399b57c6e..fed5ffca4 100644
--- a/Makefile
+++ b/Makefile
@@ -6,31 +6,42 @@ LESS_COMPRESSOR ?= `which lessc`
 WATCHR ?= `which watchr`
 
 #
-# Build less files + docs
+# BUILD DOCS
 #
 
-build:
-	@if test ! -z ${LESS_COMPRESSOR}; then \
-		lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \
-		lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \
-		node docs/build; \
-		cp img/* docs/assets/img/; \
-	else \
-		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
-		echo "You can install it by running: npm install less -g"; \
-	fi
+docs: dist
+	cp -r dist bootstrap
+	zip -r docs/assets/bootstrap.zip bootstrap
+	rm -r bootstrap
+	lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
+	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
+	node docs/build
+	cp img/* docs/assets/img/
 
 #
-# Watch less files
+# BUILD SIMPLE DIST DIRECTORY
+# lessc & uglifyjs are required
+#
+
+dist:
+	mkdir -p dist/img
+	mkdir -p dist/css
+	mkdir -p dist/js
+	cp img/* dist/img/
+	lessc ${BOOTSTRAP_LESS} > dist/css/bootstrap.css
+	lessc --compress ${BOOTSTRAP_LESS} > dist/css/bootstrap.min.css
+	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.responsive
+	lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.min.responsive
+	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 > dist/js/bootstrap.js
+	uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.js
+
+#
+# WATCH LESS FILES
 #
 
 watch:
-	@if test ! -z ${WATCHR}; then \
-	  echo "Watching less files..."; \
-	  watchr -e "watch('less/.*\.less') { system 'make' }"; \
-	else \
-		echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
-		echo "You can install it by running: gem install watchr"; \
-	fi
-
-.PHONY: build watch
\ No newline at end of file
+	echo "Watching less files..."; \
+	watchr -e "watch('less/.*\.less') { system 'make' }"
+
+
+.PHONY: dist docs watch
\ No newline at end of file
-- 
cgit v1.2.3


From 298e637d004c66a0e4351c7ce4a8d03866b75f66 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 29 Jan 2012 16:33:29 -0800
Subject: remove dist dir

---
 Makefile | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index fed5ffca4..8811d03e1 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,7 @@ WATCHR ?= `which watchr`
 # BUILD DOCS
 #
 
-docs: dist
-	cp -r dist bootstrap
+docs: bootstrap
 	zip -r docs/assets/bootstrap.zip bootstrap
 	rm -r bootstrap
 	lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@@ -19,21 +18,21 @@ docs: dist
 	cp img/* docs/assets/img/
 
 #
-# BUILD SIMPLE DIST DIRECTORY
+# BUILD SIMPLE BOOTSTRAP DIRECTORY
 # lessc & uglifyjs are required
 #
 
-dist:
-	mkdir -p dist/img
-	mkdir -p dist/css
-	mkdir -p dist/js
-	cp img/* dist/img/
-	lessc ${BOOTSTRAP_LESS} > dist/css/bootstrap.css
-	lessc --compress ${BOOTSTRAP_LESS} > dist/css/bootstrap.min.css
-	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.responsive
-	lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.min.responsive
-	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 > dist/js/bootstrap.js
-	uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.js
+bootstrap:
+	mkdir -p bootstrap/img
+	mkdir -p bootstrap/css
+	mkdir -p bootstrap/js
+	cp img/* bootstrap/img/
+	lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
+	lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
+	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.responsive
+	lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.min.responsive
+	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 > bootstrap/js/bootstrap.js
+	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
 
 #
 # WATCH LESS FILES
-- 
cgit v1.2.3