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

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-08-22 18:08:37 -07:00
parent 4cc423e488 810e40e4db
commit 9fc3fd72b1
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,2 @@
We're getting a lot of duplicate issues and bug reports that just aren't reporting actual bugs.
So, before you submit your issue, please read the [Help! I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help!-I've-Found-a-Bug) wiki page.

2
public/js/main_0.0.3.js
View File

@ -62,7 +62,7 @@ $(document).ready(function() {
$('.close-modal').unbind('click'); $('.close-modal').unbind('click');
$('.close-modal').on('click', function(){ $('.close-modal').on('click', function(){
setTimeout(function() { setTimeout(function() {
$('#help-modal').modal('hide'); $('.close-modal').parent().parent().parent().parent().modal('hide');
}, 200); }, 200);
}); });

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

@ -843,7 +843,7 @@
"<code>&thinsp;&thinsp;ourArray.push(i);</code>", "<code>&thinsp;&thinsp;ourArray.push(i);</code>",
"<code>&thinsp;&thinsp;i++;</code>", "<code>&thinsp;&thinsp;i++;</code>",
"<code>}</code>", "<code>}</code>",
"Let's try getting a for loop to work by pushing values to an array." "Let's try getting a while loop to work by pushing values to an array."
], ],
"tests":[ "tests":[
"assert(editor.getValue().match(/while/g), 'You should be using a while loop for this.');", "assert(editor.getValue().match(/while/g), 'You should be using a while loop for this.');",

2
seed/challenges/jquery.json
View File

@ -786,7 +786,7 @@
"difficulty": 3.16, "difficulty": 3.16,
"description": [ "description": [
"You can also target all the even-numbered elements.", "You can also target all the even-numbered elements.",
"Here's how you would target all the odd-numbered elements with class <code>target</code> and give them classes: <code>$('.target:odd').addClass('animated shake');</code>", "Here's how you would target all the odd-numbered elements with class <code>target</code> and give them classes: <code>$(\".target:odd\").addClass(\"animated shake\");</code>",
"Try selecting all the even-numbered elements - that is, what your browser will consider even-numbered elements - and giving them the classes of <code>animated</code> and <code>shake</code>." "Try selecting all the even-numbered elements - that is, what your browser will consider even-numbered elements - and giving them the classes of <code>animated</code> and <code>shake</code>."
], ],
"tests": [ "tests": [

2
server/views/partials/challenge-modals.jade
View File

@ -9,7 +9,7 @@
a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-install-Screenhero' target='_blank') Screenhero a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-install-Screenhero' target='_blank') Screenhero
| . | .
h3 Other campers may then message you about pair programming. h3 Other campers may then message you about pair programming.
a.btn.btn-lg.btn-primary.btn-block(href='https://gitter.im/FreeCodeCamp/LetsPair', data-dismiss='modal', aria-hidden='true' target='_blank') Take me to the pair programming room a.btn.btn-lg.btn-primary.btn-block.close-modal(href='https://gitter.im/FreeCodeCamp/LetsPair', target='_blank') Take me to the pair programming room
a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
#issue-modal.modal(tabindex='-1') #issue-modal.modal(tabindex='-1')