greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

marginal steps towards removing scrollbars and scrolling from bonfire viewports

pull/45/head
Nathan Leniz 2015-01-20 16:44:09 -05:00
parent 15eb0c0ef0
commit a4dc2f0206
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/lib/bonfire/framework.js
View File

@ -27,7 +27,7 @@ myCodeMirror.setValue('/*Welcome to Bonfire, Free Code Camp\'s future CoderByte
' });\n' + ' });\n' +
'}\n\n' + '}\n\n' +
'test();'); 'test();');
myCodeMirror.setSize("100%", 500); myCodeMirror.setSize("100%", "100%");
var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), { var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {
lineNumbers: false, lineNumbers: false,
@ -36,7 +36,11 @@ var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"),
readOnly: 'nocursor', readOnly: 'nocursor',
lineWrapping: true lineWrapping: true
}); });
codeOutput.setSize("100%", 100); codeOutput.setValue('/**\n' +
' * Your output will go here. Console statements\n' +
' * will appear in your developer console!\n' +
' */');
codeOutput.setSize("100%", "100%");
var info = editor.getScrollInfo(); var info = editor.getScrollInfo();
var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top; var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top;
if (info.top + info.clientHeight < after) if (info.top + info.clientHeight < after)

1
public/js/lib/codemirror/lib/codemirror.css vendored
View File

@ -152,6 +152,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
/* See overflow: hidden in .CodeMirror */ /* See overflow: hidden in .CodeMirror */
margin-bottom: -30px; margin-right: -30px; margin-bottom: -30px; margin-right: -30px;
padding-bottom: 0px; padding-bottom: 0px;
border-radius: 5px;
height: 100%; height: 100%;
outline: none; /* Prevent dragging from highlighting the element */ outline: none; /* Prevent dragging from highlighting the element */
position: relative; position: relative;