diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index 8d91a594c8..12f5fce01f 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -354,7 +354,7 @@ "description": [ "Delete your h2 element's style attribute and instead create a CSS style element. Add the necessary CSS to turn all h2 elements blue.", "With CSS, there are hundreds of CSS \"attributes\" that you can use to change the way an element looks on your page.", - "When you entered <h2 style=\"color: red\">CatPhotoApp<h2>, you were giving that individual h2 element an \"inline style\".", + "When you entered <h2 style=\"color: red\">CatPhotoApp</h2>, you were giving that individual h2 element an \"inline style\".", "That's one way to add style to an element, but a better way is by using Cascading Style Sheets (CSS).", "At the top of your code, create a style element like this: <style></style>", "Inside that style element, you can create a \"CSS selector\" for all h2 elements. For example, if you wanted all h2 elements to be red, your style element would look like this: <style>h2 {color: red;}</style>", @@ -398,8 +398,13 @@ "Classes are reusable styles that can be added to HTML elements.", "Here's the anatomy of a CSS class:", "a diagram of how style tags are composed, which is also described in detail on the following lines.", +<<<<<<< HEAD "Here you can see that we've created a CSS class called \"blue-text\" within the <style> tag.", "You can apply a class to an HTML element like this: <h2 class=\"blue-text\">CatPhotoApp<h2>", +======= + "You can see that we've created a CSS class called \"blue-text\" within the <style> tag.", + "You can apply a class to an HTML element like this: <h2 class=\"blue-text\">CatPhotoApp</h2>", +>>>>>>> d403204a3133042b8b7828f29ba1932674e71a66 "Note that in your CSS style element, classes should start with a period. In your HTML elements' class declarations, classes shouldn't start with a period.", "Instead of creating a new style element, try removing the h2 style declaration from your existing style element, then replace it with the class declaration for \".red-text\"." ], @@ -1161,7 +1166,7 @@ "description": [ "Wrap your img element inside an anchor element with a dead link.", "You can make elements into links by wrapping them in an anchor tag.", - "Wrap your image in an anchor tag. Here's an example: <a href='#'><img src='http://bit.ly/fcc-kittens2'></a>", + "Wrap your image in an anchor tag. Here's an example: <a href='#'><img src='http://bit.ly/fcc-kittens2'/></a>", "Remember to use the hash symbol as your anchor tag's href property in order to turn it into a dead link.", "Once you've done this, hover over your image with your cursor. Your cursor's normal pointer should become the link clicking pointer. The photo is now a link." ], @@ -1290,7 +1295,7 @@ "Replace the paragraph elements with an unordered list of three things that cats love.", "HTML has a special element for creating unordered lists, or bullet point-style lists.", "Unordered lists start with a <ul> element. Then they contain some number of <li> elements.", - "For example: <ul><li>milk</li><li>cheese</li><ul> would create a bulleted list of \"milk\" and \"cheese\"." + "For example: <ul><li>milk</li><li>cheese</li></ul> would create a bulleted list of \"milk\" and \"cheese\"." ], "tests": [ "assert($('ul').length > 0, 'Create a ul element.')", @@ -1353,7 +1358,7 @@ "Create an ordered list of the top 3 things cats hate the most.", "HTML has a special element for creating ordered lists, or numbered-style lists.", "Ordered lists start with a <ol> element. Then they contain some number of <li> elements.", - "For example: <ol><li>hydrogen</li><li>helium</li><ol> would create a numbered list of \"hydrogen\" and \"helium\"." + "For example: <ol><li>hydrogen</li><li>helium</li></ol> would create a numbered list of \"hydrogen\" and \"helium\"." ], "tests": [ "assert($('ul').length > 0, 'You should have an ul element on your webpage.')",