From 9c54ea3ad850b99814fc8337555a48386345ae3e Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Wed, 11 Mar 2020 18:59:35 +0100 Subject: [PATCH 1/9] Completed 1-parent-child exercise --- week-1/1-parent-child/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html index 458a4cb21..dd4f809f5 100644 --- a/week-1/1-parent-child/index.html +++ b/week-1/1-parent-child/index.html @@ -20,7 +20,7 @@

Who is available to meet this week to work on our group project?

- 6:48pm + 7:15pm
Habiba
From d0132916286ed2afdf99d3379332d8b7e2710ecd Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Tue, 17 Mar 2020 19:06:35 +0100 Subject: [PATCH 2/9] Completed 9-red links excercise --- week-1/9-git-branch/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css index 0051cdbaf..7a3354927 100644 --- a/week-1/9-git-branch/styles.css +++ b/week-1/9-git-branch/styles.css @@ -1,6 +1,6 @@ /* Add your own CSS code below */ .link { - color: #4491db; + color: red; font-weight: 700; text-decoration: none; } From afd486bb3184b33a6819886f2426d9ee92f8827d Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Wed, 18 Mar 2020 19:45:52 +0100 Subject: [PATCH 3/9] Completed 11-flexbox exercise --- week-2/10-media-queries/columns.css | 11 +++++++++++ week-2/11-flexbox/flexbox.css | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css index 43e80d23c..9e049f4bc 100644 --- a/week-2/10-media-queries/columns.css +++ b/week-2/10-media-queries/columns.css @@ -1 +1,12 @@ /* Add your own CSS code below */ + +@media screen and (min-width: 768px) { + .countries { + columns: 2; + } +} +@media screen and (max-width: 1200px) { + .countries { + columns: 3; + } +} diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css index 43e80d23c..c4054c298 100644 --- a/week-2/11-flexbox/flexbox.css +++ b/week-2/11-flexbox/flexbox.css @@ -1 +1,10 @@ /* Add your own CSS code below */ +.countries--first { + display: flex; + flex-direction: row-reverse; +} + +.countries--third { + display: flex; + flex-direction: column-reverse; +} From 0958d388a62ab6f3c3144a857e38cd0cb2f5b0da Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Wed, 18 Mar 2020 20:44:24 +0100 Subject: [PATCH 4/9] Completed 12-justify content exercise --- week-2/12-justify-content/flexbox.css | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css index 3c4c7ff18..8cbb663c4 100644 --- a/week-2/12-justify-content/flexbox.css +++ b/week-2/12-justify-content/flexbox.css @@ -1,9 +1,25 @@ -.countries { +.countries--first { display: flex; + justify-content: flex-end; + flex-direction: row; } -.countries--second .country { - padding: 0.5em; +.countries--second { + display: flex; + justify-content: space-around; + padding: 0.2em; } /* Add your own CSS code below */ + +.countries--third { + display: flex; + flex-direction: column; + justify-content: flex-end; +} + +.countries--fourth { + display: flex; + flex-direction: column-reverse; + justify-content: space-between; +} From 8e6031be03ba3d701eb8b059d4348479d98a5a2c Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Wed, 18 Mar 2020 21:47:29 +0100 Subject: [PATCH 5/9] Completed 13- align items exercise --- week-2/13-align-items/flexbox.css | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css index 3675a0df3..bfb011b30 100644 --- a/week-2/13-align-items/flexbox.css +++ b/week-2/13-align-items/flexbox.css @@ -1,4 +1,24 @@ -.countries { +.countries--first { display: flex; + align-items: center; + justify-content: left; } /* Add your own CSS code below */ + +.countries--second { + display: flex; + flex-direction: row-reverse; + align-items: flex-end; +} + +.countries--third { + display: flex; + flex-direction: column; + align-items: flex-end; +} + +.countries--fourth { + display: flex; + flex-direction: column-reverse; + align-items: center; +} From 14ab71c8227d44ba54a69888a20b39a58bdc3b48 Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Thu, 19 Mar 2020 00:02:40 +0100 Subject: [PATCH 6/9] Completed 14-order exercise --- week-2/14-order/flexbox.css | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css index ed621b793..3ede0f493 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -1,5 +1,37 @@ .countries { display: flex; + flex-direction: row; + justify-content: flex-start; } - /* Add your own CSS code below */ + +.countries--first .country--brazil { + order: 4; +} + +.countries--second .country--croatia { + order: 0; +} + +.countries--second .country--brazil { + order: 1; +} +.countries--second .country--uganda { + order: 2; +} + +.countries--third .country--brazil { + order: 4; +} + +.countries--third .country--croatia { + order: 3; +} + +.countries--third .country--ethiopia { + order: 2; +} + +.countries--third .country--laos { + order: 1; +} From 8323b14cccdb0a8324c9910b9b7fa809d01e6bc3 Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Thu, 19 Mar 2020 20:25:20 +0100 Subject: [PATCH 7/9] Completed 15-align self exercise --- week-2/15-align-self/flexbox.css | 53 ++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css index ed621b793..1bd2e8be1 100644 --- a/week-2/15-align-self/flexbox.css +++ b/week-2/15-align-self/flexbox.css @@ -1,5 +1,54 @@ -.countries { +/* Add your own CSS code below */ +.countries--first { display: flex; } -/* Add your own CSS code below */ +.countries--first .country--ethiopia { + display: flex; + align-self: flex-end; +} + +.countries--second { + display: flex; + align-items: center; +} + +.countries--second .country--ethiopia { + display: flex; + align-self: flex-end; +} + +.countries--third { + display: flex; + align-items: center; +} + +.countries--third .country--brazil { + align-self: flex-start; +} + +.countries--third .country--uganda { + align-self: flex-start; +} + +.countries--third .country--croatia { + align-self: flex-end; +} + +.countries--third .country--ethiopia { + align-self: flex-end; +} + +.countries--third .country--laos { + align-self: flex-end; +} + +.countries--fourth { + display: flex; + flex-direction: column; + align-items: flex-start; +} + +.countries--fourth .country--uganda { + align-self: center; +} From 5ab4d071720becf0e6d37a7e4187a368cdb9272a Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Thu, 19 Mar 2020 20:54:33 +0100 Subject: [PATCH 8/9] Completed 16-more flexbox exercise --- week-2/16-more-flexbox/flexbox.css | 59 +++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css index ed621b793..332ebe2f5 100644 --- a/week-2/16-more-flexbox/flexbox.css +++ b/week-2/16-more-flexbox/flexbox.css @@ -1,5 +1,60 @@ -.countries { +/* Add your own CSS code below */ + +.countries--first { display: flex; + align-items: flex-end; + justify-content: flex-end; } -/* Add your own CSS code below */ +.countries--second { + display: flex; + flex-direction: row-reverse; + align-items: flex-end; + justify-content: center; +} + +.countries--third { + display: flex; + align-items: flex-start; +} + +.countries--third .country--brazil { + align-self: flex-end; +} + +.countries--fourth { + display: flex; + flex-direction: column; + align-items: flex-end; +} + +.countries--fourth .country--ethiopia { + align-self: center; +} + +.countries--fourth .country--laos { + align-self: center; +} + +.countries--fifth { + display: flex; + flex-direction: column; + align-items: flex-end; + justify-content: space-between; +} + +.countries--fifth .country--brazil { + order: 4; +} + +.countries--fifth .country--croatia { + order: 3; +} + +.countries--fifth .country--ethiopia { + order: 2; +} + +.countries--fifth .country--uganda { + align-self: center; +} From 9ee6e4115c098e57eac79ca7725e296c5e8dc1d8 Mon Sep 17 00:00:00 2001 From: Josel Carballo Date: Thu, 19 Mar 2020 23:31:09 +0100 Subject: [PATCH 9/9] 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..b95f3374d 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 { + columns: 1; + display: flex; + flex-direction: row; + justify-content: center; + } +} + +@media screen and (min-width: 700px) { + .site-header { + columns: 1; + display: flex; + flex-direction: row; + justify-content: space-between; + } +} + +@media screen and (min-width: 992px) { + .site-header { + columns: 1; + display: flex; + flex-direction: row; + justify-content: space-between; + } +}