Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
commit
a5b1d23a3c
|
@ -735,6 +735,7 @@ form.code span {
|
|||
|
||||
#mainEditorPanel {
|
||||
height: 100%;
|
||||
width: 99%;
|
||||
}
|
||||
|
||||
.big-error-icon {
|
||||
|
|
|
@ -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', ''));
|
||||
|
|
|
@ -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": [
|
||||
|
|
|
@ -65,10 +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
|
||||
#mainEditorPanel
|
||||
form.code
|
||||
.form-group.codeMirrorView
|
||||
textarea#codeEditor(autofocus=true, style='display: none;')
|
||||
.editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;")
|
||||
#mainEditorPanel
|
||||
form.code
|
||||
.form-group.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")
|
||||
|
|
|
@ -66,11 +66,12 @@ block content
|
|||
var _ = R;
|
||||
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: scroll; overflow-x: hidden;")
|
||||
#mainEditorPanel
|
||||
form.code
|
||||
.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
|
||||
.modal-content
|
||||
|
|
Loading…
Reference in New Issue