From 81afc27412c0a940d9b266cfd98b2dcc5ce2ad04 Mon Sep 17 00:00:00 2001 From: dokkillo Date: Thu, 20 Aug 2015 20:24:25 +0200 Subject: [PATCH 1/2] issue 2333 --- seed/challenges/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json index c2d5578f4d..067048118a 100644 --- a/seed/challenges/html5-and-css.json +++ b/seed/challenges/html5-and-css.json @@ -755,7 +755,7 @@ ], "tests": [ "assert($(\"img\").length > 0, 'Your page should have an image element.')", - "assert(new RegExp(\"\\/\\/bit.ly\\/fcc-relaxing-cat\", \"gi\").test($(\"img\").attr(\"src\")), 'Your image should have have a src attribute that points to the kitten image.')" + "assert(new RegExp(\"\\/\\/bit.ly\\/fcc-relaxing-cat\", \"gi\").test($(\"img\").attr(\"src\")), 'Your image should have a src attribute that points to the kitten image.')" ], "challengeSeed": [ "", From adc50b764dc9e59d0d39d16a4a72ca0e3fc4fd51 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 20 Aug 2015 19:52:48 -0700 Subject: [PATCH 2/2] uncomment social linking --- server/views/account/account.jade | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/server/views/account/account.jade b/server/views/account/account.jade index 44bcca998b..e6a8c961df 100644 --- a/server/views/account/account.jade +++ b/server/views/account/account.jade @@ -16,26 +16,26 @@ block content i.fa.fa-github | Update my profile from Github - //if (!user.twitter) - // .col-xs-12 - // a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter') - // i.fa.fa-twitter - // | Add my Twitter to my profile - //if (!user.facebook) - // .col-xs-12 - // a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/link/facebook') - // i.fa.fa-facebook - // | Add my Facebook to my profile - //if (!user.linkedin) - // .col-xs-12 - // a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/link/linkedin') - // i.fa.fa-linkedin - // | Add my LinkedIn to my profile - //if (!user.google) - // .col-xs-12 - // a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/link/google') - // i.fa.fa-google-plus - // | Add my Google+ to my profile + if (!user.twitter) + .col-xs-12 + a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter') + i.fa.fa-twitter + | Add my Twitter to my profile + if (!user.facebook) + .col-xs-12 + a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/link/facebook') + i.fa.fa-facebook + | Add my Facebook to my profile + if (!user.linkedin) + .col-xs-12 + a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/link/linkedin') + i.fa.fa-linkedin + | Add my LinkedIn to my profile + if (!user.google) + .col-xs-12 + a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/link/google') + i.fa.fa-google-plus + | Add my Google+ to my profile .big-spacer .col-xs-12 a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')