Merge branch 'master' into courseware

Conflicts: controllers/bonfire.js views/layout.jade
2015-02-02 23:32:46 -08:00
parent 6464241b2e dda901872e
commit f1000c3189
27 changed files with 360 additions and 186 deletions
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -154,6 +154,11 @@ ul {
 }

 .landing-icon {
+  height: 200px;
+  width: 200px;
+}
+
+.completion-icon{
  font-size: 150px;
 }