From cdf7afbb3fcdc6bf158705d2b6c1143b4320c44e Mon Sep 17 00:00:00 2001 From: Thiago Date: Wed, 11 Mar 2020 20:41:05 +0100 Subject: [PATCH 01/24] completed --- 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 8849c5086da69c0498ea48b84271f7186cb72575 Mon Sep 17 00:00:00 2001 From: Thiago Date: Thu, 12 Mar 2020 17:51:53 +0100 Subject: [PATCH 02/24] Competed_2htmls_atributes_exercise --- package-lock.json | 41 +++++++++++++++++++++-------- week-1/1-parent-child/index.html | 2 +- week-1/2-html-attributes/index.html | 4 +-- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index b15084556..8e15d45d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -768,7 +768,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -789,12 +790,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -809,17 +812,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -936,7 +942,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -948,6 +955,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -962,6 +970,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -969,12 +978,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -993,6 +1004,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1073,7 +1085,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1085,6 +1098,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1170,7 +1184,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1206,6 +1221,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1225,6 +1241,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1268,12 +1285,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html index dd4f809f5..ca6a70802 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?

- 7:15pm +

7:15pm

Habiba
diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html index dc861fa4f..636298a28 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 fbb3016eb40f4b309b3587e1b81f2ec53be1ec12 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Wed, 18 Mar 2020 22:23:41 +0100 Subject: [PATCH 03/24] Completed 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..a8221d3dc 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 41aa333c7eb433c5a9e538763ca2ee8d05a96293 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Wed, 18 Mar 2020 22:28:14 +0100 Subject: [PATCH 04/24] Completed 5_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..a8f3a711c 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-color: red; +} +article { + background-color: cadetblue; +} +.message--latest { + background-color: yellow; +} From dd0acf1a1f1a00d2d70469a9d1ca78c012bd9978 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Wed, 18 Mar 2020 22:29:34 +0100 Subject: [PATCH 05/24] Completed 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..3e3918959 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 */ +a { + color: red; + font-weight: bold; + text-decoration: none; +} + +.message__time { + font-size: 0.9rem; +} +.message { + opacity: 0.3; +} +.p { + line-height: 200%; +} +.message--unread { + border-left: 5px solid red; + opacity: 1; +} From 15f3a55eebf4c94972ce0f5da8cf0a5f3bd2c176 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Wed, 18 Mar 2020 22:33:23 +0100 Subject: [PATCH 06/24] Completed 7_css_box --- week-1/7-css-box/styles.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css index 013b94f1e..5b1cc302b 100644 --- a/week-1/7-css-box/styles.css +++ b/week-1/7-css-box/styles.css @@ -1,6 +1,10 @@ /* Try different box model properties below */ .pages__page { - border: 1px solid #4491db; - border-radius: 4px; + border: 1px solid gray; + border-radius: 46px; background: #fff; + width: 300npx; + line-height: 55px; + border: 1px solid red; + padding: 15px 220px; } From 4f6d3d364c97e0c805423fda90ea6f79032ab14f Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Wed, 18 Mar 2020 22:35:26 +0100 Subject: [PATCH 07/24] Completed 8_advanced_selectos --- week-1/8-advanced-selectors/styles.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css index d35c3c371..e63bf3e29 100644 --- a/week-1/8-advanced-selectors/styles.css +++ b/week-1/8-advanced-selectors/styles.css @@ -1 +1,12 @@ /* Try different box model properties below */ +.site-header p { + color: white; + margin-bottom: 0; +} +.site-footer { + font-size: 12px; + text-align: center; +} +.message--unread { + box-shadow: 4px 4px 0 #dba944; +} From c3746e75dfd91e9a56be2051db7903813eb28ff5 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Wed, 18 Mar 2020 22:36:32 +0100 Subject: [PATCH 08/24] Completed 9_git_branch --- 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..bc4104b39 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: green; font-weight: 700; text-decoration: none; } From dd72bfa415bf9d882d626f198e4feec213bdb7db Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Wed, 18 Mar 2020 22:37:56 +0100 Subject: [PATCH 09/24] Completed 1_parent_child --- 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 ca6a70802..b2b0061ed 100644 --- a/week-1/1-parent-child/index.html +++ b/week-1/1-parent-child/index.html @@ -8,7 +8,6 @@ -
@@ -27,6 +26,7 @@

I can meet on Tuesday and Wednesday after 4.

+
From cea3cc020c8e67926f97a12c8c30f2271e91fde3 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Fri, 20 Mar 2020 17:34:06 +0100 Subject: [PATCH 10/24] Completed 10-media-querties --- week-2/10-media-queries/columns.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css index 43e80d23c..ab45821df 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 (min-width: 1200px) { + .countries { + columns: 3; + } +} From e0b589f7d2d0797538da0e85fa52539a4a13e38e Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Fri, 20 Mar 2020 18:23:55 +0100 Subject: [PATCH 11/24] Completed 11-fexbox --- 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..e9d4dfc0b 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; +} +.countries--second { + display: flex; + flex-direction: column; +} From 127fcaefe09b828c6c058711f86c8c499ef18fec Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Fri, 20 Mar 2020 18:46:39 +0100 Subject: [PATCH 12/24] Completed 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..e9d4dfc0b 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; +} +.countries--second { + display: flex; + flex-direction: column; +} From 2244ff442a8ed487187da18791b13b8659c3124d Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sat, 21 Mar 2020 15:43:40 +0100 Subject: [PATCH 13/24] Completed 2-html-attributes --- week-1/2-html-attributes/index.html | 36 ++++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html index 636298a28..113f43a4a 100644 --- a/week-1/2-html-attributes/index.html +++ b/week-1/2-html-attributes/index.html @@ -2,39 +2,43 @@ - 2. HTML Attributes - HTML, CSS and Git Exercises + 3. Semantic HTML - HTML, CSS and Git Exercises + -
-
+
+
Messages
-
-
-
+ + +
+
Won

Where should we meet later?

- 7:25pm -
-
+ + +
Luke

- Let's meet at the iCafe in Merchant City. + Let's meet at the iCafe in Merchant City.

- 7:35pm -
-
+ + +
Won

- Ok!

- 7:38pm -
+ +
+
+ From 5b4291f26ce179a94297d7c95849f66460e8d98b Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sat, 21 Mar 2020 15:44:59 +0100 Subject: [PATCH 14/24] Completed 3-semantic-html --- week-1/3-semantic-html/index.html | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html index 3640deaff..9215a6d33 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -12,29 +12,30 @@
-
+
-
-
+
+
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 76ce601ab5d2edaace42b5c0751777d5255b3458 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sat, 21 Mar 2020 19:23:16 +0100 Subject: [PATCH 15/24] Completed 11-flexbox --- week-2/11-flexbox/flexbox.css | 1 + 1 file changed, 1 insertion(+) diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css index e9d4dfc0b..68b9ec2d9 100644 --- a/week-2/11-flexbox/flexbox.css +++ b/week-2/11-flexbox/flexbox.css @@ -2,6 +2,7 @@ .countries--first { display: flex; flex-direction: row; + justify-content: flex-end; } .countries--second { display: flex; From 3afbeac4126fcc98ac9481f3e4ac0ef0d5f7f0d7 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sat, 21 Mar 2020 19:24:32 +0100 Subject: [PATCH 16/24] Completed 12-justify-content --- week-2/12-justify-content/flexbox.css | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css index 3c4c7ff18..bfbb3ca88 100644 --- a/week-2/12-justify-content/flexbox.css +++ b/week-2/12-justify-content/flexbox.css @@ -1,9 +1,26 @@ .countries { display: flex; -} - -.countries--second .country { - padding: 0.5em; + font-family: Arial, Helvetica, sans-serif; } /* Add your own CSS code below */ + +.countries--second { + padding: 25px 25px 25px; + justify-content: space-around; + flex-direction: row; +} +.countries--first { + padding: 15px 15px 15px 50px; + justify-content: flex-end; +} +.countries--third { + padding: 15px 15px 15px 15px; + display: flex; + flex-direction: column; + width: 500px; +} +.countries--fourth { + flex-direction: column; + justify-content: space-between; +} From f58a869298e0195e3abd8d5adb280ce148a9ee19 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sun, 22 Mar 2020 14:34:57 +0100 Subject: [PATCH 17/24] Fixed links --- 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 113f43a4a..f12141a4f 100644 --- a/week-1/2-html-attributes/index.html +++ b/week-1/2-html-attributes/index.html @@ -25,14 +25,14 @@
Luke

- Let's meet at the iCafe in Merchant City. + Let's meet at the iCafe in Merchant City.

Won

- Ok! + Ok!

From c63e69e90ea8f50cf6d761d0a2cca1f766967ef9 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sun, 22 Mar 2020 14:35:58 +0100 Subject: [PATCH 18/24] Fixed color blue --- week-1/6-css-properties/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css index 3e3918959..446103d1c 100644 --- a/week-1/6-css-properties/styles.css +++ b/week-1/6-css-properties/styles.css @@ -15,6 +15,6 @@ a { line-height: 200%; } .message--unread { - border-left: 5px solid red; + border-left: 5px solid blue; opacity: 1; } From 84f7915f65fcb329f0e15f411f2a694e6f4c3a0f Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sun, 22 Mar 2020 16:11:37 +0100 Subject: [PATCH 19/24] Completed 13-align-items --- week-2/13-align-items/flexbox.css | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css index 3675a0df3..24245f487 100644 --- a/week-2/13-align-items/flexbox.css +++ b/week-2/13-align-items/flexbox.css @@ -1,4 +1,29 @@ .countries { display: flex; + font-family: Arial, Helvetica, sans-serif; + font-weight: lighter; } /* Add your own CSS code below */ + +.countries--first { + align-items: center; + padding: 30px 50px 30px 20px; + width: 500px; +} +.countries--second { + align-items: flex-end; + padding: 15px 15px 15px 60px; + flex-direction: row-reverse; + width: 500px; +} +.countries--third { + align-items: flex-end; + flex-direction: column; + justify-content: baseline; + width: 500px; +} +.countries--fourth { + align-items: center; + flex-direction: column-reverse; + width: 500px; +} From b42593bea7a1953e12c9b2b2f91a39380f6bda19 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sun, 22 Mar 2020 16:29:25 +0100 Subject: [PATCH 20/24] Completed 12-justify-content --- week-2/12-justify-content/flexbox.css | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css index bfbb3ca88..b0bd640a6 100644 --- a/week-2/12-justify-content/flexbox.css +++ b/week-2/12-justify-content/flexbox.css @@ -5,22 +5,25 @@ /* Add your own CSS code below */ +.countries--first { + padding: 15px 15px 15px 0px; + justify-content: flex-end; +} .countries--second { - padding: 25px 25px 25px; + padding: 25px 25px 25px 25px; justify-content: space-around; flex-direction: row; } -.countries--first { - padding: 15px 15px 15px 50px; - justify-content: flex-end; -} .countries--third { padding: 15px 15px 15px 15px; display: flex; flex-direction: column; width: 500px; + align-items: stretch; } .countries--fourth { - flex-direction: column; + padding: 30px 20px 30px 20px; + flex-direction: column-reverse; justify-content: space-between; + width: 500px; } From 25f996b780decff7767388230deebe483778feab Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sun, 22 Mar 2020 17:26:59 +0100 Subject: [PATCH 21/24] Completed -14-order --- week-2/14-order/flexbox.css | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css index ed621b793..4c93a1a75 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -1,5 +1,57 @@ .countries { display: flex; + font-family: Arial, Helvetica, sans-serif; } /* Add your own CSS code below */ + +.countries--first { + flex-direction: row; +} +.countries--first .country--brazil { + order: 4; +} +.countries--first .country--croatia { + order: 0; +} +.countries--first .country--ethiopia { + order: 0; +} +.countries--first .country--laos { + order: 0; +} +.countries--first.country--uganda { + order: 0; +} + +.countries--second .country--brazil { + order: 3; +} +.countries--second .country--croatia { + order: 0; +} +.countries--second .country--ethiopia { + order: 0; +} +.countries--second .country--laos { + order: 0; +} +.countries--second .country--uganda { + order: 4; +} + +.countries--third .country--brazil { + order: 5; +} +.countries--third .country--croatia { + order: 4; +} +.countries--third .country--ethiopia { + order: 3; +} +.countries--third .country--laos { + order: 2; +} +.countries--third .country--uganda { + order: 0; +} From df480ded7465fa2f3fd4a387e43959aea10af5ab Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Sun, 22 Mar 2020 19:16:06 +0100 Subject: [PATCH 22/24] Completed 15- align-self --- week-2/15-align-self/flexbox.css | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css index ed621b793..a7c7fffc3 100644 --- a/week-2/15-align-self/flexbox.css +++ b/week-2/15-align-self/flexbox.css @@ -1,5 +1,43 @@ .countries { display: flex; + font-family: Arial, Helvetica, sans-serif; } /* Add your own CSS code below */ + +.countries--first .country--ethiopia { + align-self: flex-end; +} +.countries--first { + width: 500px; +} + +.countries--second { + width: 500px; + flex-direction: row; + align-items: center; +} + +.countries--second .country--ethiopia { + align-self: flex-end; +} + +.countries--third { + width: 500px; + flex-direction: row; + align-items: flex-end; +} +.countries--third .country--brazil { + align-self: flex-start; +} +.countries--third .country--uganda { + align-self: flex-start; +} +.countries--fourth { + width: 550px; + flex-direction: column; + align-items: flex-start; +} +.countries--fourth .country--uganda { + align-self: center; +} From 7e333668512af85b1bf9efc879eff70a050b84b7 Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Mon, 23 Mar 2020 17:48:20 +0100 Subject: [PATCH 23/24] Completed 16-more-flexbox --- week-2/16-more-flexbox/flexbox.css | 67 ++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css index ed621b793..d9f540cdd 100644 --- a/week-2/16-more-flexbox/flexbox.css +++ b/week-2/16-more-flexbox/flexbox.css @@ -1,5 +1,72 @@ .countries { display: flex; + font-family: Arial, Helvetica, sans-serif; } /* Add your own CSS code below */ + +.countries--first { + flex-direction: row; + align-items: flex-end; + justify-content: flex-end; + width: 68%; +} +.countries--second { + flex-direction: row; + align-items: flex-end; + justify-content: center; + width: 68%; +} +.countries--second .country--brazil { + order: 5; +} +.countries--second .country--croatia { + order: 4; +} +.countries--second .country--ethiopia { + order: 3; +} +.countries--second .country--laos { + order: 1; +} + +.countries--third { + flex-direction: row; + align-items: flex-start; + justify-content: center; + width: 68%; +} +.countries--third .country--brazil { + align-self: flex-end; +} + +.countries--fourth { + flex-direction: column; + align-items: flex-end; + justify-content: center; + width: 565px; +} +.countries--fourth .country--ethiopia { + align-self: center; +} +.countries--fourth .country--laos { + align-self: center; +} +.countries--fifth { + flex-direction: column; + align-items: flex-end; + justify-content: space-between; + width: 565px; +} +.countries--fifth .country--brazil { + order: 5; +} +.countries--fifth .country--croatia { + order: 4; +} +.countries--fifth .country--ethiopia { + order: 3; +} +.countries--fifth .country--uganda { + align-self: center; +} From ea2db53cf152f74902b554aa113719941bae084f Mon Sep 17 00:00:00 2001 From: ThiagoLPereira Date: Tue, 24 Mar 2020 17:48:40 +0100 Subject: [PATCH 24/24] Completed 17-nav-menu --- 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; }