finish flattening repo structure; add dist folder of compiled css/js

.gitignore

@@ -39,4 +39,3 @@ nbproject
 .CVS
 .idea
 node_modules
-dist

Makefile

@@ -1,4 +1,4 @@
-BOOTSTRAP ?= ./docs/assets/css/bootstrap.css
+BOOTSTRAP ?= ./dist/css/bootstrap.css
 BOOTSTRAP_LESS ?= ./less/bootstrap.less
 DATE=$(shell date +%I:%M%p)
 CHECK=\033[32m✔ Done\033[39m
@@ -22,14 +22,14 @@ build:
 	@recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
 	@echo "               ${CHECK}"
 	@printf "Prepping documentation assets..."
-	@cp js/tests/vendor/jquery.js docs/assets/js/
+	@cp js/tests/vendor/jquery.js assets/js/
 	@echo "            ${CHECK}"
 	@printf "Compiling and minifying JavaScript..."
-	@cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > docs/assets/js/bootstrap.js
-	@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
-	@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
+	@cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js
+	@uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.tmp.js
+	@echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > dist/js/copyright.js
+	@cat dist/js/copyright.js dist/js/bootstrap.min.tmp.js > dist/js/bootstrap.min.js
+	@rm dist/js/copyright.js dist/js/bootstrap.min.tmp.js
 	@echo "       ${CHECK}"
 	@echo "${HR}"
 	@echo "\033[36mSuccess!\n\033[39m"
@@ -72,7 +72,7 @@ bootstrap/js/*.js: js/*.js
 	mkdir -p bootstrap/js
 	cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > bootstrap/js/bootstrap.js
 	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
-	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
+	echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2013 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
 

_includes/footer.html

@@ -2,10 +2,10 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="/assets/js/jquery.js"></script>
-<script src="/assets/js/bootstrap.js"></script>
+<script src="/dist/js/bootstrap.js"></script>
 
 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-<script src="/assets/js/holder/holder.js"></script>
+<script src="/assets/js/holder.js"></script>
 
 <script src="/assets/js/application.js"></script>
 

_includes/header.html

@@ -12,7 +12,7 @@
 </title>
 
 <!-- Bootstrap core CSS -->
-<link href="/assets/css/bootstrap.css" rel="stylesheet">
+<link href="/dist/css/bootstrap.css" rel="stylesheet">
 
 {% if page.layout != "example" %}
 <!-- Documentation extras -->
@@ -23,7 +23,7 @@
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
   <script src="/assets/js/html5shiv.js"></script>
-  <script src="/assets/js/respond/respond.min.js"></script>
+  <script src="/assets/js/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->