From 89357f3d13f395a6fc8c8f00df5fab43e180ff26 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Wed, 14 Jan 2015 13:26:36 -0800 Subject: [PATCH] add twitch channel to live pair programming page --- app.js | 1 + views/resources/live-pair-programming.jade | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index c2164a972d..025a668dec 100644 --- a/app.js +++ b/app.js @@ -115,6 +115,7 @@ var trusted = [ '*.gstatic.com', '*.doubleclick.net', '*.twitter.com', + '*.twitch.tv', '*.twimg.com', "'unsafe-eval'", "'unsafe-inline'", diff --git a/views/resources/live-pair-programming.jade b/views/resources/live-pair-programming.jade index 1162f4791b..58b5eb9dbd 100644 --- a/views/resources/live-pair-programming.jade +++ b/views/resources/live-pair-programming.jade @@ -8,9 +8,9 @@ block content h2 Our next session will be January 20th, 2015 at 6 p.m. PST! //h2 Join the discussion in our // a(href="chat.freecodecamp.com", target="_blank") FreeCodeCamp chat room. - //.embed-responsive.embed-responsive-16by9.big-break - // iframe.embed-responsive-item(src='//www.youtube.com/embed/3DWQXgXDKwY') - br + .embed-responsive.embed-responsive-16by9.big-break + iframe(src='http://www.twitch.tv/freecodecamp/embed', frameborder='0', scrolling='no') + br .panel.panel-primary .panel-heading.landing-panel-heading.text-center Previous Live Pair Programming Sessions .panel-body