From aef867cc697eca7e15067db88191060e2b4c647e Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sat, 1 Aug 2015 20:20:19 +0100 Subject: [PATCH 1/5] Added extra regex moving on to fix scroller without those new images --- server/views/coursewares/showBonfire.jade | 7 ++++--- server/views/coursewares/showHTML.jade | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 07eb34717eb..ced5968217a 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -100,9 +100,10 @@ block content i.fa.fa-bug |   Bug .button-spacer - form.code - .form-group.codeMirrorView - textarea#codeOutput(style='display: none;') + .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;") + form.code + .codeMirrorView + textarea#codeOutput(style='display: none;') br #testSuite.negative-10 br diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 60cc98e1e25..9957444646e 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -68,7 +68,7 @@ block content .editorScrollDiv(style = "overflow-y: scroll; 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 From f60bfd5da1a2b78634b477ae4cc69d02c842c717 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sat, 1 Aug 2015 20:22:02 +0100 Subject: [PATCH 2/5] Added extra regex moving on to fix scroller without those new images --- server/views/coursewares/showBonfire.jade | 2 +- server/views/coursewares/showHTML.jade | 2 +- server/views/coursewares/showJS.jade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index ced5968217a..bed8ff229bd 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -100,7 +100,7 @@ block content i.fa.fa-bug |   Bug .button-spacer - .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;") + .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;") form.code .codeMirrorView textarea#codeOutput(style='display: none;') diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 9957444646e..80654db9bdf 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -65,7 +65,7 @@ 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 .codeMirrorView diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 8d178dc186e..32987b638aa 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -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 From c075eb01168893a8008ef7a24afc75acf2bf0ccd Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sat, 1 Aug 2015 20:24:16 +0100 Subject: [PATCH 3/5] Added extra regex moving on to fix scroller without those new images --- server/views/coursewares/showHTML.jade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 80654db9bdf..4beb71096d5 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -65,11 +65,11 @@ 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: auto; overflow-x: hidden;") - #mainEditorPanel - form.code - .codeMirrorView - textarea#codeEditor(autofocus=true, style='display: none;') + .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;") + #mainEditorPanel + form.code + .codeMirrorView + textarea#codeEditor(autofocus=true, style='display: none;') .col-md-4.col-lg-3 .hidden-xs.hidden-sm img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png") From 0a34dcf6c3506ffc86dddad8d2a4b0e82adba4f0 Mon Sep 17 00:00:00 2001 From: benmcmahon100 Date: Sat, 1 Aug 2015 20:25:49 +0100 Subject: [PATCH 4/5] Added extra regex moving on to fix scroller without those new images --- server/views/coursewares/showBonfire.jade | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index bed8ff229bd..533a7fe9303 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -100,10 +100,10 @@ block content i.fa.fa-bug |   Bug .button-spacer - .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;") - form.code - .codeMirrorView - textarea#codeOutput(style='display: none;') + + form.code + .form-group.codeMirrorView + textarea#codeOutput(style='display: none;') br #testSuite.negative-10 br @@ -118,11 +118,12 @@ block content var dashed = !{JSON.stringify(dashedName)}; .col-xs-12.col-sm-12.col-md-8 - #mainEditorPanel - form.code - .form-group.codeMirrorView - textarea#codeEditor(autofocus=true, style='display: none;') - script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js') + .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;") + #mainEditorPanel + form.code + .form-group.codeMirrorView + textarea#codeEditor(autofocus=true, style='display: none;') + script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js') #complete-courseware-dialog.modal(tabindex='-1') .modal-dialog.animated.zoomIn.fast-animation From 8ded4558cf27c729bab7d3b80fd16365f8dcd94b Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Sat, 1 Aug 2015 12:26:57 -0700 Subject: [PATCH 5/5] add back path join in gulpfile DO NOT REMOVE --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index b8aa6ff0fbe..c55daf01da9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -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:*'