diff --git a/curriculum/challenges/_meta/workshop-curriculum-outline/meta.json b/curriculum/challenges/_meta/workshop-curriculum-outline/meta.json index ac070923fb0..6a4f81191d4 100644 --- a/curriculum/challenges/_meta/workshop-curriculum-outline/meta.json +++ b/curriculum/challenges/_meta/workshop-curriculum-outline/meta.json @@ -12,20 +12,20 @@ "id": "6823ac607bfdbc46331b2559", "title": "Step 1" }, - { - "id": "682cd206883fc7b25eb539c5", + { + "id": "682ba2318000b62f179bdf04", "title": "Step 2" }, { - "id": "682cd20b883fc7b25eb539c6", + "id": "682cd206883fc7b25eb539c5", "title": "Step 3" }, { - "id": "682ba2318000b62f179bdf04", + "id": "6823c1a0bcada44f32bf0bdc", "title": "Step 4" }, { - "id": "6823c1a0bcada44f32bf0bdc", + "id": "682cd20b883fc7b25eb539c6", "title": "Step 5" }, { @@ -45,9 +45,13 @@ "title": "Step 9" }, { - "id": "6823e637c1c0ed56f781b4fc", + "id": "683921c4769fd23dbadec2fe", "title": "Step 10" + }, + { + "id": "6823e637c1c0ed56f781b4fc", + "title": "Step 11" } ], "helpCategory": "HTML-CSS" -} \ No newline at end of file +} diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823ac607bfdbc46331b2559.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823ac607bfdbc46331b2559.md index 845dd317317..fcc5d23dd11 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823ac607bfdbc46331b2559.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823ac607bfdbc46331b2559.md @@ -8,7 +8,7 @@ demoType: onLoad # --description-- -Welcome to your code editor, where you can write HTML code. +HTML stands for HyperText Markup Language. It's the code that defines the structure and content of a webpage. This is your code editor, where you'll write HTML. Find line 1 in the editor and type this text: @@ -37,4 +37,3 @@ assert.match(code, /welcome\s*to\s*freecodecamp/i) --fcc-editable-region-- ``` - diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823c1a0bcada44f32bf0bdc.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823c1a0bcada44f32bf0bdc.md index c1f44c98eae..00734571c38 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823c1a0bcada44f32bf0bdc.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823c1a0bcada44f32bf0bdc.md @@ -1,8 +1,8 @@ --- id: 6823c1a0bcada44f32bf0bdc -title: Step 5 +title: Step 4 challengeType: 0 -dashedName: step-5 +dashedName: step-4 --- # --description-- @@ -10,26 +10,26 @@ dashedName: step-5 An `h1` element is the main heading of a webpage and you should only use one per page. `h2` elements represent subheadings. You can have multiple per page and they look like this: ```html -

I am a subheading.

+

This is a subheading.

``` Turn the `Full Stack Curriculum` text into an `h2` element by surrounding it with opening and closing `h2` tags. # --hints-- -Your `h2` element should have an opening tag. Opening tags have this syntax: ``. +Your `h2` element should have an opening `

` tag. ```js assert.exists(document.querySelector("h2")); ``` -Your `h2` element should have a closing tag. Closing tags have this syntax: ``. +Your `h2` element should have a closing `

` tag. ```js assert.match(code, /<\/h2\s*\>/); ``` -Your `h2` element's text should be `Full Stack Curriculum`. +Your `h2` element should look like this: `

Full Stack Curriculum

`. ```js // purposefully removing friction for early users to help improve retention in early lessons @@ -37,12 +37,6 @@ Your `h2` element's text should be `Full Stack Curriculum`. assert.match(code, /\\s*Full\s*Stack\s*Curriculum\s*\<\/h2\s*\>/i); ``` -Your `h2` element should be below your `h1` element. - -```js -assert.exists(document.querySelector("h1 + h2")); -``` - # --seed-- ## --seed-contents-- @@ -52,5 +46,4 @@ assert.exists(document.querySelector("h1 + h2")); --fcc-editable-region-- Full Stack Curriculum --fcc-editable-region-- -Learn the skills to become a full stack developer ``` diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d6244511f252c8300eed.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d6244511f252c8300eed.md index 3b0cfb53cac..22fab5e10c3 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d6244511f252c8300eed.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d6244511f252c8300eed.md @@ -10,7 +10,7 @@ dashedName: step-6 When you need to add a paragraph to a webpage, you can use the `p` element like this: ```html -

I am a paragraph element.

+

This is a paragraph element.

``` Turn `Learn all of the skills to become a full stack developer` into a paragraph element. diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d9ac8bdc3853df65a1ff.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d9ac8bdc3853df65a1ff.md index bdc0942b778..83d1ef37579 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d9ac8bdc3853df65a1ff.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823d9ac8bdc3853df65a1ff.md @@ -7,18 +7,9 @@ dashedName: step-7 # --description-- -There are six heading elements in HTML. Here are all of them in order from most important to least: +There are six heading elements in HTML: `h1` through `h6`. They're used to show the importance of sections on your webpage, with `h1` being the most important and `h6` the least. -```html -

Heading level 1

-

Heading level 2

-

Heading level 3

-

Heading level 4

-
Heading level 5
-
Heading level 6
-``` - -Below your `p` element, add an `h3` element that displays the following text: +Below your `p` element, add an `h3` heading with the text: ```md Introduction to HTML @@ -26,19 +17,19 @@ Introduction to HTML # --hints-- -Your `h3` element should have an opening tag. Opening tags have this syntax: ``. +Your `h3` element should have an opening `

` tag. ```js assert.exists(document.querySelector("h3")); ``` -Your `h3` element should have a closing tag. Closing tags have this syntax: ``. +Your `h3` element should have a closing `

` tag. ```js assert.match(code, /<\/h3\s*\>/); ``` -Your `h3` element's text should be `Introduction to HTML`. You can copy the text from the instructions. +Your `h3` element's text should be `Introduction to HTML`. ```js // purposefully removing friction for early users to help improve retention in early lessons diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e169fda14755fbf00445.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e169fda14755fbf00445.md index e207a2504d1..96281273be2 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e169fda14755fbf00445.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e169fda14755fbf00445.md @@ -7,20 +7,12 @@ dashedName: step-9 # --description-- -You're getting the hang of it. Now it is time to add another `h3` and `p` element to the page. - -First, add an `h3` element with the text: +You're getting the hang of it. Next, add another `h3` element at the bottom of the editor with the text: ```md Introduction to CSS ``` -Then, below that `h3` element, add a `p` element with the following text: - -```md -CSS is used to style a webpage -``` - # --hints-- You should add a second `h3` element to the page. @@ -37,20 +29,6 @@ Your `h3` element's text should be `Introduction to CSS`. assert.match(code, /\\s*Introduction\s*to\s*CSS\s*\<\/h3\s*\>/i); ``` -You should add a third `p` element to the page. - -```js -assert.lengthOf(document.querySelectorAll("p"), 3); -``` - -Your `p` element should have the text `CSS is used to style a webpage`. You can copy the text from the instructions. - -```js -// purposefully removing friction for early users to help improve retention in early lessons -// this if very forgiving of spaces and casing -assert.match(code, /\\s*CSS\s*is\s*used\s*to\s*style\s*a\s*webpage\s*\<\/p\s*\>/i); -``` - # --seed-- ## --seed-contents-- diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e637c1c0ed56f781b4fc.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e637c1c0ed56f781b4fc.md index c6451bd9753..ee5579d7123 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e637c1c0ed56f781b4fc.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/6823e637c1c0ed56f781b4fc.md @@ -1,13 +1,15 @@ --- id: 6823e637c1c0ed56f781b4fc -title: Step 10 +title: Step 11 challengeType: 0 -dashedName: step-10 +dashedName: step-11 --- # --description-- -For the last step of the workshop, you will add another `h3` and `p` element to the page. +Finally, JavaScript makes your webpage interactive — it lets you tell the page what to do when someone clicks a button, submits a form, or many other things. + +For the last step of the workshop, add another `h3` and `p` element to the page describing JavaScript. First, add an `h3` element with the text: diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682ba2318000b62f179bdf04.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682ba2318000b62f179bdf04.md index c3d7dba5c29..ff699566a3e 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682ba2318000b62f179bdf04.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682ba2318000b62f179bdf04.md @@ -1,8 +1,8 @@ --- id: 682ba2318000b62f179bdf04 -title: Step 4 +title: Step 2 challengeType: 0 -dashedName: step-4 +dashedName: step-2 --- # --description-- @@ -19,19 +19,19 @@ Turn your `Welcome to freeCodeCamp` text into an `h1` element by adding an openi # --hints-- -Your `h1` element should have an opening tag. Opening tags have this syntax: ``. +Your `h1` element should have an opening `

` tag. ```js assert.exists(document.querySelector("h1")); ``` -Your `h1` element should have a closing tag. Closing tags have this syntax: ``. +Your `h1` element should have a closing `

` tag. ```js assert.match(code, /<\/h1\s*\>/); ``` -Your `h1` element's text should be `Welcome to freeCodeCamp`. You have either omitted the text, have a typo, or it is not between the `h1` element's opening and closing tags. +Your `h1` element should look like this: `

Welcome to freeCodeCamp

`. ```js // purposefully removing friction for early users to help improve retention in early lessons @@ -39,16 +39,6 @@ Your `h1` element's text should be `Welcome to freeCodeCamp`. You have either om assert.match(code, /\\s*Welcome\s*to\s*freeCodeCamp\s*\<\/h1\s*\>/i); ``` -You appear to be using a browser extension that is modifying the page. Be sure to turn off all browser extensions. - -```js -if(__checkForBrowserExtensions){ - assert.isAtMost(document.querySelectorAll("script").length, 2); - assert.equal(document.querySelectorAll("style").length, 1); - assert.equal(document.querySelectorAll("link").length, 0); -} -``` - # --seed-- ## --seed-contents-- @@ -57,6 +47,4 @@ if(__checkForBrowserExtensions){ --fcc-editable-region-- Welcome to freeCodeCamp --fcc-editable-region-- -Full Stack Curriculum -Learn the skills to become a full stack developer ``` diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd206883fc7b25eb539c5.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd206883fc7b25eb539c5.md index 68c3987c617..9c329a43d33 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd206883fc7b25eb539c5.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd206883fc7b25eb539c5.md @@ -1,22 +1,20 @@ --- id: 682cd206883fc7b25eb539c5 -title: Step 2 +title: Step 3 challengeType: 0 -dashedName: step-2 +dashedName: step-3 --- # --description-- -Notice that the HTML code you write in the editor shows up in the preview. +Notice that the HTML you write in the editor shows up in the preview. In this workshop, you will write the HTML for a partial curriculum webpage. -Below the text you added, type the following on line 2: +Below your `h1` element, type the following on the empty line: ```md Full Stack Curriculum ``` -When you are done, click the "check your code" button to see if it's correct. - # --hints-- You should have the text `Full Stack Curriculum` in your editor. Double-check for spelling. @@ -32,9 +30,8 @@ assert.match(code, /full\s*stack\s*curriculum/i) ## --seed-contents-- ```html -Welcome to freeCodeCamp +

Welcome to freeCodeCamp

--fcc-editable-region-- --fcc-editable-region-- ``` - diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd20b883fc7b25eb539c6.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd20b883fc7b25eb539c6.md index 44c276d40b7..c0fa7490a10 100644 --- a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd20b883fc7b25eb539c6.md +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/682cd20b883fc7b25eb539c6.md @@ -1,14 +1,12 @@ --- id: 682cd20b883fc7b25eb539c6 -title: Step 3 +title: Step 5 challengeType: 0 -dashedName: step-3 +dashedName: step-5 --- # --description-- -HTML stands for HyperText Markup Language. It represents the content and structure of a webpage. In this workshop, you will write the HTML code for a partial curriculum outline. - Below the other two lines of text, add: ```md @@ -30,10 +28,9 @@ assert.match(code, /learn\s*the\s*skills\s*to\s*become\s*a\s*full\s*stack\s*deve ## --seed-contents-- ```html -Welcome to freeCodeCamp -Full Stack Curriculum +

Welcome to freeCodeCamp

+

Full Stack Curriculum

--fcc-editable-region-- --fcc-editable-region-- ``` - diff --git a/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/683921c4769fd23dbadec2fe.md b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/683921c4769fd23dbadec2fe.md new file mode 100644 index 00000000000..2d50ae3efee --- /dev/null +++ b/curriculum/challenges/english/25-front-end-development/workshop-curriculum-outline/683921c4769fd23dbadec2fe.md @@ -0,0 +1,64 @@ +--- +id: 683921c4769fd23dbadec2fe +title: Step 10 +challengeType: 0 +dashedName: step-10 +--- + +# --description-- + +While HTML defines the structure and content of a webpage, CSS is used to add style — things like colors, fonts, spacing, and layout. + +Below the `h3` you just added, add another paragraph element with the text: + +```md +CSS is used to style a webpage +``` + +# --hints-- + +You should add a second `h3` element to the page. + +```js +assert.lengthOf(document.querySelectorAll("h3"), 2); +``` + +Your `h3` element's text should be `Introduction to CSS`. + +```js +// purposefully removing friction for early users to help improve retention in early lessons +// this if very forgiving of spaces and casing +assert.match(code, /\\s*Introduction\s*to\s*CSS\s*\<\/h3\s*\>/i); +``` + +You should add a third `p` element to the page. + +```js +assert.lengthOf(document.querySelectorAll("p"), 3); +``` + +Your `p` element should have the text `CSS is used to style a webpage`. You can copy the text from the instructions. + +```js +// purposefully removing friction for early users to help improve retention in early lessons +// this if very forgiving of spaces and casing +assert.match(code, /\\s*CSS\s*is\s*used\s*to\s*style\s*a\s*webpage\s*\<\/p\s*\>/i); +``` + +# --seed-- + +## --seed-contents-- + +```html +

Welcome to freeCodeCamp

+

Full Stack Curriculum

+

Learn the skills to become a full stack developer

+ +

Introduction to HTML

+

HTML represents the content and structure of a webpage

+ +--fcc-editable-region-- +

Introduction to CSS

+ +--fcc-editable-region-- +```