gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into staging

Browse Source
This commit is contained in:
benmcmahon100
2015-08-21 20:21:15 +01:00
parent 9584c7870a 6d3fcb3d0b
commit d87b0457fe
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seed/challenges/html5-and-css.json
View File

@ -755,7 +755,7 @@
], ],
"tests": [ "tests": [
"assert($(\"img\").length > 0, 'Your page should have an image element.')", "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 <code>src</code> 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 <code>src</code> attribute that points to the kitten image.')"
], ],
"challengeSeed": [ "challengeSeed": [
"<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">", "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",

40
server/views/account/account.jade
View File

@ -16,26 +16,26 @@ block content
i.fa.fa-github i.fa.fa-github
| Update my profile from Github | Update my profile from Github
//if (!user.twitter) if (!user.twitter)
// .col-xs-12 .col-xs-12
// a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter') a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter')
// i.fa.fa-twitter i.fa.fa-twitter
// | Add my Twitter to my profile | Add my Twitter to my profile
//if (!user.facebook) if (!user.facebook)
// .col-xs-12 .col-xs-12
// a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/link/facebook') a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/link/facebook')
// i.fa.fa-facebook i.fa.fa-facebook
// | Add my Facebook to my profile | Add my Facebook to my profile
//if (!user.linkedin) if (!user.linkedin)
// .col-xs-12 .col-xs-12
// a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/link/linkedin') a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/link/linkedin')
// i.fa.fa-linkedin i.fa.fa-linkedin
// | Add my LinkedIn to my profile | Add my LinkedIn to my profile
//if (!user.google) if (!user.google)
// .col-xs-12 .col-xs-12
// a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/link/google') a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/link/google')
// i.fa.fa-google-plus i.fa.fa-google-plus
// | Add my Google+ to my profile | Add my Google+ to my profile
.big-spacer .big-spacer
.col-xs-12 .col-xs-12
a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout') a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')