greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

pull/1508/head
Quincy Larson 2015-08-01 12:36:55 -07:00
parent 21cc71ab24 8ded4558cf
commit 4ace7e9d12
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -126,7 +126,7 @@ gulp.task('serve', function(cb) {
script: paths.server, script: paths.server,
ext: '.js .json', ext: '.js .json',
ignore: paths.serverIgnore, ignore: paths.serverIgnore,
exec: './node_modules/.bin/babel-node', exec: path.join(__dirname, 'node_modules/.bin/babel-node'),
env: { env: {
'NODE_ENV': 'development', 'NODE_ENV': 'development',
'DEBUG': process.env.DEBUG || 'freecc:*' 'DEBUG': process.env.DEBUG || 'freecc:*'

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

@ -100,6 +100,7 @@ block content
i.fa.fa-bug i.fa.fa-bug
|   Bug |   Bug
.button-spacer .button-spacer
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeOutput(style='display: none;') textarea#codeOutput(style='display: none;')
@ -117,6 +118,7 @@ block content
var dashed = !{JSON.stringify(dashedName)}; var dashed = !{JSON.stringify(dashedName)};
.col-xs-12.col-sm-12.col-md-8 .col-xs-12.col-sm-12.col-md-8
.editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
#mainEditorPanel #mainEditorPanel
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView

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

@ -65,10 +65,10 @@ block content
var challengeType = !{JSON.stringify(challengeType)}; var challengeType = !{JSON.stringify(challengeType)};
var started = Math.floor(Date.now()); var started = Math.floor(Date.now());
.col-xs-12.col-sm-12.col-md-5.col-lg-6 .col-xs-12.col-sm-12.col-md-5.col-lg-6
.editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;") .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
#mainEditorPanel #mainEditorPanel
form.code form.code
.form-group.codeMirrorView .codeMirrorView
textarea#codeEditor(autofocus=true, style='display: none;') textarea#codeEditor(autofocus=true, style='display: none;')
.col-md-4.col-lg-3 .col-md-4.col-lg-3
.hidden-xs.hidden-sm .hidden-xs.hidden-sm

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

@ -66,7 +66,7 @@ block content
var _ = R; var _ = R;
var dashed = !{JSON.stringify(dashedName)}; var dashed = !{JSON.stringify(dashedName)};
.col-xs-12.col-sm-12.col-md-8 .col-xs-12.col-sm-12.col-md-8
.editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;") .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
#mainEditorPanel #mainEditorPanel
form.code form.code
.codeMirrorView .codeMirrorView