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.

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

fix(curriculum): implement a lesson about the box-sizing property #50795

Merged
merged 66 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
c4c219b
[fix] implemented information about box-sizing
CBID2 Jun 16, 2023
ffd10c0
fix: add a lesson on box-sizing property
CBID2 Jun 18, 2023
cfc3536
fix: elaborate on how use the box-sizing property
CBID2 Jun 21, 2023
44630a8
fix: add new lesson on content-box
CBID2 Jun 22, 2023
324c581
fix: add lesson on border-box
CBID2 Jun 22, 2023
17427e9
fix: revise hint section
CBID2 Jun 22, 2023
93a893a
fix: insert new step
CBID2 Jun 22, 2023
6cf92c6
fix: revise conflicts
CBID2 Jun 22, 2023
cc27039
fix: revise lesson on content-box
CBID2 Jun 22, 2023
2aa58fc
fix: revise content-box & border-box comparision
CBID2 Jun 22, 2023
b0685aa
feat: add lesson on box-sizing property
CBID2 Jun 22, 2023
9ec2e26
fix: revised lessons
CBID2 Jun 24, 2023
532eeb1
fix: revise step 8
CBID2 Jun 24, 2023
f39e04f
fix: made the lessons more conversational
CBID2 Jun 24, 2023
6b44fce
fix: revise seed code
CBID2 Jun 26, 2023
b0da287
feat: add seed code in new step 8
CBID2 Jul 4, 2023
944dd26
fix: revise step 8 and 9
CBID2 Jul 5, 2023
91738c4
fix: change step 8
CBID2 Jul 5, 2023
ca4182f
fix: revise hints and test
CBID2 Jul 5, 2023
464d373
fix: revise steps 11-12
CBID2 Jul 5, 2023
e460beb
fix: remove duplicate
CBID2 Jul 30, 2023
375124d
fix: replaced content with border
CBID2 Jul 30, 2023
8f92eef
feat: add seed code in CSS section
CBID2 Jul 30, 2023
e87158c
fix: remove extra spaces
CBID2 Jul 30, 2023
d98a7c2
feat: added CSS code for gallery selector
CBID2 Jul 30, 2023
9a8d305
fix: change formatting for step 1
CBID2 Aug 5, 2023
352cb61
fix: revise format of meta.JSON file
CBID2 Aug 5, 2023
dfc0e56
fix: revise of metadata for step 1
CBID2 Aug 5, 2023
2b27dc6
fix: revise Step 1
CBID2 Aug 5, 2023
2a41347
fix: still trying to revise issue with JSON file
CBID2 Aug 5, 2023
0284cca
fix: the journey of JSON revision continues
CBID2 Aug 5, 2023
6b35b6f
fix: revise JSON format
CBID2 Aug 6, 2023
66103cf
feat: elaborating on the task
CBID2 Aug 6, 2023
48370b7
fix: add closing </div> tag
CBID2 Aug 6, 2023
010d2b6
fix: revise id number
CBID2 Aug 7, 2023
e1a6d87
Merge remote-tracking branch 'upstream/main' into implementing-lesson…
Aug 7, 2023
bc3a20f
fix: placed editable code into a different area
CBID2 Aug 7, 2023
d981f10
fix: revise seed code
CBID2 Aug 7, 2023
1d948f5
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
996b70d
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
41e6794
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
8a85a51
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
840151f
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
0c0034d
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
6573f4a
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
28ee60c
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
9bd2f42
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
24a7251
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
67f1ffb
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
aeafa09
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
ea98c9c
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
bf83087
Update curriculum/challenges/english/14-responsive-web-design-22/lear…
CBID2 Aug 7, 2023
aea89f7
fix: change code
CBID2 Aug 8, 2023
76bf64c
Update 6493bc0d99879635209565aa.md
CBID2 Aug 16, 2023
7a4cbee
chore: merge main
Aug 16, 2023
7a46a09
feat: further break down steps
Aug 16, 2023
71399b3
chore: sync changes to espanol and chinese for tests
Aug 16, 2023
991804b
fix: revise word formatting
CBID2 Aug 20, 2023
362a8aa
fix: word formatting
CBID2 Aug 20, 2023
587279b
fix: revise formatting of more words
CBID2 Aug 20, 2023
de24d1b
fix: remove duplicate
CBID2 Aug 21, 2023
0f21fcb
fix: remove correct duplicate
CBID2 Aug 27, 2023
38b17f4
Revert "fix: revise formatting of more words"
CBID2 Aug 27, 2023
540d2d6
fix: remove duplicate take two
CBID2 Aug 28, 2023
e4a5cf6
fix: removing changes to box model project
jdwilkin4 Aug 28, 2023
23965e6
fix: removing duplicate flexbox step
jdwilkin4 Aug 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,64 +36,80 @@
"title": "Step 6"
},
{
"id": "615380dff67172357fcf0425",
"id": "64dd076a1b33c86d84b4232f",
"title": "Step 7"
},
{
"id": "615f171d05def3218035dc85",
"id": "6494da0daf5df5197963671d",
"title": "Step 8"
},
{
"id": "6153893900438b4643590367",
"id": "6493bc0d99879635209565aa",
"title": "Step 9"
},
{
"id": "6153897c27f6334716ee5abe",
"id": "64dd136e4e8b0894f9c70d86",
"title": "Step 10"
},
{
"id": "615389bd81347947ea7ba896",
"id": "615380dff67172357fcf0425",
"title": "Step 11"
},
{
"id": "6153908a366afb4d57185c8d",
"id": "615f171d05def3218035dc85",
"title": "Step 12"
},
{
"id": "615392916d83fa4f02f7e2cf",
"id": "6153893900438b4643590367",
"title": "Step 13"
},
{
"id": "6153938dce8b294ff8f5a4e9",
"id": "6153897c27f6334716ee5abe",
"title": "Step 14"
},
{
"id": "6153947986535e5117e60615",
"id": "615389bd81347947ea7ba896",
"title": "Step 15"
},
{
"id": "61539e07e7430b528fbffe21",
"id": "6153908a366afb4d57185c8d",
"title": "Step 16"
},
{
"id": "61539f32a206bd53ec116465",
"id": "615392916d83fa4f02f7e2cf",
"title": "Step 17"
},
{
"id": "6153a04847abee57a3a406ac",
"id": "6153938dce8b294ff8f5a4e9",
"title": "Step 18"
},
{
"id": "6153a3485f0b20591d26d2a1",
"id": "6153947986535e5117e60615",
"title": "Step 19"
},
{
"id": "6153a3952facd25a83fe8083",
"id": "61539e07e7430b528fbffe21",
"title": "Step 20"
},
{
"id": "6153a3ebb4f7f05b8401b716",
"id": "61539f32a206bd53ec116465",
"title": "Step 21"
},
{
"id": "6153a04847abee57a3a406ac",
"title": "Step 22"
},
{
"id": "6153a3485f0b20591d26d2a1",
"title": "Step 23"
},
{
"id": "6153a3952facd25a83fe8083",
"title": "Step 24"
},
{
"id": "6153a3ebb4f7f05b8401b716",
"title": "Step 25"
}
]
}
CBID2 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: 61537485c4f2a624f18d7794
title: 步骤 1
title: Step 1
challengeType: 0
dashedName: step-1
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: 61537a8054753e2f1f2a1574
title: 步骤 2
title: Step 2
challengeType: 0
dashedName: step-2
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: 61537bb9b1a29430ac15ad38
title: 步骤 3
title: Step 3
challengeType: 0
dashedName: step-3
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: 61537c5f81f0cf325b4a854c
title: 步骤 4
title: Step 4
challengeType: 0
dashedName: step-4
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: 61537c9eecea6a335db6da79
title: 步骤 5
title: Step 5
challengeType: 0
dashedName: step-5
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: 61537d86bdc3dd343688fceb
title: 步骤 6
title: Step 6
challengeType: 0
dashedName: step-6
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 615380dff67172357fcf0425
title: 步骤 7
title: Step 11
challengeType: 0
dashedName: step-7
dashedName: step-11
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153893900438b4643590367
title: 步骤 9
title: Step 13
challengeType: 0
dashedName: step-9
dashedName: step-13
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153897c27f6334716ee5abe
title: 步骤 10
title: Step 14
challengeType: 0
dashedName: step-10
dashedName: step-14
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 615389bd81347947ea7ba896
title: 步骤 11
title: Step 15
challengeType: 0
dashedName: step-11
dashedName: step-15
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153908a366afb4d57185c8d
title: 步骤 12
title: Step 16
challengeType: 0
dashedName: step-12
dashedName: step-16
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 615392916d83fa4f02f7e2cf
title: 步骤 13
title: Step 17
challengeType: 0
dashedName: step-13
dashedName: step-17
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153938dce8b294ff8f5a4e9
title: 步骤 14
title: Step 18
challengeType: 0
dashedName: step-14
dashedName: step-18
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153947986535e5117e60615
title: 步骤 15
title: Step 19
challengeType: 0
dashedName: step-15
dashedName: step-19
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 61539e07e7430b528fbffe21
title: 步骤 16
title: Step 20
challengeType: 0
dashedName: step-16
dashedName: step-20
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 61539f32a206bd53ec116465
title: 步骤 17
title: Step 21
challengeType: 0
dashedName: step-17
dashedName: step-21
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153a04847abee57a3a406ac
title: 步骤 18
title: Step 22
challengeType: 0
dashedName: step-18
dashedName: step-22
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153a3485f0b20591d26d2a1
title: 步骤 19
title: Step 23
challengeType: 0
dashedName: step-19
dashedName: step-23
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153a3952facd25a83fe8083
title: 步骤 20
title: Step 24
challengeType: 0
dashedName: step-20
dashedName: step-24
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 6153a3ebb4f7f05b8401b716
title: 步骤 21
title: Step 25
challengeType: 0
dashedName: step-21
dashedName: step-25
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
id: 615f171d05def3218035dc85
title: 步骤 8
title: Step 12
challengeType: 0
dashedName: step-8
dashedName: step-12
---

# --description--
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
---
id: 6493bc0d99879635209565aa
title: Step 9
challengeType: 0
dashedName: step-9
---

# --description--

The `border-box` sizing model does the opposite of `content-box`. The total width of the element, including padding and border, will be the explicit width set. The content of the element will shrink to make room for the padding and border.

Change the `box-sizing` property to `border-box`. Notice how your blue image borders now fit within your red gallery border.

# --hints--


Your * selector should have a `box-sizing` property set to `border-box` as the value.

```js
assert.equal(new __helpers.CSSHelp(document).getStyle('*')?.boxSizing, 'border-box');
```


# --seed--

## --seed-contents--

```html
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Photo Gallery</title>
<link rel="stylesheet" href="./styles.css">
</head>
<body>
<header class="header">
<h1>css flexbox photo gallery</h1>
</header>
<div class="gallery">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/1.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/2.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/3.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/4.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/5.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/6.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/7.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/8.jpg">
<img src="https://cdn.freecodecamp.org/curriculum/css-photo-gallery/9.jpg">
</div>
</body>
</html>


```

```css
--fcc-editable-region--
* {
box-sizing: content-box;
}
--fcc-editable-region--

.gallery {
border: 5px solid red;
width: 50%;
}

img {
width: 100%;
border: 5px solid blue;
padding: 5px;
}
```