From d5ffaea4b0707d523afa0945a018b722b47cbef1 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Thu, 1 Dec 2022 15:03:38 +0200 Subject: [PATCH 01/17] completed 1-parent-child --- 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 458a4cb2..232f07f4 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.

+ 6:48pm From 640140ca9baeb08c855a9edcae0db8f234407169 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Thu, 1 Dec 2022 18:57:12 +0200 Subject: [PATCH 02/17] completed 2-html-attributes exercise --- week-1/2-html-attributes/index.html | 10 +++++----- week-1/2-html-attributes/readme.md | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html index dc861fa4..d957d9d0 100644 --- a/week-1/2-html-attributes/index.html +++ b/week-1/2-html-attributes/index.html @@ -23,18 +23,18 @@
Luke

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

7:35pm
Won

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

- 7:38pm + Ok! +

span>
- + + diff --git a/week-1/2-html-attributes/readme.md b/week-1/2-html-attributes/readme.md index 73c51ccc..2a04ab64 100644 --- a/week-1/2-html-attributes/readme.md +++ b/week-1/2-html-attributes/readme.md @@ -4,9 +4,9 @@ Luke has sent a map to iCafe. Using HTML attributes, we can turn this into a lin Complete the following steps in the `index.html` file: -1. In Luke's message, use the `` tag with the `href` attribute to turn the word "iCafe" into a link that can be clicked. -2. In Won's message, use the `` tag with the `src` attribute to show the funny gif in the message. -3. When you are finished, use git to add, commit and push your changes. +2. In Won's message, use the `` tag with the `src` attribute to show the funny gif in the message.href` attribute to turn the word "iCafe" into a link that can be clicked. +hed, use git to add, commit and push your changes. +3. When you are finis1. In Luke's message, use the `` tag with the ` ```shell git add . From 932deca80d0208b462f3da0e51ab202f065fb9dd Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Thu, 1 Dec 2022 19:13:18 +0200 Subject: [PATCH 03/17] completed-3-semantic-html exercise --- week-1/3-semantic-html/index.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html index 3640deaf..9476a3d6 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -11,29 +11,32 @@ +
+
Messages
+
Won
-

Where should we meet later?

- Mar 25, 2018 7:25pm +

should we meet later?

+
Luke

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

'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 +

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

- Mar 25, 2018 7:38pm +
From 631372cdcb7f9e4f8c1696a5c642f635a1607094 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Thu, 1 Dec 2022 19:25:07 +0200 Subject: [PATCH 04/17] completed 4-links-scripts exercise --- week-1/4-links-scripts/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html index 303c7fbd..965e9d52 100644 --- a/week-1/4-links-scripts/index.html +++ b/week-1/4-links-scripts/index.html @@ -3,7 +3,8 @@ 4. Adding Links and Scripts - HTML, CSS and Git Exercises - + + @@ -33,5 +34,6 @@
+ From 139dfb8aec45a2bc29770133cc09f789e257fbd7 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Thu, 1 Dec 2022 19:56:05 +0200 Subject: [PATCH 05/17] Completed 5-css-selectors --- week-1/5-css-selectors/index.html | 13 +++++++++++-- week-1/5-css-selectors/message-backgrounds.css | 10 ++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/week-1/5-css-selectors/index.html b/week-1/5-css-selectors/index.html index cce9c16d..e593a669 100644 --- a/week-1/5-css-selectors/index.html +++ b/week-1/5-css-selectors/index.html @@ -17,18 +17,25 @@
Messages
-
+
Won

Where should we meet later?

-
+
+ +
Luke

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

+
+
+
+
+
Won

@@ -36,6 +43,8 @@

+
+
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css index ffe48332..cd92103f 100644 --- a/week-1/5-css-selectors/message-backgrounds.css +++ b/week-1/5-css-selectors/message-backgrounds.css @@ -1 +1,11 @@ /* Add your CSS code below */ +.first-message { + background-color: red; +} + +.seconde-message{ + background-color: cadetblue; +} +.thrid-message { + background-color: yellow; +} \ No newline at end of file From 96df17038ce165628420d4f1845013c15b7ee526 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Thu, 1 Dec 2022 20:33:17 +0200 Subject: [PATCH 06/17] completed 6-css-properties --- week-1/6-css-properties/readme.md | 2 +- week-1/6-css-properties/styles.css | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/week-1/6-css-properties/readme.md b/week-1/6-css-properties/readme.md index 1db205ee..8da6d180 100644 --- a/week-1/6-css-properties/readme.md +++ b/week-1/6-css-properties/readme.md @@ -8,4 +8,4 @@ There are many CSS properties you can use to change how your website looks. Add 4. Make yesterday's message partially transparent to show it is old. 5. Increase the space between each line in a message. -_Hint: You can use Google to learn new CSS properties. Try searching for color, font-weight, text-decoration, font-size, border, opacity, and line-height._ +_Hint: You can use Google to learn new CSS properties. Try searching for color, font-weight, text-decoration, font-size, border, opacity, and line-height. diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css index ffe48332..b44e37ac 100644 --- a/week-1/6-css-properties/styles.css +++ b/week-1/6-css-properties/styles.css @@ -1 +1,17 @@ /* Add your CSS code below */ +.message__content a { + color:red ; + font-weight: bold; + text-decoration: none; +} +.message__content{ + font-size: 0.9rem; +} +.message--unread{ + border: solid blue; + +} +.message{ + opacity:0.2; + line-height: 300%; +} From 797495e7bb67994c154871d857969e27b106f95d Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Thu, 1 Dec 2022 23:26:50 +0200 Subject: [PATCH 07/17] completed 7-css-box --- week-1/7-css-box/styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css index 013b94f1..ebd860f7 100644 --- a/week-1/7-css-box/styles.css +++ b/week-1/7-css-box/styles.css @@ -3,4 +3,10 @@ border: 1px solid #4491db; border-radius: 4px; background: #fff; + width:100px; + height:30px ; + margin: 30px 20px 20px 50px; + padding: 5px 5px 5px 5px; + border: solid blue; + } From 957db40c3b6c39dabec3650b459f35f22a5e1188 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 00:35:41 +0200 Subject: [PATCH 08/17] completed 8-advanced-selectors --- week-1/8-advanced-selectors/index.html | 2 +- week-1/8-advanced-selectors/styles.css | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/week-1/8-advanced-selectors/index.html b/week-1/8-advanced-selectors/index.html index 24f5ca00..4aaa8c3d 100644 --- a/week-1/8-advanced-selectors/index.html +++ b/week-1/8-advanced-selectors/index.html @@ -38,7 +38,7 @@
Won

- Ok! + OK! Date: Fri, 2 Dec 2022 10:00:32 +0200 Subject: [PATCH 09/17] completed-10-media queries --- week-2/10-media-queries/columns.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css index 43e80d23..5560bd46 100644 --- a/week-2/10-media-queries/columns.css +++ b/week-2/10-media-queries/columns.css @@ -1 +1,16 @@ /* Add your own CSS code below */ +.countries { + columns:2; +} +@media screen and (min-width:768px){ + .countries{ + columns:2; + } + +} + +@media and (min-width:1200px){ + .countries{ + columns:3; + } +} From 63139802d1dd4f7ec223fee42dcd08ab98378074 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 11:44:24 +0200 Subject: [PATCH 10/17] completed 12-justify-content --- week-2/12-justify-content/flexbox.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css index 3c4c7ff1..b947ba9d 100644 --- a/week-2/12-justify-content/flexbox.css +++ b/week-2/12-justify-content/flexbox.css @@ -7,3 +7,21 @@ } /* Add your own CSS code below */ + .countries--first{ + flex-direction: row; + justify-content: right; + } + + .countries--second { + flex-direction: row; + justify-content: space-around; + } + + .countries--third { + flex-direction: column; + justify-content: flex-end; + } + .countries--fourth{ + flex-direction: column; + justify-content: space-around; + } \ No newline at end of file From fb67ee47620f5798440b2e67421efbd65967666a Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 11:56:50 +0200 Subject: [PATCH 11/17] 11-completed 11-flexbox --- week-2/11-flexbox/flexbox.css | 6 ++++++ week-2/11-flexbox/index.html | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css index 43e80d23..12f33cf0 100644 --- a/week-2/11-flexbox/flexbox.css +++ b/week-2/11-flexbox/flexbox.css @@ -1 +1,7 @@ /* Add your own CSS code below */ + + +.countries--first{ + display:flex; + flex-direction: row-reverse ; +} \ No newline at end of file diff --git a/week-2/11-flexbox/index.html b/week-2/11-flexbox/index.html index 11dc3dbb..ebb361e6 100644 --- a/week-2/11-flexbox/index.html +++ b/week-2/11-flexbox/index.html @@ -9,8 +9,8 @@ - -

+ +
From 02631f3c843c96a13ba430b388948f3fdd0566fb Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 12:13:32 +0200 Subject: [PATCH 12/17] completed 13-align-items --- week-2/13-align-items/flexbox.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css index 3675a0df..00bd57be 100644 --- a/week-2/13-align-items/flexbox.css +++ b/week-2/13-align-items/flexbox.css @@ -2,3 +2,21 @@ 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{ + flex-direction: column; + align-items:flex-end; +} +.countries--fourth { + align-items:center; + + flex-direction:column-reverse; +} \ No newline at end of file From c5340cbff8d0140811521187dc8f925e80a52072 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 13:36:13 +0200 Subject: [PATCH 13/17] completed 15-align-self --- week-2/15-align-self/flexbox.css | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css index ed621b79..c6221865 100644 --- a/week-2/15-align-self/flexbox.css +++ b/week-2/15-align-self/flexbox.css @@ -3,3 +3,34 @@ } /* Add your own CSS code below */ +.countries--first .country--ethiopia{ + align-self:flex-end +} + +.countries--second { + align-items: center; + align-self:flex-end; +} +.countries--second .country--ethiopia{ + align-self: flex-end; +} + +.countries--third { + align-items:flex-start; +} +.countries--third .country--ethiopia{ + align-self:flex-end; +} +.countries--third .country--croatia{ + align-self:flex-end; +} +.countries--third .country--laos{ + align-self: flex-end; +} +.countries--fourth{ + flex-direction: column; + align-items: flex-start +} +.countries--fourth .country--uganda { + align-self: center; +} \ No newline at end of file From 653e4f7fb20ea944dad23e98c21f1e8ca6e87672 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 14:10:43 +0200 Subject: [PATCH 14/17] completed 16-more-flexbox --- week-2/16-more-flexbox/flexbox.css | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css index ed621b79..ad63910e 100644 --- a/week-2/16-more-flexbox/flexbox.css +++ b/week-2/16-more-flexbox/flexbox.css @@ -3,3 +3,44 @@ } /* Add your own CSS code below */ +.countries--first{ + align-items: flex-end; + justify-content: right; +} +.countries--second{ + align-items: flex-end; + justify-content:center; +} +.countries--third{ + align-items: flex-start; + justify-content: right; +} +.countries--third .country--brazil{ + align-self: flex-end; +} +.countries--fourth{ + flex-direction: column; + justify-content: center; + align-items: flex-end; + +} +.countries--fourth .country--ethiopia{ + align-self: center; + +} +.countries--fourth .country--laos{ + align-self: center; + +} + +.countries--fifth{ + flex-direction:column-reverse; + align-items: flex-end; + justify-content: space-between; +} +.countries--fifth .country--laos { + order:2; +} +.countries--fifth .country--uganda{ + align-self: center; +} \ No newline at end of file From 3f16886b6f2e4d216bcb4453073b02e797b6bd04 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 14:19:39 +0200 Subject: [PATCH 15/17] completed 14-order4 --- week-2/14-order/flexbox.css | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css index ed621b79..1e6780db 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -2,4 +2,37 @@ display: flex; } -/* Add your own CSS code below */ +.countries--first > .country--brazil { + order: 5; +} +.countries--second > .country--brazil { + order: 4; +} +.countries--second > .country--uganda { + order: 5; +} + +.countries--first > .country--brazil { + order: 5; +} +.countries--second > .country--brazil { + order: 4; +} +.countries--second > .country--uganda { + order: 5; +} +.countries--third > .country--uganda { + order: 1; +} +.countries--third > .country--laos { + order: 2; +} +.countries--third > .country--ethiopia { + order: 3; +} +.countries--third > .country--croatia { + order: 4; +} +.countries--thrid .country--brazil{ + order: 5; +} \ No newline at end of file From cb91cccd54dee3b361666f2579c8233dc502d552 Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 15:06:56 +0200 Subject: [PATCH 16/17] completed 17-nav-menu --- week-2/17-nav-menu/styles.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css index f04f4c7b..573a62ec 100644 --- a/week-2/17-nav-menu/styles.css +++ b/week-2/17-nav-menu/styles.css @@ -1 +1,18 @@ /* Write your media queries and flexbox CSS below */ +@media only screen and (min-width: 480px) { + .site-header__nav { + display: flex; + } +} + +@media only screen and (min-width: 700px) { + .site-header { + display: flex; + } +} + +@media only screen and (min-width: 992px) { + .site-header { + justify-content: space-between; + } +} \ No newline at end of file From b3c6ec50d6f21a7aa02fd9d2af0e0124ec4de8bd Mon Sep 17 00:00:00 2001 From: Mazen El Ali Date: Fri, 2 Dec 2022 15:12:46 +0200 Subject: [PATCH 17/17] completed 18-git-merge --- 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 0051cdba..08dc3e99 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:orange; font-weight: 700; text-decoration: none; }