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

minor improvements to the navbar and layout in general

Browse Source
This commit is contained in:
Michael Q Larson
2015-01-25 14:05:56 -08:00
parent 00dfdb2e1e
commit 413d89cf18
4 changed files with 95 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/css/main.less
View File

@ -30,8 +30,8 @@ html {
} }
body { body {
padding-top: 80px; padding-top: 50px;
margin-bottom: 60px; // margin-bottom: 60px;
} }
h1, h2 { h1, h2 {
@ -253,6 +253,10 @@ ul {
.navbar { .navbar {
white-space: nowrap; white-space: nowrap;
border: none; border: none;
@media (min-width: 767px) {
padding-left: 30px;
padding-right: 30px;
}
} }
.panel-body { .panel-body {
@ -571,7 +575,7 @@ thead {
*/ */
form.code span { form.code span {
font-size: 14px; font-size: 18px;
font-family: "Ubuntu Mono"; font-family: "Ubuntu Mono";
padding-bottom: 0px; padding-bottom: 0px;
margin-bottom: 0px; margin-bottom: 0px;
@ -597,6 +601,10 @@ form.code span {
padding-bottom: 0px; padding-bottom: 0px;
} }
.panel-bonfire {
height: 100%
}
div.CodeMirror-scroll { div.CodeMirror-scroll {
padding-bottom: 100px; padding-bottom: 100px;
} }

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

@ -47,8 +47,8 @@ var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"),
lineWrapping: true lineWrapping: true
}); });
codeOutput.setValue('/**\n' + codeOutput.setValue('/**\n' +
' * Your output will go here. Console.log() -type statements\n' + ' * Your output will go here.\n' + ' * Console.log() -type statements\n' +
' * will appear in your browser\'s javascript console.\n' + ' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' +
' */'); ' */');
codeOutput.setSize("100%", "100%"); codeOutput.setSize("100%", "100%");
var info = editor.getScrollInfo(); var info = editor.getScrollInfo();
@ -178,11 +178,11 @@ var createTestDisplay = function() {
var testDoc = document.createElement("div"); var testDoc = document.createElement("div");
if (test.err != null) { if (test.err != null) {
$(testDoc) $(testDoc)
.html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-11 test-output wrappable'>" + test.text + "</div><div class='col-xs-11 test-output wrappable'>" + test.err + "</div></div>") .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-11 test-output wrappable'>" + test.text + "</div><div class='col-xs-11 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
.prependTo($('#testSuite')) .prependTo($('#testSuite'))
} else { } else {
$(testDoc) $(testDoc)
.html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-11 test-output test-vertical-center wrappable'>" + test.text + "</div></div>") .html("<div class='row'><div class='col-xs-1 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-11 test-output test-vertical-center wrappable'>" + test.text + "</div></div><div class='ten-pixel-break'/>")
.appendTo($('#testSuite')); .appendTo($('#testSuite'));
} }
}; };

53
views/bonfire/show.jade
View File

@ -17,12 +17,49 @@ block content
script(src='/js/lib/bonfire/bonfireInit.js') script(src='/js/lib/bonfire/bonfireInit.js')
.row
#testCreatePanel.col-xs-12.col-sm-12.col-md-4
.panel.panel-primary.panel-bonfire .panel.panel-primary.panel-bonfire
.panel-heading.text-center Output
.panel.panel-body .panel.panel-body
.row
.col-xs-12.col-sm-12.col-md-3
#testCreatePanel
h2.text-center #{name}
Difficulty: &nbsp;
if (difficulty == "0")
i.ion-ios-flame-outline
i.ion-ios-flame-outline
i.ion-ios-flame-outline
i.ion-ios-flame-outline
i.ion-ios-flame-outline
if (difficulty == "1")
i.ion-ios-flame
i.ion-ios-flame-outline
i.ion-ios-flame-outline
i.ion-ios-flame-outline
i.ion-ios-flame-outline
if (difficulty == "2")
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame-outline
i.ion-ios-flame-outline
i.ion-ios-flame-outline
if (difficulty == "3")
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame-outline
i.ion-ios-flame-outline
if (difficulty == "4")
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame-outline
if (difficulty == "5")
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame
i.ion-ios-flame
.well .well
.row.text-center .row.text-center
row.text-center row.text-center
@ -54,17 +91,15 @@ block content
var challengeSeed = !{JSON.stringify(challengeSeed)}; var challengeSeed = !{JSON.stringify(challengeSeed)};
var challengeEntryPoint = !{JSON.stringify(challengeEntryPoint)}; var challengeEntryPoint = !{JSON.stringify(challengeEntryPoint)};
var passedBonfireHash = !{JSON.stringify(bonfireHash)}; var passedBonfireHash = !{JSON.stringify(bonfireHash)};
.col-xs-12.col-sm-12.col-md-9
#mainEditorPanel.col-xs-12.col-sm-12.col-md-8 #mainEditorPanel
.panel.panel-primary.panel-bonfire
.panel-heading.text-center #{name} (Level #{difficulty} bonfire)
.panel.panel-body
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeEditor(autofocus=true) textarea#codeEditor(autofocus=true)
script(src='/js/lib/bonfire/bonfireFramework.js') script(src='/js/lib/bonfire/bonfireFramework.js')
#complete-bonfire-dialog.modal(tabindex='-1') #complete-bonfire-dialog.modal(tabindex='-1')
.modal-dialog.animated.zoomIn.fast-animation .modal-dialog.animated.zoomIn.fast-animation
.modal-content .modal-content

1
views/partials/navbar.jade
View File

@ -1,5 +1,4 @@
nav.navbar.navbar-default.navbar-fixed-top.nav-height nav.navbar.navbar-default.navbar-fixed-top.nav-height
.container
.navbar-header .navbar-header
button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse') button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
span.sr-only Toggle navigation span.sr-only Toggle navigation