From c4817d630245384854d7a13c8bb676b55ffb7fd0 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Wed, 27 May 2015 10:44:42 -0400 Subject: [PATCH 1/5] Update copy for pair programming challenge to tell users to advance the challenge to begin bonfires, closes #616 --- seed_data/challenges/basic-bonfires.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/seed_data/challenges/basic-bonfires.json b/seed_data/challenges/basic-bonfires.json index b35ce5c45b0..56c58cfd36a 100644 --- a/seed_data/challenges/basic-bonfires.json +++ b/seed_data/challenges/basic-bonfires.json @@ -19,8 +19,7 @@ "Add them as a new contact in Screen Hero, then click the monitor-looking button to attempt to share your screen with them.", "Once the Screen Hero session starts, your screen's margins will glow orange. You are now sharing your screen.", "Your pair will have their own cursor, and will be able to type text on his or her and keyboard.", - "Now it's time to tackle our Bonfires.", - "Go to http://freecodecamp.com/bonfires and start working through our Bonfire challenges.", + "Now it's time to tackle our Bonfires. You can begin them by advancing to the next challenge.", "Once you you finish pair programming, end the session in Screen Hero session.", "Congratulations! You have completed your first pair programming session.", "Pair program as much as possible with different campers until you've completed all the Bonfire challenges. This is a big time investment, but the JavaScript practice you get will be well worth it!", From 63fae51651a5d1fdfe5690ed94eb874ec2a378c6 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Wed, 27 May 2015 11:22:36 -0400 Subject: [PATCH 2/5] Update instructions and test output for line up form elements waypoint, closes #621 --- seed_data/challenges/bootstrap.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed_data/challenges/bootstrap.json b/seed_data/challenges/bootstrap.json index 9089122e31d..cc513248cd9 100644 --- a/seed_data/challenges/bootstrap.json +++ b/seed_data/challenges/bootstrap.json @@ -1183,12 +1183,12 @@ "name": "Waypoint: Line up Form Elements Responsively with Bootstrap", "difficulty" : 0.062, "description": [ - "Wrap both your form's text input field and submit button within a div with the class \"row\". Wrap your form's text input field within a div with the class of \"col-xs-7\". Wrap your form's submit button the in a div with the class \"col-xs-5\".", "Now let's get your form input and your submission button on the same line. We'll do this the same way we have previously: by using a \"row\" element with \"col-xs-*\" elements withing it.", + "Wrap both your form's text input field and submit button within a div with the class \"row\". Wrap your form's text input field within a div with the class of \"col-xs-7\". Wrap your form's submit button the in a div with the class \"col-xs-5\".", "This is the last challenge we'll do for our Cat Photo App for now. We hope you've enjoyed learning Font Awesome, Bootstrap, and responsive design!" ], "tests": [ - "assert($('.row').length > 4, 'Wrap your all of your checkboxes inside one div with the class \"row\".')", + "assert($('.row').length > 4, 'Wrap your form submission button and text area in a div with class \"row\".')", "assert($('.col-xs-5').length > 0, 'Wrap your form submission button in a div with the class \"col-xs-5\".')", "assert($('.col-xs-7').length > 0, 'Wrap your form text area in a div with the class \"col-xs-7\".')" ], From b76cc9ea22a2d9d35181cc937445cac6e7afc04e Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Wed, 27 May 2015 11:40:48 -0400 Subject: [PATCH 3/5] Add link to image to bootstrap site to show grid in more detail, closes #622 --- seed_data/challenges/bootstrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed_data/challenges/bootstrap.json b/seed_data/challenges/bootstrap.json index cc513248cd9..04ea59b0e06 100644 --- a/seed_data/challenges/bootstrap.json +++ b/seed_data/challenges/bootstrap.json @@ -532,7 +532,7 @@ "Put the \"like\", \"Info\" and \"Delete\" buttons side-by-side by wrapping all three of them within one <div class=\"row\"> element, then each of them within a <div class=\"col-xs-4\"> element.", "Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a div element.", "Here's a diagram of how Bootstrap's 12-column grid layout works:", - "", + "", "Note that in this illustration, we use the col-md-* class. Here, \"md\" means \"medium\", and \"*\" is a number specifying how many columns wide the element should be. In this case, we're specifying how many columns wide an element should be on a medium-sized screen, such as a laptop.", "In the Cat Photo App that we're building, we'll use col-xs-*, where \"*\" is the number of columns wide the element should be, and \"xs\" means \"extra small\", like an extra-small mobile phone screen.", "The row class is applied to a div, and the buttons themselves can be wrapped within it." From 33308e057106ca2ae9336a9b9e4d74768916c8b1 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Wed, 27 May 2015 12:32:31 -0400 Subject: [PATCH 4/5] Updated tests to verify placeholder text in use html 5 to require waypoint and closes #643 --- seed_data/challenges/basic-html5-and-css.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index 6290601fa61..43032e22393 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -1325,8 +1325,8 @@ "For example, if you wanted to make a text input field required, you can just add the word \"required\" within your input element use: <input type='text' required>" ], "tests": [ - "assert($('input').prop('required'), 'Your text field have the property of being required.')", - "assert($('[placeholder]').length > 0, 'Your text field should have the placeholder text of \"cat photo URL\".')" + "assert($('input').prop('required'), 'Your text field should have the property of being required.')", + "assert(new RegExp('cat photo URL').test($('input').prop('placeholder')), 'Your text field should have the placeholder text of \"cat photo URL\".')" ], "challengeSeed": [ "", From 5bbc0acc1656fde2a81d82fe418542dd89a8102b Mon Sep 17 00:00:00 2001 From: Doug Shamoo Date: Thu, 28 May 2015 01:09:52 +0800 Subject: [PATCH 5/5] Fix for issue #645. Small grammatical error --- seed_data/challenges/basic-html5-and-css.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index 43032e22393..d0c89c1fa46 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -1013,8 +1013,8 @@ "tests": [ "assert($('ul').length > 0, 'You should have an ul element on your webpage.')", "assert($('ol').length > 0, 'You should have an ol element on your webpage.')", - "assert($('li').length > 5, 'You should have three li elements on within your ul element.')", - "assert($('li').length > 5, 'You should have three li elements on within your ol element.')" + "assert($('li').length > 5, 'You should have three li elements within your ul element.')", + "assert($('li').length > 5, 'You should have three li elements within your ol element.')" ], "challengeSeed": [ "",