From 2c3556465858401121ee40f10aef09931514208e Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 1 Jul 2016 10:13:16 +0100 Subject: [PATCH 01/20] Simplified tests (for challenge size your images) Original Code from @arun1595, updated by @atjonathan --- .../01-front-end-development-certification/html5-and-css.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/html5-and-css.json b/seed/challenges/01-front-end-development-certification/html5-and-css.json index c8406bab73..dce76aebaf 100644 --- a/seed/challenges/01-front-end-development-certification/html5-and-css.json +++ b/seed/challenges/01-front-end-development-certification/html5-and-css.json @@ -1094,9 +1094,7 @@ "

Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.

" ], "tests": [ - "assert($(\"img\").length === 1, 'message: Your code should only have 1 img tag.');", - "assert($(\"img\").attr(\"src\") && $(\"img\").attr(\"src\") === \"https://bit.ly/fcc-relaxing-cat\", 'message: Your img should have a src attribute with a value of https://bit.ly/fcc-relaxing-cat.');", - "assert($('img').attr(\"class\") && $(\"img\").attr(\"class\").match(/(^|\\s)smaller-image($|\\s)/), 'message: Your img element should have the class smaller-image.');", + "assert($(\"img[src='https://bit.ly/fcc-relaxing-cat']\").attr('class') === \"smaller-image\", 'message: Your img element should have the class smaller-image.');", "assert($(\"img\").width() === 100, 'message: Your image should be 100 pixels wide. Browser zoom should be at 100%.');" ], "type": "waypoint", From fb170382bab18591315be20562d3f3f4f07b06db Mon Sep 17 00:00:00 2001 From: Amit Kumar Singh Date: Fri, 1 Jul 2016 23:50:34 +0530 Subject: [PATCH 02/20] made output for sum and subtraction consistent with product --- .../basic-javascript.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index 57fefa2c28..883ba91045 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -293,7 +293,7 @@ "" ], "tail": [ - "(function(z){return 'sum='+z;})(sum);" + "(function(z){return 'sum = '+z;})(sum);" ], "solutions": [ "var sum = 10 + 10;" @@ -330,7 +330,7 @@ "" ], "tail": [ - "(function(z){return 'difference='+z;})(difference);" + "(function(z){return 'difference = '+z;})(difference);" ], "solutions": [ "var difference = 45 - 33;" From 1e91bc077d952e08d952db3792232ba0d108809d Mon Sep 17 00:00:00 2001 From: Tyler Stinson Date: Fri, 1 Jul 2016 13:30:34 -0700 Subject: [PATCH 03/20] Changed the existing text to the suggested test for clarity. --- .../basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index 57fefa2c28..c2356813f9 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -4401,7 +4401,7 @@ "Here is a nested object:", "
var ourStorage = {
\"desk\": {
\"drawer\": \"stapler\"
},
\"cabinet\": {
\"top drawer\": {
\"folder1\": \"a file\",
\"folder2\": \"secrets\"
},
\"bottom drawer\": \"soda\"
}
}
ourStorage.cabinet[\"top drawer\"].folder2; // \"secrets\"
ourStorage.desk.drawer; // \"stapler\"
", "

Instructions

", - "Access the myStorage object to retrieve the contents of the glove box. Use bracket notation for properties with a space in their name." + "Access the myStorage object and assign the contents of the glove box property to the gloveBoxContents variable. Use bracket notation for properties with a space in their name." ], "releasedOn": "January 1, 2016", "challengeSeed": [ From 05811cb91f3e827d4ddb9d77007d2ff8d504236f Mon Sep 17 00:00:00 2001 From: Tyler Stinson Date: Fri, 1 Jul 2016 13:41:26 -0700 Subject: [PATCH 04/20] Fixed html, to show gloveBoxVariable as code as opposed to standard test. --- .../basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index c2356813f9..00b93fe045 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -4401,7 +4401,7 @@ "Here is a nested object:", "
var ourStorage = {
\"desk\": {
\"drawer\": \"stapler\"
},
\"cabinet\": {
\"top drawer\": {
\"folder1\": \"a file\",
\"folder2\": \"secrets\"
},
\"bottom drawer\": \"soda\"
}
}
ourStorage.cabinet[\"top drawer\"].folder2; // \"secrets\"
ourStorage.desk.drawer; // \"stapler\"
", "

Instructions

", - "Access the myStorage object and assign the contents of the glove box property to the gloveBoxContents variable. Use bracket notation for properties with a space in their name." + "Access the myStorage object and assign the contents of the glove box property to the gloveBoxContents variable. Use bracket notation for properties with a space in their name." ], "releasedOn": "January 1, 2016", "challengeSeed": [ From 8d5820e24b8bad007cee2c29fc4a2b48a655077e Mon Sep 17 00:00:00 2001 From: Chad Kreutzer Date: Fri, 1 Jul 2016 09:05:36 +0000 Subject: [PATCH 05/20] improve challengeSeed for clarity and uniformity in Write Reusable JavaScript with Functions, Passing Values to Functions with Arguments, and Return a Value from a Function with Return removed comma Changed to reflect ourUniqueName()/uniqueName() pattern throughout removed debugging artifact change ourFunction(1, 9); to ourRandomRange(1, 9); Remove second function calls where appropriate. --- .../basic-javascript.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index bbb56f5a6e..997a8368df 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -920,7 +920,6 @@ "", "// Only change code below this line", "", - "", "" ], "tail": [ @@ -1352,6 +1351,7 @@ "", "// Only change code below this line", "firstLetterOfLastName = lastName;", + "", "" ], "tail": [ @@ -1611,7 +1611,7 @@ ], "challengeSeed": [ "// Example", - "var array = [\"John\", 23];", + "var ourArray = [\"John\", 23];", "", "// Only change code below this line.", "var myArray = [];", @@ -2077,14 +2077,13 @@ ], "challengeSeed": [ "// Example", - "function reusableFunction() {", + "function ourReusableFunction() {", " console.log(\"Heyya, World\");", "}", "", - "reusableFunction();", + "ourReusableFunction();", "", "// Only change code below this line", - "", "" ], "tail": [ @@ -2157,10 +2156,10 @@ ], "challengeSeed": [ "// Example", - "function functionWithArgs(a, b) {", + "function ourFunctionWithArgs(a, b) {", " console.log(a - b);", "}", - "functionWithArgs(10, 5); // Outputs 5", + "ourFunctionWithArgs(10, 5); // Outputs 5", "", "// Only change code below this line.", "", @@ -2622,7 +2621,7 @@ ], "challengeSeed": [ "// Example", - "function ourFunction(isItTrue) {", + "function ourTrueOrFalse(isItTrue) {", " if (isItTrue) { ", " return \"Yes, it's true\";", " }", @@ -4740,6 +4739,7 @@ "var myArray = [];", "", "// Only change code below this line.", + "", "" ], "tail": [ @@ -5092,12 +5092,12 @@ ], "challengeSeed": [ "// Example", - "function ourFunction(ourMin, ourMax) {", + "function ourRandomRange(ourMin, ourMax) {", "", " return Math.floor(Math.random() * (ourMax - ourMin + 1)) + ourMin;", "}", "", - "ourFunction(1, 9);", + "ourRandomRange(1, 9);", "", "// Only change code below this line.", "", From e392b37add6437c38a57e08f8a22077e2b265cdd Mon Sep 17 00:00:00 2001 From: trion129 Date: Sat, 2 Jul 2016 10:51:48 +0530 Subject: [PATCH 06/20] Rebased the branch --- client/less/main.less | 9 +++++++++ server/views/resources/about.jade | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/client/less/main.less b/client/less/main.less index 0d2614133f..d9cac6ae6e 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -1155,6 +1155,15 @@ code { } } +//make about page contact table reponsive on small screens +@media only screen +and (max-width : 400px) { + table.response-table td { + width: 100%; + display: block; + } +} + // make btn-default hover more visible .btn-default:active, .btn-default:hover { diff --git a/server/views/resources/about.jade b/server/views/resources/about.jade index d50aced8d8..c405aedf09 100644 --- a/server/views/resources/about.jade +++ b/server/views/resources/about.jade @@ -169,7 +169,7 @@ block content .row .col-xs-12.col-sm-10.col-sm-offset-1.col-md-6.col-md-offset-3 h2.text-center Whom to contact for what - table.table.table-stripe + table.table.table-stripe.response-table tr td Support ( a(href='mailto:team@freecodecamp.com') team@freecodecamp.com From 66002b3abb9f0e6ec2e54088438e0bb0f7699b13 Mon Sep 17 00:00:00 2001 From: Raj Thakur Date: Wed, 29 Jun 2016 01:19:31 +0530 Subject: [PATCH 07/20] Added MDN Link for Aarray.Prototype.sort() for furthe reference --- .../object-oriented-and-functional-programming.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seed/challenges/01-front-end-development-certification/object-oriented-and-functional-programming.json b/seed/challenges/01-front-end-development-certification/object-oriented-and-functional-programming.json index 992908b0a7..f80a377680 100644 --- a/seed/challenges/01-front-end-development-certification/object-oriented-and-functional-programming.json +++ b/seed/challenges/01-front-end-development-certification/object-oriented-and-functional-programming.json @@ -444,7 +444,8 @@ "If no compare (callback) function is passed in, it will convert the values to strings and sort alphabetically.", "Here is an example of using sort with a compare function that will sort the elements from smallest to largest number:", "
var array = [1, 12, 21, 2];
array.sort(function(a, b) {
  return a - b;
});
", - "Use sort to sort array from largest to smallest." + "Use sort to sort array from largest to smallest.", + "Further explanation on the .sort() method can be found here." ], "challengeSeed": [ "var array = [1, 12, 21, 2];", From cbb35527b10a099f07aad8292eeabcbde095bd74 Mon Sep 17 00:00:00 2001 From: Hassaan Date: Sat, 2 Jul 2016 12:59:56 -0400 Subject: [PATCH 08/20] Change Javascript to JavaScript, fix typo --- seed/challenges/04-video-challenges/computer-basics.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/seed/challenges/04-video-challenges/computer-basics.json b/seed/challenges/04-video-challenges/computer-basics.json index c885a3dcd6..a1e983eff8 100644 --- a/seed/challenges/04-video-challenges/computer-basics.json +++ b/seed/challenges/04-video-challenges/computer-basics.json @@ -905,9 +905,9 @@ true ], [ - "Javascript is a compiler language.", + "JavaScript is a compiled language.", false, - "Javascript is an interpreter language" + "JavaScript is an interpreted language." ], [ "Free Code Camp is open source.", @@ -1156,4 +1156,4 @@ "titleEs": "Seguridad en los computadores" } ] -} \ No newline at end of file +} From 2a96008fc75ddd208431912c7788f0e688b423ae Mon Sep 17 00:00:00 2001 From: BKinahan Date: Sun, 3 Jul 2016 11:19:51 +0000 Subject: [PATCH 09/20] Change background color from 'gray' to 'silver' --- .../html5-and-css.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/html5-and-css.json b/seed/challenges/01-front-end-development-certification/html5-and-css.json index c1956b440d..b7dbc2727a 100644 --- a/seed/challenges/01-front-end-development-certification/html5-and-css.json +++ b/seed/challenges/01-front-end-development-certification/html5-and-css.json @@ -2975,14 +2975,14 @@ "You can set an element's background color with the background-color property.", "For example, if you wanted an element's background color to be green, you'd put this within your style element:", "
.green-background {
  background-color: green;
}
", - "Create a class called gray-background with the background-color of gray. Assign this class to your div element." + "Create a class called silver-background with the background-color of silver. Assign this class to your div element." ], "titleRU": "Присвойте цвет фона элементу div", "descriptionRU": [ "Вы можете установить цвет фона элемента с помощью свойства background-color.", "Например, если бы вы хотели установить цвет фона элемента зелёным, вы бы использовали следующий стиль внутри вашего элемента style:", "
.green-background {
  background-color: green;
}
", - "Создайте класс gray-background со значением свойства background-color равным gray. Назначьте этот класс вашему элементу div." + "Создайте класс silver-background со значением свойства background-color равным silver. Назначьте этот класс вашему элементу div." ], "challengeSeed": [ "", @@ -3044,8 +3044,8 @@ "" ], "tests": [ - "assert($(\"div\").hasClass(\"gray-background\"), 'message: Give your div element the class gray-background.');", - "assert($(\".gray-background\").css(\"background-color\") === \"rgb(128, 128, 128)\", 'message: Your div element should have a gray background.');" + "assert($(\"div\").hasClass(\"silver-background\"), 'message: Give your div element the class silver-background.');", + "assert($(\".silver-background\").css(\"background-color\") === \"rgb(192, 192, 192)\", 'message: Your div element should have a silver background.');" ], "descriptionPtBR": [ "Você pode acrescentar uma cor de fundo de um elemento com a propriedade background-color.", @@ -3053,7 +3053,7 @@ ".green-background {", "  background-color: green;", "}", - "Crie uma classe chamada gray-background com a propriedade background-color em cinza (gray). Depois, adicione essa classe ao seu elemento div." + "Crie uma classe chamada silver-background com a propriedade background-color em cinza (silver). Depois, adicione essa classe ao seu elemento div." ], "namePtBR": "Dê uma Cor de Fundo a um Elemento Div", "type": "waypoint", @@ -3063,14 +3063,14 @@ "Puedes fijar el color de fondo de un elemento con la propiedad background-color.", "Por ejemplo, si quieres que el color de fondo de un elemento sea verde (green), dentro de tu elemento style pondrías:", "
.green-background {
  background-color: green;
}
", - "Crea una clase llamada gray-background con la propiedad background-color en gris (gray). Asigna esta clase a tu elemento div ." + "Crea una clase llamada silver-background con la propiedad background-color en gris (silver). Asigna esta clase a tu elemento div ." ], "titleDe": "Gib einem Div Element eine Hintergrundfarbe", "descriptionDe": [ "Du kannst die Hintergrundfarbe von einem Element mit dem background-color Attribut setzen", "Wenn du zum Beispiel die Hintergrundfarbe von einem Element green machen willst, schreibe dies in dein style Element:", "
.green-background {
  background-color: green;
}
", - "Erstelle eine Klasse namens gray-background mit der background-color grau (gray). Füge diese Klasse deinem div Element hinzu" + "Erstelle eine Klasse namens silver-background mit der background-color grau (silver). Füge diese Klasse deinem div Element hinzu" ] }, { @@ -3119,8 +3119,8 @@ " .smaller-image {", " width: 100px;", " }", - " .gray-background {", - " background-color: gray;", + " .silver-background {", + " background-color: silver;", " }", "", "", @@ -3130,7 +3130,7 @@ "", "\"A", "", - "
", + "
", "

Things cats love:

", "
    ", "
  • cat nip
    • ", @@ -3233,8 +3233,8 @@ " width: 100px;", " }", "", - " .gray-background {", - " background-color: gray;", + " .silver-background {", + " background-color: silver;", " }", "", "", @@ -3244,7 +3244,7 @@ "", "\"A", "", - "
    ", + "
    ", "

    Things cats love:

    ", "
      ", "
    • cat nip
      • ", From 16f99008ac604849589c6b09159fbe2d230bb054 Mon Sep 17 00:00:00 2001 From: Arun Kumar Date: Mon, 4 Jul 2016 03:55:59 +0530 Subject: [PATCH 10/20] Fix tests for uncomment html challenge --- .../01-front-end-development-certification/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/01-front-end-development-certification/html5-and-css.json b/seed/challenges/01-front-end-development-certification/html5-and-css.json index b7dbc2727a..5e89efbdee 100644 --- a/seed/challenges/01-front-end-development-certification/html5-and-css.json +++ b/seed/challenges/01-front-end-development-certification/html5-and-css.json @@ -265,7 +265,7 @@ "assert($(\"h1\").length > 0, 'message: Make your h1 element visible on your page by uncommenting it.');", "assert($(\"h2\").length > 0, 'message: Make your h2 element visible on your page by uncommenting it.');", "assert($(\"p\").length > 0, 'message: Make your p element visible on your page by uncommenting it.');", - "assert(!/-->/gi.test(code), 'message: Be sure to delete all trailing comment tags, i.e. -->.');" + "assert(!/-->/gi.test(code.replace(/ *