diff --git a/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-all-of-our-buttons.english.md b/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-all-of-our-buttons.english.md index dd3d65c3a6..bf87671166 100644 --- a/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-all-of-our-buttons.english.md +++ b/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-all-of-our-buttons.english.md @@ -10,13 +10,13 @@ challengeType: 0 ## Description
Font Awesome is a convenient library of icons. These icons can be web fonts or vector graphics. These icons are treated just like fonts. You can specify their size using pixels, and they will assume the font size of their parent HTML elements. -Use Font Awesome to add an info-circle icon to your info button and a trash icon to your delete button. -Note: The span element is an acceptable alternative to the i element for the directions below.
## Instructions
+Use Font Awesome to add an info-circle icon to your info button and a trash icon to your delete button. +Note: The span element is an acceptable alternative to the i element for the directions below.
## Tests @@ -25,11 +25,11 @@ Note: The span element is an acceptable alternative to the i< ```yml tests: - text: You should add a <i class="fas fa-info-circle"></i> within your info button element. - testString: assert($(".btn-info > i").is(".fas.fa-info-circle") || $(".btn-info > span").is(".fas.fa-info-circle"), 'You should add a <i class="fas fa-info-circle"></i> within your info button element.'); + testString: assert($(".btn-info > i").is(".fas.fa-info-circle") || $(".btn-info > span").is(".fas.fa-info-circle")); - text: You should add a <i class="fas fa-trash"></i> within your delete button element. - testString: assert($(".btn-danger > i").is(".fas.fa-trash") || $(".btn-danger > span").is(".fas.fa-trash"), 'You should add a <i class="fas fa-trash"></i> within your delete button element.'); + testString: assert($(".btn-danger > i").is(".fas.fa-trash") || $(".btn-danger > span").is(".fas.fa-trash")); - text: Make sure each of your i elements has a closing tag and <i class="fas fa-thumbs-up"></i> is in your like button element. - testString: assert(code.match(/<\/i>|<\/span/g) && code.match(/<\/i|<\/span>/g).length > 2 && ($(".btn-primary > i").is(".fas.fa-thumbs-up") || $(".btn-primary > span").is(".fas.fa-thumbs-up")), 'Make sure each of your i elements has a closing tag and <i class="fas fa-thumbs-up"></i> is in your like button element.'); + testString: assert(code.match(/<\/i>|<\/span/g) && code.match(/<\/i|<\/span>/g).length > 2 && ($(".btn-primary > i").is(".fas.fa-thumbs-up") || $(".btn-primary > span").is(".fas.fa-thumbs-up"))); ``` diff --git a/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-our-buttons.english.md b/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-our-buttons.english.md index f079cd95aa..c10f333559 100644 --- a/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-our-buttons.english.md +++ b/curriculum/challenges/english/03-front-end-libraries/bootstrap/add-font-awesome-icons-to-our-buttons.english.md @@ -16,12 +16,11 @@ In this case, we've already added it for you to this page behind the scenes. The i element was originally used to make other elements italic, but is now commonly used for icons. You can add the Font Awesome classes to the i element to turn it into an icon, for example: <i class="fas fa-info-circle"></i> Note that the span element is also acceptable for use with icons. -Use Font Awesome to add a thumbs-up icon to your like button by giving it an i element with the classes fas and fa-thumbs-up; make sure to keep the text "Like" next to the icon. ## Instructions
- +Use Font Awesome to add a thumbs-up icon to your like button by giving it an i element with the classes fa and fa-thumbs-up. Make sure to keep the text "Like" next to the icon.
## Tests @@ -30,14 +29,13 @@ Use Font Awesome to add a thumbs-up icon to your like button by giv ```yml tests: - text: Add an i element with the classes fas and fa-thumbs-up. - testString: assert($("i").is(".fas.fa-thumbs-up") || $("span").is(".fas.fa-thumbs-up"), 'Add an i element with the classes fas and fa-thumbs-up.'); + testString: assert($("i").is(".fas.fa-thumbs-up") || $("span").is(".fas.fa-thumbs-up")); - text: Your fa-thumbs-up icon should be located within the Like button. - testString: assert(($("i.fa-thumbs-up").parent().text().match(/Like/gi) && $(".btn-primary > i").is(".fas.fa-thumbs-up")) || ($("span.fa-thumbs-up").parent().text().match(/Like/gi) && $(".btn-primary > span").is(".fas.fa-thumbs-up")), 'Your fa-thumbs-up icon should be located within the Like button.'); + testString: assert(($("i.fa-thumbs-up").parent().text().match(/Like/gi) && $(".btn-primary > i").is(".fas.fa-thumbs-up")) || ($("span.fa-thumbs-up").parent().text().match(/Like/gi) && $(".btn-primary > span").is(".fas.fa-thumbs-up"))); - text: Nest your i element within your button element. - testString: assert($("button").children("i").length > 0 || $("button").children("span").length > 0, 'Nest your i element within your button element.'); + testString: assert($("button").children("i").length > 0 || $("button").children("span").length > 0); - text: Make sure your icon element has a closing tag. - testString: assert(code.match(/<\/i>|<\/span>/g), 'Make sure your icon element has a closing tag.'); - + testString: assert(code.match(/<\/i>|<\/span>/g)); ```