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

Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging

Browse Source 
Conflicts:
	server/views/coursewares/showHTML.jade
This commit is contained in:
Quincy Larson
2015-09-04 14:26:56 -07:00
parent fdf3fbe157 f8a5d0d7ba
commit 79a396b9c8
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/manifests/README.md
View File

@ -4,5 +4,5 @@ files are generated at runtime and their content is determined by
the content of the files they are derived from. the content of the files they are derived from.
Since the build process is not exactly the same on every machine, Since the build process is not exactly the same on every machine,
this files are not tracked in github otherwise conflicts arise when these files are not tracked in github otherwise conflicts arise when
building on our servers. building on our servers.

2
server/views/coursewares/showHTML.jade
View File

@ -33,7 +33,6 @@ block content
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-block#submitButton
i.fa.fa-play i.fa.fa-play
|   Run tests (ctrl + enter) |   Run tests (ctrl + enter)
br
if (user) if (user)
.button-spacer .button-spacer
.btn-group.input-group.btn-group-justified .btn-group.input-group.btn-group-justified
@ -91,7 +90,6 @@ block content
#challenge-checkmark.animated.zoomInDown.delay-half #challenge-checkmark.animated.zoomInDown.delay-half
span.completion-icon.ion-checkmark-circled.text-primary span.completion-icon.ion-checkmark-circled.text-primary
.spacer .spacer
.row
if(user) if(user)
#submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to next challenge #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to next challenge
else else