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

More UX improvements

Browse Source
This commit is contained in:
Nathan Leniz
2015-02-22 16:46:55 +09:00
parent a197e99b1e
commit 90caed3369
4 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/lib/bootstrap/variables.less
View File

@@ -16,7 +16,7 @@
@brand-primary: #215f1e; @brand-primary: #215f1e;
@brand-success: #457E86; @brand-success: #457E86;
@brand-info: #5bc0de; @brand-info: #4A2B0F;
@brand-warning: #f0ad4e; @brand-warning: #f0ad4e;
@brand-danger: #d9534f; @brand-danger: #d9534f;

11
public/css/main.less
View File

@@ -543,6 +543,17 @@ thead {
padding-left: 50px; padding-left: 50px;
} }
.all-list-header {
background-color: #4A2B0F;
color: #eee;
font-size: 36px;
text-align: center;
margin-bottom: -30px;
border-radius: 5px 5px 0px 0px;
padding-left: 50px;
}
.closing-x { .closing-x {
color: #eee; color: #eee;
font-size: 50px; font-size: 50px;

10
public/js/main.js
View File

@@ -74,6 +74,11 @@ $(document).ready(function() {
editor.focus(); editor.focus();
}); });
$('#all-bonfires-dialog').on('hidden.bs.modal', function() {
editor.focus();
});
$('#complete-courseware-dialog').on('hidden.bs.modal', function() { $('#complete-courseware-dialog').on('hidden.bs.modal', function() {
editor.focus(); editor.focus();
}); });
@@ -92,13 +97,14 @@ $(document).ready(function() {
} }
}) })
} }
}) });
$('.all-challenges').on('click', function() { $('.all-challenges').on('click', function() {
$('#all-challenges-dialog').modal('show'); $('#all-challenges-dialog').modal('show');
}); });
$('.all-bonfires').on('click', function() { $('#showAllButton').on('click', function() {
$('#all-bonfires-dialog').modal('show'); $('#all-bonfires-dialog').modal('show');
}); });

15
views/bonfire/show.jade
View File

@@ -79,6 +79,7 @@ block content
span.ion-help-circled span.ion-help-circled
| Less information | Less information
#submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter) #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
#showAllButton.btn.btn-info.btn-big.btn-block Show all coding challenges
br br
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
@@ -133,11 +134,11 @@ block content
- else - else
a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
//#all-bonfires-dialog.modal(tabindex='-1') #all-bonfires-dialog.modal(tabindex='-1')
// .modal-dialog.animated.fadeInUp.fast-animation .modal-dialog.animated.fadeInUp.fast-animation
// .modal-content .modal-content
// .modal-header.challenge-list-header Bonfires .modal-header.all-list-header Bonfires
// a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
// .modal-body .modal-body
// include ../partials/bonfires include ../partials/bonfires