From a758f6a32630aa30ec9ef87349ef6e300650943f Mon Sep 17 00:00:00 2001 From: Natalia Date: Sat, 28 Mar 2020 14:24:35 +0000 Subject: [PATCH 01/19] Completed 1-parent child exercise --- week-1/1-parent-child/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html index 458a4cb21..3c8abf1bc 100644 --- a/week-1/1-parent-child/index.html +++ b/week-1/1-parent-child/index.html @@ -27,6 +27,7 @@

I can meet on Tuesday and Wednesday after 4.

+ 7:15pm From 8e9009618bec9f7e5533d4c3e543e5fd78018f08 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sat, 28 Mar 2020 15:41:00 +0000 Subject: [PATCH 02/19] Completed 2 exercise --- week-1/2-html-attributes/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html index dc861fa4f..3cfea76e8 100644 --- a/week-1/2-html-attributes/index.html +++ b/week-1/2-html-attributes/index.html @@ -23,14 +23,14 @@
Luke

- Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn + Let's meet at the iCafe in Merchant City.

7:35pm
Won

- Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif + Ok! 7:38pm

From 0b6e4cf76ef6de601fea65d612a002ea767289c6 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sun, 29 Mar 2020 16:18:40 +0100 Subject: [PATCH 03/19] Commited exercise 3 --- week-1/3-semantic-html/index.html | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html index 3640deaff..46124c76e 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -12,30 +12,30 @@
-
-
Messages
-
-
-
+ +
+
Won

Where should we meet later?

- Mar 25, 2018 7:25pm -
-
+ + +
Luke

Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn

- Mar 25, 2018 7:35pm -
-
+ + +
Won

Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif

- Mar 25, 2018 7:38pm -
-
+ + +
From f819338c3175ffc1a6a08d489a9f37faf306c42c Mon Sep 17 00:00:00 2001 From: Natalia Date: Sun, 29 Mar 2020 16:48:34 +0100 Subject: [PATCH 04/19] Commited 4-links-scripts --- week-1/4-links-scripts/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html index 303c7fbd2..682025e0c 100644 --- a/week-1/4-links-scripts/index.html +++ b/week-1/4-links-scripts/index.html @@ -4,6 +4,7 @@ 4. Adding Links and Scripts - HTML, CSS and Git Exercises + @@ -33,5 +34,6 @@ + From d74374e7b7da41b65431041b482c1d82b18012e0 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sun, 29 Mar 2020 23:16:22 +0100 Subject: [PATCH 05/19] Commited css-selectors --- week-1/5-css-selectors/message-backgrounds.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css index ffe483325..4ea61c511 100644 --- a/week-1/5-css-selectors/message-backgrounds.css +++ b/week-1/5-css-selectors/message-backgrounds.css @@ -1 +1,10 @@ /* Add your CSS code below */ +#first-message { + background: red; +} +article { + background: cadetblue; +} +.message--latest { + background: yellow; +} From d28c302a0f00bddccf1df6f767afed7c55727112 Mon Sep 17 00:00:00 2001 From: Natalia Date: Mon, 30 Mar 2020 08:56:33 +0100 Subject: [PATCH 06/19] Commited 6-css-properties --- week-1/6-css-properties/styles.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css index ffe483325..8608b169d 100644 --- a/week-1/6-css-properties/styles.css +++ b/week-1/6-css-properties/styles.css @@ -1 +1,20 @@ /* Add your CSS code below */ +.link--map, +.link--gif { + color: red; + text-decoration-line: none; + font-weight: bold; +} +.message__time { + font-size: 0.9rem; +} +.message--unread { + border-left-style: solid; + border-left-color: blue; +} +.message--old { + opacity: 0.5; +} +.message { + line-height: 50px; +} From 43d616fee9fd98d32c5c9967dc491d8d2bb795cd Mon Sep 17 00:00:00 2001 From: Natalia Date: Mon, 30 Mar 2020 09:16:49 +0100 Subject: [PATCH 07/19] Commited 7-css-box --- week-1/7-css-box/styles.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css index 013b94f1e..cb8a35d7b 100644 --- a/week-1/7-css-box/styles.css +++ b/week-1/7-css-box/styles.css @@ -4,3 +4,6 @@ border-radius: 4px; background: #fff; } +.country { + border: 10px solid white; +} From adac6317ea4df5b8070d65b06c8330d8cc43a8f3 Mon Sep 17 00:00:00 2001 From: Natalia Date: Wed, 1 Apr 2020 18:13:32 +0100 Subject: [PATCH 08/19] Added > after link --- week-1/2-html-attributes/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html index 3cfea76e8..fe58a0f11 100644 --- a/week-1/2-html-attributes/index.html +++ b/week-1/2-html-attributes/index.html @@ -30,7 +30,7 @@
Won

- Ok!

7:38pm
From fffff4fd6db26b3ca840b40b61da1dd3bc59c502 Mon Sep 17 00:00:00 2001 From: Natalia Date: Wed, 1 Apr 2020 18:17:09 +0100 Subject: [PATCH 09/19] Changed header tag on div --- week-1/3-semantic-html/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html index 46124c76e..42ee4cad8 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -13,7 +13,7 @@
From 4f67be0ccc99dbf159d4fb92c30df57eb5761a7e Mon Sep 17 00:00:00 2001 From: Natalia Date: Wed, 1 Apr 2020 22:28:04 +0100 Subject: [PATCH 10/19] Corrected the value of src --- week-1/4-links-scripts/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html index 682025e0c..31506840c 100644 --- a/week-1/4-links-scripts/index.html +++ b/week-1/4-links-scripts/index.html @@ -34,6 +34,6 @@
- + From d4407ce47ed6fa9c0fb8388ba8b9f12b9c447115 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sat, 4 Apr 2020 14:20:09 +0100 Subject: [PATCH 11/19] Commited exercise 10 --- week-2/10-media-queries/columns.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css index 43e80d23c..3e8625825 100644 --- a/week-2/10-media-queries/columns.css +++ b/week-2/10-media-queries/columns.css @@ -1 +1,11 @@ /* Add your own CSS code below */ +@media screen and (min-width: 768px) { + .countries { + columns: 2; + } +} +@media screen and (min-width: 1200px) { + .countries { + columns: 3; + } +} From dfd7a79310bde1e4ea6b7b8fe749b49e606ebaac Mon Sep 17 00:00:00 2001 From: Natalia Date: Sat, 4 Apr 2020 14:42:44 +0100 Subject: [PATCH 12/19] Commited 11-flexbox --- week-2/11-flexbox/flexbox.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css index 43e80d23c..9d0acd174 100644 --- a/week-2/11-flexbox/flexbox.css +++ b/week-2/11-flexbox/flexbox.css @@ -1 +1,9 @@ /* Add your own CSS code below */ +.countries--first { + display: flex; + flex-direction: row-reverse; +} +.countries--third { + display: flex; + flex-direction: column-reverse; +} From e2204c519beb1a224d72834ada1cf45b1d178425 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sat, 4 Apr 2020 15:11:18 +0100 Subject: [PATCH 13/19] Commited 12-justify content --- week-2/12-justify-content/flexbox.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css index 3c4c7ff18..286ee19c3 100644 --- a/week-2/12-justify-content/flexbox.css +++ b/week-2/12-justify-content/flexbox.css @@ -7,3 +7,23 @@ } /* Add your own CSS code below */ +.countries--first { + display: flex; + justify-content: flex-end; + flex-direction: row; +} +.countries--second { + display: flex; + justify-content: space-around; + flex-direction: row; +} +.countries--third { + display: flex; + justify-content: flex-end; + flex-direction: column; +} +.countries--fourth { + display: flex; + justify-content: space-around; + flex-direction: column-reverse; +} From 3c3a5612acb6af27f65cf4410aad87961dd39cc6 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sat, 4 Apr 2020 15:45:13 +0100 Subject: [PATCH 14/19] Commited 13-align-items --- week-2/13-align-items/flexbox.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css index 3675a0df3..7111793c3 100644 --- a/week-2/13-align-items/flexbox.css +++ b/week-2/13-align-items/flexbox.css @@ -2,3 +2,20 @@ display: flex; } /* Add your own CSS code below */ +.countries--first { + align-items: center; + flex-direction: row; +} +.countries--second { + align-items: flex-end; + flex-direction: row-reverse; +} +.countries--third { + align-items: flex-end; + flex-direction: column; +} +.countries--fourth { + justify-content: flex-start; + align-items: center; + flex-direction: column-reverse; +} From ec18b007a09e6bf3b92b1a818f0b68383d94eac4 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sun, 5 Apr 2020 10:33:52 +0100 Subject: [PATCH 15/19] Completed 14-order exercise --- week-2/14-order/flexbox.css | 46 ++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css index ed621b793..8bcc8d74b 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -2,4 +2,48 @@ display: flex; } -/* Add your own CSS code below */ +.countries--first :nth-child(1) { + order: 5; +} +.countries--first :nth-child(2) { + order: 1; +} +.countries--first :nth-child(3) { + order: 2; +} +.countries--first :nth-child(4) { + order: 3; +} +.countries--first :nth-child(5) { + order: 4; +} +.countries--second :nth-child(1) { + order: 4; +} +.countries--second :nth-child(2) { + order: 1; +} +.countries--second :nth-child(3) { + order: 2; +} +.countries--second :nth-child(4) { + order: 3; +} +.countries--second :nth-child(5) { + order: 5; +} +.countries--third :nth-child(1) { + order: 5; +} +.countries--third :nth-child(2) { + order: 4; +} +.countries--third :nth-child(3) { + order: 3; +} +.countries--third :nth-child(4) { + order: 2; +} +.countries--third :nth-child(5) { + order: 1; +} From f2655740cb9d91605168f4cc6225a8cbeaf4579d Mon Sep 17 00:00:00 2001 From: Natalia Date: Sun, 5 Apr 2020 13:41:04 +0100 Subject: [PATCH 16/19] Completed 15-align-self exercise --- week-2/15-align-self/flexbox.css | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css index ed621b793..8163718a0 100644 --- a/week-2/15-align-self/flexbox.css +++ b/week-2/15-align-self/flexbox.css @@ -3,3 +3,26 @@ } /* Add your own CSS code below */ +.countries--first :nth-child(3) { + align-self: flex-end; +} +.countries--second :not(.country--ethiopia) { + align-self: center; +} +.countries--second :nth-child(3) { + align-self: flex-end; +} +.countries--third :first-child, +:last-child { + align-self: flex-start; +} +.countries--third { + align-items: flex-end; +} +.countries--fourth { + flex-direction: column; + align-items: flex-start; +} +.countries--fourth :last-child { + align-self: center; +} From 884f511b0e03825169c0c4d2ff9c39a3dbcae208 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sun, 5 Apr 2020 14:22:48 +0100 Subject: [PATCH 17/19] Completed 16-more-flexbox exercise --- week-2/16-more-flexbox/flexbox.css | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css index ed621b793..d0cccbef2 100644 --- a/week-2/16-more-flexbox/flexbox.css +++ b/week-2/16-more-flexbox/flexbox.css @@ -3,3 +3,39 @@ } /* Add your own CSS code below */ +.countries--first { + align-items: flex-end; + justify-content: flex-end; +} +.countries--second { + flex-direction: row-reverse; + align-items: flex-end; + justify-content: center; +} +.countries--third { + align-items: flex-start; + justify-content: center; +} +.countries--third :first-child { + align-self: flex-end; +} +.countries--fourth { + flex-direction: column; + justify-content: center; + align-items: flex-end; +} +.countries--fourth :nth-child(3), +.countries--fourth :nth-child(4) { + align-self: center; +} +.countries--fifth { + flex-direction: column-reverse; + justify-content: space-around; + align-items: flex-end; +} +.countries--fifth :nth-child(4) { + order: 5; +} +.countries--fifth :nth-child(5) { + align-self: center; +} From 51dffbff0a08090325a0e0a8cae2d251c42a72a8 Mon Sep 17 00:00:00 2001 From: Natalia Date: Sun, 5 Apr 2020 23:03:36 +0100 Subject: [PATCH 18/19] Completed 17-nav-menu exercise --- week-2/17-nav-menu/styles.css | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css index f04f4c7ba..82d6e52c1 100644 --- a/week-2/17-nav-menu/styles.css +++ b/week-2/17-nav-menu/styles.css @@ -1 +1,27 @@ /* Write your media queries and flexbox CSS below */ + +@media screen and (min-width: 480px) { + .site-header__nav { + display: flex; + flex-direction: row; + } +} +@media screen and (min-width: 700px) { + header { + display: flex; + flex-direction: row; + } +} +@media screen and (min-width: 992px) { + header { + display: flex; + flex-direction: row; + justify-content: space-between; + } + .site-header__checkout { + justify-content: flex-end; + } + .site-header__logo { + justify-self: left; + } +} From fcd7ff12eacde2aceb12f50ef7a43f28256f1de9 Mon Sep 17 00:00:00 2001 From: Natalia Date: Mon, 6 Apr 2020 11:33:55 +0100 Subject: [PATCH 19/19] Changed link to oragered color --- week-2/18-git-merge/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css index 0051cdbaf..af46a4f77 100644 --- a/week-2/18-git-merge/styles.css +++ b/week-2/18-git-merge/styles.css @@ -1,6 +1,6 @@ /* Add your own CSS code below */ .link { - color: #4491db; + color: orangered; font-weight: 700; text-decoration: none; }