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

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

Browse Source
This commit is contained in:
Quincy Larson
2015-08-01 12:16:14 -07:00
parent 44007c9643 608071df08
commit a5b1d23a3c
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/css/main.less
View File

@ -735,6 +735,7 @@ form.code span {
#mainEditorPanel { #mainEditorPanel {
height: 100%; height: 100%;
width: 99%;
} }
.big-error-icon { .big-error-icon {

4
public/js/main_0.0.3.js
View File

@ -311,6 +311,10 @@ $(document).ready(function() {
$('#story-submit').on('click', storySubmitButtonHandler); $('#story-submit').on('click', storySubmitButtonHandler);
if($('.editorScrollDiv').html() !== 'undefined'){
$('.editorScrollDiv').css("height",$(window).height()-($('.navbar').height()+$('.footer').height()+100) + "px");
}
//fakeiphone positioning hotfix //fakeiphone positioning hotfix
if($('.iphone-position').html() !==undefined || $('.iphone').html() !== undefined){ if($('.iphone-position').html() !==undefined || $('.iphone').html() !== undefined){
var startIphonePosition = parseInt($('.iphone-position').css('top').replace('px', '')); var startIphonePosition = parseInt($('.iphone-position').css('top').replace('px', ''));

2
seed/challenges/basic-bonfires.json
View File

@ -308,7 +308,7 @@
], ],
"tests": [ "tests": [
"expect(largestOfFour([[4, 5, 1, 3], [13, 27, 18, 26], [32, 35, 37, 39], [1000, 1001, 857, 1]])).to.be.a('array');", "expect(largestOfFour([[4, 5, 1, 3], [13, 27, 18, 26], [32, 35, 37, 39], [1000, 1001, 857, 1]])).to.be.a('array');",
"(largestOfFour([[4, 5, 1, 3], [13, 27, 18, 26], [32, 35, 37, 39], [1000, 1001, 857, 1]])).should.eql([5,27,39,1001]);", "(largestOfFour([[13, 27, 18, 26], [4, 5, 1, 3], [32, 35, 37, 39], [1000, 1001, 857, 1]])).should.eql([27,5,39,1001]);",
"assert(largestOfFour([[4, 9, 1, 3], [13, 35, 18, 26], [32, 35, 97, 39], [1000000, 1001, 857, 1]]).should.eql([9,35,97,1000000]));" "assert(largestOfFour([[4, 9, 1, 3], [13, 35, 18, 26], [32, 35, 97, 39], [1000000, 1001, 857, 1]]).should.eql([9,35,97,1000000]));"
], ],
"MDNlinks": [ "MDNlinks": [

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

@ -65,10 +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
#mainEditorPanel .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;")
form.code #mainEditorPanel
.form-group.codeMirrorView form.code
textarea#codeEditor(autofocus=true, style='display: none;') .form-group.codeMirrorView
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")

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

@ -66,11 +66,12 @@ 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
#mainEditorPanel .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;")
form.code #mainEditorPanel
.form-group.codeMirrorView form.code
textarea#codeEditor(autofocus=true, style='display: none;') .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
.modal-content .modal-content