Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix (curriculum): added functionality to merge steps 21 - 22 and steps 41 - 42 #54917

Merged
merged 7 commits into from
May 25, 2024
Merged

fix (curriculum): added functionality to merge steps 21 - 22 and steps 41 - 42 #54917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
983dacd
Fixed the merging of steps 21 and 22
vaibhav-ace May 22, 2024
790429b
Removing step 22
vaibhav-ace May 22, 2024
e8feadc
Merged steps 41 and 42 (updated step 40)
vaibhav-ace May 22, 2024
747086a
chore: resolve conflicts
vaibhav-ace May 23, 2024
c09281f
Fixing test case bug in updated step 40
vaibhav-ace May 22, 2024
fa709ca
Fixed changes as per reviewer suggestions
vaibhav-ace May 23, 2024
81f59ef
Fixed test warnings for user as per feedback
vaibhav-ace May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 59 additions & 67 deletions curriculum/challenges/_meta/learn-intermediate-css-by-building-a-cat-painting/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,249 +94,241 @@
"id": "646ce9d790d2a44de5f99e04",
"title": "Step 21"
},
{
"id": "646ceae4d57c214e6b03576c",
"title": "Step 22"
},
{
"id": "646ceb843412c74edee27a79",
"title": "Step 23"
"title": "Step 22"
},
{
"id": "646cecc9eb5c4f4f73dafd07",
"title": "Step 24"
"title": "Step 23"
},
{
"id": "646cef0c2b98915094df7099",
"title": "Step 25"
"title": "Step 24"
},
{
"id": "646cf1206cac5f51804f49cf",
"title": "Step 26"
"title": "Step 25"
},
{
"id": "646cf2249f02ca5233d9af7c",
"title": "Step 27"
"title": "Step 26"
},
{
"id": "646cf48d8f8e1f535a1821d3",
"title": "Step 28"
"title": "Step 27"
},
{
"id": "646cf6cbca98e258da65c979",
"title": "Step 29"
"title": "Step 28"
},
{
"id": "646cf88aa884405a11ea5bcc",
"title": "Step 30"
"title": "Step 29"
},
{
"id": "646cfc2b8e6fe95c20a819d5",
"title": "Step 31"
"title": "Step 30"
},
{
"id": "646cfd853634255d02b64cc1",
"title": "Step 32"
"title": "Step 31"
},
{
"id": "646cfde6ac612e5d60391f50",
"title": "Step 33"
"title": "Step 32"
},
{
"id": "646dd556d524bc61c0139bd6",
"title": "Step 34"
"title": "Step 33"
},
{
"id": "646dd6f9caa862627dd87772",
"title": "Step 35"
"title": "Step 34"
},
{
"id": "646dd7cfd0cfac630c1dd520",
"title": "Step 36"
"title": "Step 35"
},
{
"id": "646dd8c79ec23463a3d0e356",
"title": "Step 37"
"title": "Step 36"
},
{
"id": "646dd9d9a729916460724f16",
"title": "Step 38"
"title": "Step 37"
},
{
"id": "646ddab8afd73764f5241bbf",
"title": "Step 39"
"title": "Step 38"
},
{
"id": "646ddb61ff08366570cc5902",
"title": "Step 40"
"title": "Step 39"
},
{
"id": "646ddd3f9f97a0667b964bdb",
"title": "Step 41"
},
{
"id": "646dddfb3a301c66ec513c56",
"title": "Step 42"
"title": "Step 40"
},
{
"id": "646dde7dc20dc167489faa69",
"title": "Step 43"
"title": "Step 41"
},
{
"id": "646ddf888632fa67f1180940",
"title": "Step 44"
"title": "Step 42"
},
{
"id": "646de5dc8988076a1d992afd",
"title": "Step 45"
"title": "Step 43"
},
{
"id": "646de6a97b50a86ac487de86",
"title": "Step 46"
"title": "Step 44"
},
{
"id": "646de7b64467e96b7d35b5cd",
"title": "Step 47"
"title": "Step 45"
},
{
"id": "646de8478d6f796bfbdccfb2",
"title": "Step 48"
"title": "Step 46"
},
{
"id": "646de8d204a3426c7d184372",
"title": "Step 49"
"title": "Step 47"
},
{
"id": "646dea1c98c2426d43a705c3",
"title": "Step 50"
"title": "Step 48"
},
{
"id": "646deb169847f86df0f95bfc",
"title": "Step 51"
"title": "Step 49"
},
{
"id": "646dec359bef3b7811fba5a6",
"title": "Step 52"
"title": "Step 50"
},
{
"id": "646dedbcba062079128b2ecc",
"title": "Step 53"
"title": "Step 51"
},
{
"id": "646def5e863abf7a14501421",
"title": "Step 54"
"title": "Step 52"
},
{
"id": "646df03c8f79337ab46f148b",
"title": "Step 55"
"title": "Step 53"
},
{
"id": "646df0cf26413a7b35e4b8b3",
"title": "Step 56"
"title": "Step 54"
},
{
"id": "646df1d1aa4ae57bdf1869c4",
"title": "Step 57"
"title": "Step 55"
},
{
"id": "646dffd8ce9ac77ec1906f2e",
"title": "Step 58"
"title": "Step 56"
},
{
"id": "64a2687ef267e5934a2f93e3",
"title": "Step 59"
"title": "Step 57"
},
{
"id": "64a26ac5540c5493f4641f10",
"title": "Step 60"
"title": "Step 58"
},
{
"id": "646f0417322c0e04983a5149",
"title": "Step 61"
"title": "Step 59"
},
{
"id": "646f08293804a30685533c6f",
"title": "Step 62"
"title": "Step 60"
},
{
"id": "646f09293eb3230723a62f77",
"title": "Step 63"
"title": "Step 61"
},
{
"id": "646f0c9a1e3360092d1bbd33",
"title": "Step 64"
"title": "Step 62"
},
{
"id": "646f0ce5737243098ad6e494",
"title": "Step 65"
"title": "Step 63"
},
{
"id": "646f0ef13604420a8744f7d4",
"title": "Step 66"
"title": "Step 64"
},
{
"id": "646f0f7c5933560af8e7e380",
"title": "Step 67"
"title": "Step 65"
},
{
"id": "646f102bf87b350b593baa72",
"title": "Step 68"
"title": "Step 66"
},
{
"id": "646f107abb89d00bb99f387a",
"title": "Step 69"
"title": "Step 67"
},
{
"id": "64a3bcbc83e574b58c8ed048",
"title": "Step 70"
"title": "Step 68"
},
{
"id": "646f12da0b4c5d0ca162834a",
"title": "Step 71"
"title": "Step 69"
},
{
"id": "646f135eab69d90d0c6d4e9b",
"title": "Step 72"
"title": "Step 70"
},
{
"id": "646f159b2cffb21150b927cb",
"title": "Step 73"
"title": "Step 71"
},
{
"id": "646f164bf100dd11d226161f",
"title": "Step 74"
"title": "Step 72"
},
{
"id": "646f1764e2f1d212ba9785a7",
"title": "Step 75"
"title": "Step 73"
},
{
"id": "646f1802a09a171332e14630",
"title": "Step 76"
"title": "Step 74"
},
{
"id": "646f4d6c42dc5f214f4e7444",
"title": "Step 77"
"title": "Step 75"
},
{
"id": "646f4e46e81f7021d5fd9c1d",
"title": "Step 78"
"title": "Step 76"
},
{
"id": "646f4f6a14e3c522d130a0d2",
"title": "Step 79"
"title": "Step 77"
},
{
"id": "646f4fe12b7985232bf475a5",
"title": "Step 80"
"title": "Step 78"
},
{
"id": "646f507e4d1cd323f17db4fc",
"title": "Step 81"
"title": "Step 79"
},
{
"id": "646f516dbfc1342495515625",
"title": "Step 82"
"title": "Step 80"
}
],
"helpCategory": "HTML-CSS"
Expand Down
30 changes: 25 additions & 5 deletions ...2/learn-intermediate-css-by-building-a-cat-painting/646ce9d790d2a44de5f99e04.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,46 @@ dashedName: step-21

# --description--

Inside your `.cat-left-ear` element, create another `div` element with the class `cat-left-inner-ear`.
Create two `div` elements, the first inside the `.cat-left-ear` element with a class of `cat-left-inner-ear`, and the second inside the `.cat-right-ear` element with a class of `cat-right-inner-ear`.

vaibhav-ace marked this conversation as resolved.
Show resolved Hide resolved
# --hints--

You should not change the existing `div` element with the class `cat-left-ear`.
You should not change the existing `div` element with the class `cat-left-inner-ear`.

```js
assert(document.querySelectorAll('div.cat-left-ear').length === 1);
```

You should have a `div` element inside your `.cat-left-ear` element.
You should not change the existing `div` element with the class `cat-right-inner-ear`.

```js
assert(document.querySelectorAll('div.cat-right-ear').length === 1);
```

You should have one `div` element inside your `.cat-left-ear` element.

```js
assert(document.querySelectorAll('.cat-left-ear div').length === 1);
```

Your `div` element should have the class `cat-left-inner-ear`.
You should have one `div` element inside your `.cat-right-ear` element.

```js
assert(document.querySelectorAll('.cat-right-ear div').length === 1);
```

The new `div` element inside `.cat-left-ear` should have the class `cat-left-inner-ear`.

```js
assert(document.querySelectorAll('.cat-left-ear div')[0]?.classList.contains('cat-left-inner-ear'));
```

The new `div` element inside `.cat-right-ear` should have the class `cat-right-inner-ear`.

```js
assert(document.querySelectorAll('.cat-right-ear div')[0]?.classList.contains('cat-right-inner-ear'));
```

# --seed--

## --seed-contents--
Expand All @@ -47,10 +65,12 @@ assert(document.querySelectorAll('.cat-left-ear div')[0]?.classList.contains('ca
<div class="cat-ears">
--fcc-editable-region--
<div class="cat-left-ear">

</div>
<div class="cat-right-ear">

</div>
--fcc-editable-region--
<div class="cat-right-ear"></div>
</div>
</div>
</main>
Expand Down
Loading
Loading