Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
commit
4ace7e9d12
|
@ -126,7 +126,7 @@ gulp.task('serve', function(cb) {
|
|||
script: paths.server,
|
||||
ext: '.js .json',
|
||||
ignore: paths.serverIgnore,
|
||||
exec: './node_modules/.bin/babel-node',
|
||||
exec: path.join(__dirname, 'node_modules/.bin/babel-node'),
|
||||
env: {
|
||||
'NODE_ENV': 'development',
|
||||
'DEBUG': process.env.DEBUG || 'freecc:*'
|
||||
|
|
|
@ -100,6 +100,7 @@ block content
|
|||
i.fa.fa-bug
|
||||
| Bug
|
||||
.button-spacer
|
||||
|
||||
form.code
|
||||
.form-group.codeMirrorView
|
||||
textarea#codeOutput(style='display: none;')
|
||||
|
@ -117,6 +118,7 @@ block content
|
|||
var dashed = !{JSON.stringify(dashedName)};
|
||||
|
||||
.col-xs-12.col-sm-12.col-md-8
|
||||
.editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
|
||||
#mainEditorPanel
|
||||
form.code
|
||||
.form-group.codeMirrorView
|
||||
|
|
|
@ -65,10 +65,10 @@ block content
|
|||
var challengeType = !{JSON.stringify(challengeType)};
|
||||
var started = Math.floor(Date.now());
|
||||
.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
|
||||
form.code
|
||||
.form-group.codeMirrorView
|
||||
.codeMirrorView
|
||||
textarea#codeEditor(autofocus=true, style='display: none;')
|
||||
.col-md-4.col-lg-3
|
||||
.hidden-xs.hidden-sm
|
||||
|
|
|
@ -66,7 +66,7 @@ block content
|
|||
var _ = R;
|
||||
var dashed = !{JSON.stringify(dashedName)};
|
||||
.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
|
||||
form.code
|
||||
.codeMirrorView
|
||||
|
|
Loading…
Reference in New Issue