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:16:14 -07:00
parent 44007c9643 608071df08
commit a5b1d23a3c
5 changed files with 17 additions and 10 deletions
Show Stats 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 {
height: 100%;
width: 99%;
}
.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);
if($('.editorScrollDiv').html() !== 'undefined'){
$('.editorScrollDiv').css("height",$(window).height()-($('.navbar').height()+$('.footer').height()+100) + "px");
}
//fakeiphone positioning hotfix
if($('.iphone-position').html() !==undefined || $('.iphone').html() !== undefined){
var startIphonePosition = parseInt($('.iphone-position').css('top').replace('px', ''));

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

@ -308,7 +308,7 @@
],
"tests": [
"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]));"
],
"MDNlinks": [

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

@ -65,6 +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;")
#mainEditorPanel
form.code
.form-group.codeMirrorView

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

@ -66,9 +66,10 @@ 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;")
#mainEditorPanel
form.code
.form-group.codeMirrorView
.codeMirrorView
textarea#codeEditor(autofocus=true, style='display: none;')
script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
#complete-courseware-dialog.modal(tabindex='-1')