diff --git a/controllers/resources.json b/controllers/resources.json index 58b2a1bcf1..2026d8015e 100644 --- a/controllers/resources.json +++ b/controllers/resources.json @@ -162,12 +162,6 @@ "compliments": [ "Over the top!", "Down the rabbit hole we go!", - "Well, isn't that special!", - "Somewhere over the rainbow!", - "Follow the white rabbit!", - "Eye of the tiger!", - "Run, Forest, run!", - "Welcome to the Rock!", "Bring that rain!", "Target acquired!", "Feel that need for speed!", @@ -186,8 +180,7 @@ "The town is now red!", "To the nines!", "Nothing but net!", - "Grumpy cat approves!", - "The world rejoices!", + "The world rejoices!", "That's the way it's done!", "You rock!", "Woo-hoo!", @@ -216,38 +209,27 @@ "Sonic Boom!", "Here's looking at you, Code!", "Ride like the wind!", - "The more you code!", "Legen - wait for it - dary!", "Ludicrous Speed! Go!", "Yes you can!", "Most triumphant!", "One loop to rule them all!", - "Ain't got time to bleed!", "By the power of Grayskull!", "You did it!", "Storm that castle!", "Face-melting guitar Solo!", "Checkmate!", - "Remember the Alamo!", "Bodacious!", - "You're the man now, dog!", "Tubular!", "You're outta sight!", "Keep calm and code on!", "Even sad panda smiles!", "Even grumpy cat approves!", - "Koolaid Man says oh yeah!", + "Kool Aid Man says oh yeah!", "Bullseye!", - "You stay classy, San Diego!", - "Loud noises!", - "Me want cookie!", "Far out!", "You're heating up!", - "Crash override!", - "This is Sparta!", - "You ARE the law!", "Hasta la vista, challenge!", - "Huh? It's just a box..." ], "phrases": [ "Shout it from on top of a mountain", diff --git a/seed_data/coursewares.json b/seed_data/coursewares.json index d743390948..27454518f6 100644 --- a/seed_data/coursewares.json +++ b/seed_data/coursewares.json @@ -12,7 +12,7 @@ "To advance to the next exercise, change the h1 tag's text to say \"hello world\" instead of \"hello\"." ], "tests": [ - "expect($('h1')).to.have.text('hello world');" + "expect((/hello(\\s)+world/gi).test($('h1').text())).to.be.true;" ], "challengeSeed": [ "

hello

" @@ -30,8 +30,8 @@ "h2 elements are slightly smaller than h1 elements. There are also an h3, h4, h5 and h6 elements." ], "tests": [ - "expect($('h1')).to.have.text('hello world');", - "expect($('h2')).to.have.text('cat photo app');" + "expect((/hello(\\s)+world/gi).test($('h1').text())).to.be.true;", + "expect((/cat(\\s)+photo(\\s)+app/gi).test($('h2').text())).to.be.true;" ], "challengeSeed": [ "

hello world

" @@ -48,7 +48,7 @@ "You can create a p element like so: <p>I'm a p tag!</p>" ], "tests": [ - "expect($('p')).to.have.text('hello paragraph');" + "expect((/hello(\\s)+paragraph/gi).test($('p').text())).to.be.true;" ], "challengeSeed": [ "

hello world

", @@ -67,7 +67,7 @@ "You can start a comment with <!-- and end a comment with -->." ], "tests": [ - "expect($('h1')).to.have.text('hello world');" + "expect((/hello(\\s)+world/gi).test($('h1').text())).to.be.true;" ], "challengeSeed": [ "", "", "", "

hello world

", - "

hello html

", - "

hello paragraph

" + "

cat photo app

", + "

lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

" ], "challengeType": 0 }, @@ -305,15 +310,36 @@ "name": "Using Important to Override Styles", "difficulty" : "0.13", "description": [ - "", - "" + "Apply both the \"blue-text\" and \"urgently-red\" classes to all h2 elements, but use !important to ensure the element is rendered as being red.", + "Sometimes HTML elements will receive conflicting information from CSS classes as to how they should be styled.", + "If there's a conflict in the CSS, the browser will use whichever style declaration is closest to the bottom of the CSS document (whichever declaration comes last). Note that in-line style declarations are the final authority in how an HTML element will be rendered.", + "There's one way to ensure that an element is rendered with a certain style, regardless of where that declaration is located. That one way is to use !important.", + "Look at the example in the editor's style tag to see how you can use !important.", + "Now see if you can make sure the h2 element is rendered in the color red without removing the \"blue-text\" class, doing an in-line styling, or changing the sequence of CSS class declarations." ], "tests": [ - "expect($('h1')).to.have.class('text-center');", - "expect($('h1')).to.have.text('hello world');" + "expect($('h2')).to.have.class('urgently-red');", + "expect($('h2')).to.have.class('blue-text');", + "expect($('h2')).to.have.css('color', 'rgb(255, 0, 0)');" ], "challengeSeed": [ - "

hello world

" + "", + "", + "

hello world

", + "

cat photo app

", + "

lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

" ], "challengeType": 0 },