diff --git a/.gitignore b/.gitignore index 89d5c4329004..cf4960f246d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Ignore MacOS autogenerated .DS_Store +.vscode/ \ No newline at end of file diff --git a/foundations/block-and-inline/01-margin-and-padding-1/style.css b/foundations/block-and-inline/01-margin-and-padding-1/style.css index f4d0a7084532..17028329fa8d 100644 --- a/foundations/block-and-inline/01-margin-and-padding-1/style.css +++ b/foundations/block-and-inline/01-margin-and-padding-1/style.css @@ -7,15 +7,15 @@ body { background: pink; border: 3px solid blue; /* CHANGE ME */ - padding: 0px; - margin: 0px; + padding: 32px; + margin: 12px; } .two { background: lightblue; border: 3px solid purple; /* CHANGE ME */ - margin-bottom: 0px; + margin-bottom: 48px; } .three { @@ -23,6 +23,6 @@ body { border: 3px solid brown; width: 200px; /* CHANGE ME */ - padding: 0px; - margin-left: 0px; + padding: 32px; + margin-left: 300px; } \ No newline at end of file diff --git a/foundations/block-and-inline/02-margin-and-padding-2/style.css b/foundations/block-and-inline/02-margin-and-padding-2/style.css index 00d1de59bf90..667da7ac0c5a 100644 --- a/foundations/block-and-inline/02-margin-and-padding-2/style.css +++ b/foundations/block-and-inline/02-margin-and-padding-2/style.css @@ -7,21 +7,32 @@ body { width: 400px; background: #fff; margin: 16px auto; + padding: 8px; } .title { background: #e3f4ff; + font-size: 16px; + margin-bottom: 8px; + padding: 8px; } .content { background: #e3f4ff; + padding: 16px 8px; + margin-bottom: 8px ; } .button-container { background: #e3f4ff; + text-align: center; + padding: 8px; } button { background: white; border: 1px solid #eee; + display: block; + margin: 0 auto; + padding: 8px 24px; } \ No newline at end of file diff --git a/foundations/cascade/01-cascade-fix/style.css b/foundations/cascade/01-cascade-fix/style.css index daf07e0e8a47..e8b7a6b977e2 100644 --- a/foundations/cascade/01-cascade-fix/style.css +++ b/foundations/cascade/01-cascade-fix/style.css @@ -2,10 +2,8 @@ body { font-family: Arial, Helvetica, sans-serif; } -.para, -.small-para { - color: hsl(0, 0%, 0%); - font-weight: 800; +.para { + font-size: 22px; } .small-para { @@ -13,11 +11,17 @@ body { font-weight: 800; } -.para { - font-size: 22px; +.para, +.small-para { + color: hsl(0, 0%, 0%); + font-weight: 800; } -.confirm { +/* + I used an ID selector to target the Confirm button as .confirm wasn't working + */ + +#confirm-button { background: green; color: white; font-weight: bold; @@ -29,14 +33,18 @@ body { font-size: 20px; } -.child { - color: rgb(0, 0, 0); - font-weight: 800; - font-size: 14px; -} - div.text { color: rgb(0, 0, 0); font-size: 22px; font-weight: 100; } + +/* +I combined the type and class to target the div with a class child +*/ + +div.child { + color: rgb(0, 0, 0); + font-weight: 800; + font-size: 14px; +} \ No newline at end of file diff --git a/foundations/flex/01-flex-center/style.css b/foundations/flex/01-flex-center/style.css index e35feacd28d0..1d073bc0bcc7 100644 --- a/foundations/flex/01-flex-center/style.css +++ b/foundations/flex/01-flex-center/style.css @@ -3,6 +3,9 @@ border: 4px solid midnightblue; width: 400px; height: 300px; + display: flex; + align-items: center; + justify-content: center; } .box { diff --git a/foundations/flex/02-flex-header/style.css b/foundations/flex/02-flex-header/style.css index cb598c935480..ad061a17a24d 100644 --- a/foundations/flex/02-flex-header/style.css +++ b/foundations/flex/02-flex-header/style.css @@ -1,6 +1,10 @@ .header { font-family: monospace; background: papayawhip; + padding: 9px; + display: flex; + align-items: center; + justify-content: space-between; } .logo { @@ -14,6 +18,10 @@ ul { /* this removes the dots on the list items*/ list-style-type: none; + display: flex; + gap: 9px; + margin: 0; + padding: 0; } a { diff --git a/foundations/flex/03-flex-header-2/index.html b/foundations/flex/03-flex-header-2/index.html index 21d56170b0b8..1bd2b9467ec3 100644 --- a/foundations/flex/03-flex-header-2/index.html +++ b/foundations/flex/03-flex-header-2/index.html @@ -9,18 +9,26 @@
-
\ No newline at end of file diff --git a/foundations/flex/03-flex-header-2/style.css b/foundations/flex/03-flex-header-2/style.css index bf4c8af10d4c..6053addcdcca 100644 --- a/foundations/flex/03-flex-header-2/style.css +++ b/foundations/flex/03-flex-header-2/style.css @@ -12,6 +12,22 @@ body { background: white; border-bottom: 1px solid #ddd; box-shadow: 0 0 8px rgba(0,0,0,.1); + display: flex; + align-items: center; + justify-content: space-between; + /* This inserts a space between the items and the header */ + padding: 8px; +} + +/* + This centers the logo and links on the right and the button and profile-image on the left +*/ + +.right-items, +.left-items { + display: flex; + align-items: center; + gap: 16px; } .profile-image { @@ -45,4 +61,8 @@ a { ul { list-style-type: none; + display: flex; + margin: 0; + padding: 0; + gap: 10px; } diff --git a/foundations/flex/04-flex-information/index.html b/foundations/flex/04-flex-information/index.html index 3cc3efd262ae..3be5a7fc0268 100644 --- a/foundations/flex/04-flex-information/index.html +++ b/foundations/flex/04-flex-information/index.html @@ -9,19 +9,24 @@
Information!
- - barberry -
This is a type of plant. We love this one.
- - chili -
This is another type of plant. Isn't it nice?
- - pepper -
We have so many plants. Yay plants.
- - saffron -
I'm running out of things to say about plants.
- +
+
+ barberry +
This is a type of plant. We love this one.
+
+
+ chili +
This is another type of plant. Isn't it nice?
+
+
+ pepper +
We have so many plants. Yay plants.
+
+
+ saffron +
I'm running out of things to say about plants.
+
+
Icons made by Icongeek26 from www.flaticon.com
diff --git a/foundations/flex/04-flex-information/style.css b/foundations/flex/04-flex-information/style.css index 80c00fd4bd5b..c33a3047368e 100644 --- a/foundations/flex/04-flex-information/style.css +++ b/foundations/flex/04-flex-information/style.css @@ -1,5 +1,13 @@ body { font-family: 'Courier New', Courier, monospace; + text-align: center; +} + +.container { + display: flex; + justify-content: center; + gap: 52px; + margin-top: 32px; } img { @@ -7,6 +15,10 @@ img { height: 100px; } +.frame { + max-width: 200px; +} + .title { font-size: 36px; font-weight: 900; diff --git a/foundations/flex/05-flex-modal/index.html b/foundations/flex/05-flex-modal/index.html index 3b4a06f2bcfa..7f54f5b0ce71 100644 --- a/foundations/flex/05-flex-modal/index.html +++ b/foundations/flex/05-flex-modal/index.html @@ -8,13 +8,17 @@ Modal -
-
!
-
Are you sure you want to do that?
- -
Lorem ipsum dolor sit amet consectetur adipisicing elit. Pariatur excepturi id soluta, numquam minima rerum doloremque eveniet aspernatur beatae commodi. Cupiditate recusandae ad repellendus quidem consectetur sequi amet aspernatur cumque!
- - +
+
!
+
+
Are you sure you want to do that? +
+
Lorem ipsum dolor sit amet consectetur adipisicing elit. Pariatur excepturi id soluta, numquam minima rerum doloremque eveniet aspernatur beatae commodi. Cupiditate recusandae ad repellendus quidem consectetur sequi amet aspernatur cumque!
+
+ + +
+
\ No newline at end of file diff --git a/foundations/flex/05-flex-modal/style.css b/foundations/flex/05-flex-modal/style.css index 780b355ef3de..32e1f508c6ec 100644 --- a/foundations/flex/05-flex-modal/style.css +++ b/foundations/flex/05-flex-modal/style.css @@ -15,11 +15,29 @@ body { justify-content: center; } +div .header { + display: flex; + justify-content: space-between; + font-weight: bold; + font-size: 18px; +} +/* flex container for the header, close button and the main text */ +.container { + display: flex; + flex-direction: column; + justify-content: center; + flex: 1; /* Flex 1 on the container makes the container grow to take rest of the space */ + gap: 10px; +} + .modal { background: white; width: 480px; border-radius: 10px; box-shadow: 2px 4px 16px rgba(0,0,0,.2); + padding: 15px; /* Add flexbox to the modal container to align icon next to the content */ + display: flex; /* Space between layout */ + gap: 15px; } .icon { @@ -32,7 +50,8 @@ body { border-radius: 50%; display: flex; align-items: center; - justify-content: center; + justify-content: center; /* Prevents icon from shrinking */ + flex-shrink: 0; } .close-button { @@ -49,6 +68,11 @@ body { border: 1px solid #eee; padding: 0; } +/* container for the continue and cancel buttons */ +.btn-container { + display: flex; /* makes the container a flexbox and aligns the buttons horizontally as the default flex direction is row */ + gap: 10px; +} button { cursor: pointer; diff --git a/foundations/flex/06-flex-layout/style.css b/foundations/flex/06-flex-layout/style.css index 3777aef335f0..23dc8cc018b8 100644 --- a/foundations/flex/06-flex-layout/style.css +++ b/foundations/flex/06-flex-layout/style.css @@ -5,6 +5,10 @@ body { margin: 0; overflow: hidden; font-family: Roboto, sans-serif; + /* Add this to center the three main containers (.header, .footer, and .content) vertically. */ + display: flex; + flex-direction: column; + justify-content: space-between; } img { @@ -16,6 +20,9 @@ button { border: none; border-radius: 8px; background: #eee; + /* Add space around the content of the button and space between the input and the buttons */ + padding: 10px; + margin-top: 10px; } input { @@ -24,3 +31,42 @@ input { padding: 8px 24px; width: 400px; } +/* Centers the items horizontally with space between the left and right links */ +.header, +.footer { + display: flex; + justify-content: space-between; + padding: 0; +} + +.footer { + background-color: #eee; +} + +.left-links, +.right-links, +ul.left-links, +ul.right-links { + display: flex; + gap: 10px; + padding: 0 8px; +} +/* Add this to remove the bullet point style */ +ul { + list-style-type: none; +} + +/* Add this to remove the text underline */ +li a { + text-decoration: none; + color: #333; +} + +/* Add this to center the main content. The input, img and buttons */ +.content { + display: flex; + flex-direction: column; + align-items: center; /* horizontal alignment of the div */ + justify-content: center; /* Vertical alignment of the div */ + gap: 10px; +} \ No newline at end of file diff --git a/foundations/flex/07-flex-layout-2/index.html b/foundations/flex/07-flex-layout-2/index.html index 85c1d0b75cae..4c912d074a4e 100644 --- a/foundations/flex/07-flex-layout-2/index.html +++ b/foundations/flex/07-flex-layout-2/index.html @@ -8,28 +8,32 @@ -
- MY AWESOME WEBSITE -
- -
- -
+
+ MY AWESOME WEBSITE +
-
Lorem ipsum dolor sit amet consectetur adipisicing elit. Tempora, eveniet? Dolorem dignissimos maiores non delectus possimus dolor nulla repudiandae vitae provident quae, obcaecati ipsam unde impedit corrupti veritatis minima porro?
-
Lorem ipsum dolor sit, amet consectetur adipisicing elit. Quasi quaerat qui iure ipsam maiores velit tempora, deleniti nesciunt fuga suscipit alias vero rem, corporis officia totam saepe excepturi odit ea.
-
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Nobis illo ex quas, commodi eligendi aliquam ut, dolor, atque aliquid iure nulla. Laudantium optio accusantium quaerat fugiat, natus officia esse autem?
-
Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus nihil impedit eius amet adipisci dolorum vel nostrum sit excepturi corporis tenetur cum, dolore incidunt blanditiis. Unde earum minima laboriosam eos!
-
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Nobis illo ex quas, commodi eligendi aliquam ut, dolor, atque aliquid iure nulla. Laudantium optio accusantium quaerat fugiat, natus officia esse autem?
-
Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus nihil impedit eius amet adipisci dolorum vel nostrum sit excepturi corporis tenetur cum, dolore incidunt blanditiis. Unde earum minima laboriosam eos!
+
+
+ +
-
- The Odin Project ❀️ -
+
+
Lorem ipsum dolor sit amet consectetur adipisicing elit. Tempora, eveniet? Dolorem dignissimos maiores non delectus possimus dolor nulla repudiandae vitae provident quae, obcaecati ipsam unde impedit corrupti veritatis minima porro?
+
Lorem ipsum dolor sit, amet consectetur adipisicing elit. Quasi quaerat qui iure ipsam maiores velit tempora, deleniti nesciunt fuga suscipit alias vero rem, corporis officia totam saepe excepturi odit ea.
+
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Nobis illo ex quas, commodi eligendi aliquam ut, dolor, atque aliquid iure nulla. Laudantium optio accusantium quaerat fugiat, natus officia esse autem?
+
Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus nihil impedit eius amet adipisci dolorum vel nostrum sit excepturi corporis tenetur cum, dolore incidunt blanditiis. Unde earum minima laboriosam eos!
+
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Nobis illo ex quas, commodi eligendi aliquam ut, dolor, atque aliquid iure nulla. Laudantium optio accusantium quaerat fugiat, natus officia esse autem?
+
Lorem ipsum dolor sit amet consectetur adipisicing elit. Necessitatibus nihil impedit eius amet adipisci dolorum vel nostrum sit excepturi corporis tenetur cum, dolore incidunt blanditiis. Unde earum minima laboriosam eos!
+
+
+ +
+ The Odin Project ❀️ +
\ No newline at end of file diff --git a/foundations/flex/07-flex-layout-2/style.css b/foundations/flex/07-flex-layout-2/style.css index 6caf04c79451..415ca9cd775e 100644 --- a/foundations/flex/07-flex-layout-2/style.css +++ b/foundations/flex/07-flex-layout-2/style.css @@ -2,28 +2,73 @@ body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; margin: 0; min-height: 100vh; + display: flex; + flex-direction: column; } .header { - height: 72px; background: darkmagenta; color: white; + font-size: 32px; + font-weight: 900; + height: 72px; + display: flex; + align-items: center; + padding-left: 16px; } .footer { - height: 72px; background: #eee; color: darkmagenta; + height: 72px; + display: flex; + align-items: center; + justify-content: center; } .sidebar { - width: 300px; background: royalblue; box-sizing: border-box; + display: flex; + flex-shrink: 0; + width: 300px; + padding: 16px; +} + +.sidebar ul { + list-style: none; + padding: 0; + margin: 10px; +} + +.sidebar li { + margin-top: 8px; +} + +.sidebar a { + color: #fff; + text-decoration: none; + font-size: 24px; +} + +.content { + display: flex; + flex: 1; + flex-wrap: wrap; + padding: 48px; + gap: 20px; } .card { border: 1px solid #eee; box-shadow: 2px 4px 16px rgba(0,0,0,.06); border-radius: 4px; + flex: 1 1 200px; + padding: 16px; + min-width: 250px; +} + +main { + display: flex; + flex: 1; } \ No newline at end of file diff --git a/foundations/intro-to-css/01-css-methods/index.html b/foundations/intro-to-css/01-css-methods/index.html index effe3cc3db01..11a5606ed9e3 100644 --- a/foundations/intro-to-css/01-css-methods/index.html +++ b/foundations/intro-to-css/01-css-methods/index.html @@ -5,10 +5,18 @@ Methods for Adding CSS + +
Style me via the external method!

I would like to be styled with the internal method, please.

- + \ No newline at end of file diff --git a/foundations/intro-to-css/01-css-methods/styles.css b/foundations/intro-to-css/01-css-methods/styles.css new file mode 100644 index 000000000000..d75b453190e9 --- /dev/null +++ b/foundations/intro-to-css/01-css-methods/styles.css @@ -0,0 +1,7 @@ +div { + background: red; + color: white; + font-size: 32px; + font-weight: bold; + text-align: center; +} \ No newline at end of file diff --git a/foundations/intro-to-css/02-class-id-selectors/index.html b/foundations/intro-to-css/02-class-id-selectors/index.html index 263042ae92a0..bebce1febad8 100644 --- a/foundations/intro-to-css/02-class-id-selectors/index.html +++ b/foundations/intro-to-css/02-class-id-selectors/index.html @@ -8,10 +8,10 @@ -

Number 1 - I'm a class!

-
Number 2 - I'm one ID.
-

Number 3 - I'm a class, but cooler!

-
Number 4 - I'm another ID.
-

Number 5 - I'm a class!

+

Number 1 - I'm a class!

+
Number 2 - I'm one ID.
+

Number 3 - I'm a class, but cooler!

+
Number 4 - I'm another ID.
+

Number 5 - I'm a class!

\ No newline at end of file diff --git a/foundations/intro-to-css/02-class-id-selectors/style.css b/foundations/intro-to-css/02-class-id-selectors/style.css index e69de29bb2d1..e94e40fc84bd 100644 --- a/foundations/intro-to-css/02-class-id-selectors/style.css +++ b/foundations/intro-to-css/02-class-id-selectors/style.css @@ -0,0 +1,22 @@ +.description.odd { + font-family: 'Verdana', 'DejaVu Sans', sans-serif; + background-color:#dd77b1 ; +} + +.description.odd.cool { + font-size: 24px;; +} + +.text { + color: #153bc5; +} + +#even-two { + background-color: #74be6a; + font-size: 24px; + font-weight: bold; +} + +#even-one { + font-size: 36px; +} \ No newline at end of file diff --git a/foundations/intro-to-css/03-grouping-selectors/index.html b/foundations/intro-to-css/03-grouping-selectors/index.html index 796431e53ea7..e3af7de49e61 100644 --- a/foundations/intro-to-css/03-grouping-selectors/index.html +++ b/foundations/intro-to-css/03-grouping-selectors/index.html @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/foundations/intro-to-css/03-grouping-selectors/style.css b/foundations/intro-to-css/03-grouping-selectors/style.css index e69de29bb2d1..8837436debce 100644 --- a/foundations/intro-to-css/03-grouping-selectors/style.css +++ b/foundations/intro-to-css/03-grouping-selectors/style.css @@ -0,0 +1,14 @@ +.btn.black { + background-color: #000; + color: #fff; +} + +.btn.yellow { + background-color: #fff000; +} + +.btn.black, +.btn.yellow { + font-family: 'Helvetica', 'Times New Roman', sans-serif; + font-size: 28px; +} \ No newline at end of file diff --git a/foundations/intro-to-css/04-chaining-selectors/style.css b/foundations/intro-to-css/04-chaining-selectors/style.css index d55c2c5c7090..fc304a5e279e 100644 --- a/foundations/intro-to-css/04-chaining-selectors/style.css +++ b/foundations/intro-to-css/04-chaining-selectors/style.css @@ -1 +1,10 @@ -/* Add CSS Styling */ \ No newline at end of file +/* Add CSS Styling */ +.avatar.proportioned { + width: 300px; + height: auto; +} + +.avatar.distorted { + width: 300px; + height: 600px; +} diff --git a/foundations/intro-to-css/05-descendant-combinator/style.css b/foundations/intro-to-css/05-descendant-combinator/style.css index e69de29bb2d1..a48ac1e516e5 100644 --- a/foundations/intro-to-css/05-descendant-combinator/style.css +++ b/foundations/intro-to-css/05-descendant-combinator/style.css @@ -0,0 +1,13 @@ +/* .container .text { + background-color: #fff000; + color: #ff0000; + font-size: 20px; + text-align: center; +} */ + +div p { + background-color: #fff000; + color: #ff0000; + font-size: 20px; + text-align: center; +} \ No newline at end of file