Merge branch 'master' into courseware

2015-02-04 21:28:41 -05:00
parent 9246d7f663 26ee23ddf9
commit d47482fdcc
6 changed files with 17 additions and 15 deletions
--- a/views/challenges/show.jade
+++ b/views/challenges/show.jade
@@ -4,6 +4,8 @@ block content
        .col-sm-12.col-md-12.col-xs-12
            .panel.panel-primary
                .panel-heading.text-center #{name} (takes #{time} minutes)
+                script.
+                    var bonfireName = null;
                .panel.panel-body
                    .embed-responsive.embed-responsive-16by9
                        iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')