Merge remote-tracking branch 'origin/master' into rev1-add-node

Conflicts:
	.gitmodules
	site/static/css/styles.css

.gitignore

@@ -55,4 +55,8 @@ site/spec
 site/*gen*.html
 site/1.0
 site/1.1
-scenario.cache
+scenario.cache
+bower_components
+site/static/css
+site/static/img
+site/static/less/strapped

.gitmodules

@@ -1,26 +1,28 @@
 [submodule "clients/rev0/python"]
 	path = clients/rev0/python
 	url = https://github.com/balanced/balanced-python.git
+  branch = rev0
 [submodule "clients/rev0/ruby"]
 	path = clients/rev0/ruby
 	url = https://github.com/balanced/balanced-ruby.git
+  branch = rev0
 [submodule "clients/rev0/java"]
 	path = clients/rev0/java
 	url = https://github.com/balanced/balanced-java.git
+  branch = rev0
 [submodule "clients/rev0/php"]
 	path = clients/rev0/php
 	url = https://github.com/balanced/balanced-php.git
-[submodule "clients/rev0/node"]
-	path = clients/rev0/node
+  branch = rev0
+[submodule "clients/rev1/node"]
+	path = clients/rev1/node
 	url = https://github.com/balanced/balanced-node.git
+  branch = master
 [submodule "clients/rev1/ruby"]
 	path = clients/rev1/ruby
 	url = https://github.com/balanced/balanced-ruby.git
-  branch = 1.1.0
+  branch = master
 [submodule "clients/rev1/python"]
 	path = clients/rev1/python
 	url = https://github.com/balanced/balanced-python.git
-  branch = 1.1
-[submodule "clients/rev1/node"]
-	path = clients/rev1/node
-	url = https://github.com/balanced/balanced-node.git
+  branch = master

.travis.yml

@@ -1,6 +1,8 @@
 before_install:
   - git submodule update --init --recursive
-  - npm install less
+  - npm install -g less
+  - npm install -g bower
+  - bower install
 language: python
 python:
   - 2.7

Makefile

@@ -31,7 +31,7 @@ SITE_DIR = site
 #	REV=rev0 make all
 #	make clean-limited
 #	REV=rev1 make all
-build-revisions: clean-site api overview
+build-revisions: clean-site strapped api overview
 
 all: rev0 cache-clean rev1
 
@@ -42,7 +42,7 @@ clean: clean-limited
 	-rm -rf $(SITE_DIR)/1.0
 	-rm -rf $(SITE_DIR)/1.1
 	-rm -f $(SITE_DIR)/api-gen-*.html
-	-rm  -f $(SITE_DIR)/overview-gen-*.html
+	-rm -f $(SITE_DIR)/overview-gen-*.html
 
 clean-limited: api-clean overview-clean
 
@@ -86,15 +86,21 @@ overview-clean:
 	-rm -rf overview/html
 	-rm -rf overview/rev*/html
 	-rm -f *.cache
-
+	-rm $(SITE_DIR)/static/css/styles.css
+	-rm -r bower_components
+	-rm -r site/static/less/strapped
+
 # static files
+strapped:
+	bower install strapped
+	cp -r bower_components/strapped/static/less site/static/less/strapped
 
 # --line-numbers=mediaquery <-- use this to debug the compiled less
 $(SITE_DIR)/static/css/styles.css: $(wildcard $(SITE_DIR)/static/less/*.less)
-	./node_modules/.bin/lessc $(SITE_DIR)/static/less/bootstrap.less $@
+	lessc $(SITE_DIR)/static/less/base.less $@
 
 $(SITE_DIR)/static/js/compiled.js: $(wildcard $(SITE_DIR)/static/js/*.js)
-	cat 	$(SITE_DIR)/static/js/bootstrap.min.js 		\
+	cat $(SITE_DIR)/static/js/bootstrap.min.js 		\
 		$(SITE_DIR)/static/js/lunr.min.js 		\
 		$(SITE_DIR)/static/js/jquery.scrollTo-min.js 	\
 		$(SITE_DIR)/static/js/search.js 		\

README.md

@@ -49,7 +49,7 @@ If you've done that before just do:
 ```bash
 cd /path/to/balanced-docs
 workon balanced-docs
-git submodoule update --recursive
+git submodule update --recursive
 ```
 
 ## Build
@@ -91,7 +91,7 @@ Let's take a look at what we've built using [mongoose](https://github.com/valeno
 
 ```bash
 cd site
-./mongoose -ssi_pattern '**.shtml$|**.shtm$|**.html$'
+mongoose -ssi_pattern '**.shtml$|**.shtm$|**.html$'
 Mongoose web server v. 3.8 started on port(s) 8080 with web root [.]
 ```
 

package.json

@@ -4,6 +4,7 @@
   "author": "balancedpayments",
   "private": true,
   "dependencies": {
-    "less": "*"
+    "less": "*",
+    "strapped": "0.0.3"
   }
 }