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-16 20:16:23 +01:00
parent 76a17bb712 de10e77645
commit d0f72fdb70
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/views/account/signin.jade
View File

@ -1,5 +1,8 @@
extends ../layout
block content
.bg-info.default-border-radius
p     
a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/August-2015-Improvements' target='_blank') Click here to read about the improvements we just made to Free Code Camp and the bugs we're still fixing.
.jumbotron.text-center
h2 Sign in with one of these options:
a.btn.btn-lg.btn-block.btn-github.btn-social(href='/auth/github')
@ -18,7 +21,8 @@ block content
i.fa.fa-linkedin
| Sign in with LinkedIn
br
p
a(href="/email-signup") Or sign up using your email address here.
p
a(href="/email-signin") Sign in to your existing account with your email address here.
p Email sign in is temporarily disabled - we are working to fix this ASAP. Try logging in with an above service that uses the same email address as you normally use to sign in with (other than Twitter).
//p
// a(href="/email-signup") Or sign up using your email address here.
//p
// a(href="/email-signin") Sign in to your existing account with your email address here.

3
server/views/challengeMap/show.jade
View File

@ -1,5 +1,8 @@
extends ../layout
block content
.bg-info.default-border-radius
p     
a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/August-2015-Improvements' target='_blank') Click here to read about the improvements we just made to Free Code Camp and the bugs we're still fixing.
.panel.panel-info
.panel-heading.text-center
h1 Challenge Map

3
server/views/home.jade
View File

@ -1,5 +1,8 @@
extends layout
block content
.bg-info.default-border-radius
p     
a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/August-2015-Improvements' target='_blank') Click here to read about the improvements we just made to Free Code Camp and the bugs we're still fixing.
.jumbotron
.text-center
h1.hug-top Code with Us

3
server/views/resources/get-started.jade
View File

@ -1,5 +1,8 @@
extends ../layout
block content
.bg-info.default-border-radius
p     
a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/August-2015-Improvements' target='_blank') Click here to read about the improvements we just made to Free Code Camp and the bugs we're still fixing.
.jumbotron
h2.text-center This 10-minute guide will help you get the most out of Free Code Camp.