finish the color priority section of basic-html

seed/challenges/basic-html5-and-css.json

@@ -3226,11 +3226,11 @@
         "  .pink-text {",
         "    color: pink;",
         "  }",
-        "  .green-text {",
+        "  .blue-text {",
-        "    color: green;",
+        "    color: blue;",
         "  }",
         "</style>",
-        "<h1 class='blue-text green-text'>Hello World!</h1>"
+        "<h1 class='pink-text blue-text'>Hello World!</h1>"
       ],
       "challengeType": 0,
       "nameCn": "",
@@ -3248,17 +3248,17 @@
     },
     {
       "id": "bad87fee1348bd9aedf07756",
-      "name": "Waypoint: Override All Other Styles with !important",
+      "name": "Waypoint: Override All Other Styles by using Important",
-      "dashedName": "waypoint-all-other-styles-with-important",
+      "dashedName": "waypoint-override-all-other-styles-by-using-important",
       "difficulty": 0.053,
       "description": [
+        "<code>.pink-text { color: pink !important; }</code>"
       ],
       "tests": [
         "assert($('h1').hasClass('pink-text'), 'Your <code>h1</code> element should have the class \"pink-text\".')",
         "assert($('h1').hasClass('blue-text'), 'Your <code>h1</code> element should have the class \"blue-text\".')",
         "assert(!$('h1').hasClass('white-text'), 'Your <code>h1</code> element should have the inline style of \"color: white\".')",
-        "assert($('h1').hasClass('yellow-text'), 'Your <code>h1</code> element should have the class \"yellow-text\".')",
+        "assert($('h1').css('color') === 'rgb(255, 192, 203)', 'Your <code>h1</code> element should be pink.')"
-        "assert($('h1').css('color') === 'rgb(255, 255, 0)', 'Your <code>h1</code> element should be yellow.')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3270,11 +3270,11 @@
         "  .pink-text {",
         "    color: pink;",
         "  }",
-        "  .green-text {",
+        "  .blue-text {",
-        "    color: green;",
+        "    color: blue;",
         "  }",
         "</style>",
-        "<h1 class='blue-text green-text' style='color: white'>Hello World!</h1>"
+        "<h1 class='pink-text blue-text' style='color: white'>Hello World!</h1>"
       ],
       "challengeType": 0,
       "nameCn": "",

seed/challenges/ziplines.json

@@ -37,47 +37,11 @@
       "namePt": "",
       "descriptionPt": []
     },
-    {
-      "id": "bd7158d8c442eddfaeb5bd1f",
-      "name": "Zipline: Use the Twitch.tv JSON API",
-      "dashedName": "zipline-use-the-twitchtv-json-api",
-      "difficulty": 1.01,
-      "challengeSeed": ["126411564"],
-      "description": [
-        "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> that successfully reverse-engineers this: <a href='http://codepen.io/GeoffStorbeck/full/GJKRxZ' target='_blank'>http://codepen.io/GeoffStorbeck/full/GJKRxZ</a>.",
-        "<span class='text-info'>Rule #1:</span> Don't look at the example project's code. Figure it out for yourself.",
-        "<span class='text-info'>Rule #2:</span> You may use whichever libraries or APIs you need.",
-        "<span class='text-info'>Rule #3:</span> Reverse engineer the example project's functionality, and also feel free to personalize it.",
-        "Here are the <a href='http://en.wikipedia.org/wiki/User_story' target='_blank'>user stories</a> you must enable, and optional bonus user stories:",
-        "<span class='text-info'>User Story:</span> As a user, I can see whether Free Code Camp is currently streaming on Twitch.tv.",
-        "<span class='text-info'>User Story:</span> As a user, I can click the status output and be sent directly to the Free Code Camp's Twitch.tv channel.",
-        "<span class='text-info'>User Story:</span> As a user, if Free Code Camp is streaming, I can see additional details about what they are streaming.",
-        "<span class='text-info'>Bonus User Story:</span> As a user, I can search through the streams listed.",
-        "<span class='text-info'>Hint:</span> Here's an example call to Twitch.tv's JSON API: <code>https://api.twitch.tv/kraken/streams/freecodecamp</code>.",
-        "<span class='text-info'>Hint:</span> The relevant documentation about this API call is here: <a href='https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel' target='_blank'>https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel</a>.",
-        "<span class='text-info'>Hint:</span> Here's an array of the Twitch.tv usernames of people who regularly stream coding: <code>[\"freecodecamp\", \"storbeck\", \"terakilobyte\", \"habathcx\",\"RobotCaleb\",\"comster404\",\"brunofin\",\"thomasballinger\",\"noobs2ninjas\",\"beohoff\"]</code>",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
-        "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
-        "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
-      ],
-      "challengeType": 3,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": []
-    },
     {
       "id": "bd7158d8c442eddfaeb5bd13",
       "name": "Zipline: Build a Random Quote Machine",
       "dashedName": "zipline-build-a-random-quote-machine",
-      "difficulty": 1.02,
+      "difficulty": 1.01,
       "challengeSeed": ["126415122"],
       "description": [
         "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> that successfully reverse-engineers this: <a href='http://codepen.io/AdventureBear/full/vEoVMw' target='_blank'>http://codepen.io/AdventureBear/full/vEoVMw</a>.",
@@ -108,7 +72,7 @@
       "id": "bd7158d8c442eddfaeb5bd10",
       "name": "Zipline: Show the Local Weather",
       "dashedName": "zipline-show-the-local-weather",
-      "difficulty": 1.03,
+      "difficulty": 1.02,
       "challengeSeed": ["126415127"],
       "description": [
         "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> that successfully reverse-engineers this: <a href='http://codepen.io/AdventureBear/full/yNBJRj' target='_blank'>http://codepen.io/AdventureBear/full/yNBJRj</a>.",
@@ -137,6 +101,42 @@
       "namePt": "",
       "descriptionPt": []
     },
+    {
+      "id": "bd7158d8c442eddfaeb5bd1f",
+      "name": "Zipline: Use the Twitch.tv JSON API",
+      "dashedName": "zipline-use-the-twitchtv-json-api",
+      "difficulty": 1.03,
+      "challengeSeed": ["126411564"],
+      "description": [
+        "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> that successfully reverse-engineers this: <a href='http://codepen.io/GeoffStorbeck/full/GJKRxZ' target='_blank'>http://codepen.io/GeoffStorbeck/full/GJKRxZ</a>.",
+        "<span class='text-info'>Rule #1:</span> Don't look at the example project's code. Figure it out for yourself.",
+        "<span class='text-info'>Rule #2:</span> You may use whichever libraries or APIs you need.",
+        "<span class='text-info'>Rule #3:</span> Reverse engineer the example project's functionality, and also feel free to personalize it.",
+        "Here are the <a href='http://en.wikipedia.org/wiki/User_story' target='_blank'>user stories</a> you must enable, and optional bonus user stories:",
+        "<span class='text-info'>User Story:</span> As a user, I can see whether Free Code Camp is currently streaming on Twitch.tv.",
+        "<span class='text-info'>User Story:</span> As a user, I can click the status output and be sent directly to the Free Code Camp's Twitch.tv channel.",
+        "<span class='text-info'>User Story:</span> As a user, if Free Code Camp is streaming, I can see additional details about what they are streaming.",
+        "<span class='text-info'>Bonus User Story:</span> As a user, I can search through the streams listed.",
+        "<span class='text-info'>Hint:</span> Here's an example call to Twitch.tv's JSON API: <code>https://api.twitch.tv/kraken/streams/freecodecamp</code>.",
+        "<span class='text-info'>Hint:</span> The relevant documentation about this API call is here: <a href='https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel' target='_blank'>https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel</a>.",
+        "<span class='text-info'>Hint:</span> Here's an array of the Twitch.tv usernames of people who regularly stream coding: <code>[\"freecodecamp\", \"storbeck\", \"terakilobyte\", \"habathcx\",\"RobotCaleb\",\"comster404\",\"brunofin\",\"thomasballinger\",\"noobs2ninjas\",\"beohoff\"]</code>",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
+        "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
+      ],
+      "challengeType": 3,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    },
     {
       "id": "bd7158d8c442eddfaeb5bd18",
       "name": "Zipline: Stylize Stories on Camper News",