Merge branch 'master' into courseware

Conflicts: controllers/bonfire.js controllers/resources.json views/bonfire/show.jade
2015-02-06 14:39:16 -05:00
parent 0313fd9751 a487e8c7dd
commit e2ab4438f5
14 changed files with 177 additions and 103 deletions
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -136,6 +136,12 @@ ul {
  font-size: 25px;
 }

+.panel-heading > h1 {
+  font-size: 25px;
+  padding: 2px;
+  margin: 2px;
+}
+
 .navbar-brand {
  font-size: 26px;
 }