Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
commit
4ace7e9d12
|
@ -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:*'
|
||||||
|
|
|
@ -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,11 +118,12 @@ 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
|
||||||
#mainEditorPanel
|
.editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
|
||||||
form.code
|
#mainEditorPanel
|
||||||
.form-group.codeMirrorView
|
form.code
|
||||||
textarea#codeEditor(autofocus=true, style='display: none;')
|
.form-group.codeMirrorView
|
||||||
script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
|
textarea#codeEditor(autofocus=true, style='display: none;')
|
||||||
|
script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
|
||||||
|
|
||||||
#complete-courseware-dialog.modal(tabindex='-1')
|
#complete-courseware-dialog.modal(tabindex='-1')
|
||||||
.modal-dialog.animated.zoomIn.fast-animation
|
.modal-dialog.animated.zoomIn.fast-animation
|
||||||
|
|
|
@ -65,11 +65,11 @@ 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
|
||||||
img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png")
|
img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png")
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue