From 5466bf493f5a0a63b3b21c838f30e0fba9b03fca Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 11:27:31 +0300 Subject: [PATCH 01/22] Completed 1-parent-child exercise --- package-lock.json | 12 +++---- package.json | 58 ++++++++++++++++---------------- part-1/1-parent-child/index.html | 1 + 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index c51d81cb..9d4705bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1615,9 +1615,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "live-server": { @@ -2631,9 +2631,9 @@ } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, "which": { diff --git a/package.json b/package.json index c9808dbe..c808e6fd 100644 --- a/package.json +++ b/package.json @@ -5,35 +5,35 @@ "author": "Codi", "license": "ISC", "scripts": { - "1": "live-server --open=week-1/1-parent-child", - "2": "live-server --open=week-1/2-html-attributes", - "3": "live-server --open=week-1/3-semantic-html", - "4": "live-server --open=week-1/4-links-scripts", - "5": "live-server --open=week-1/5-css-selectors", - "6": "live-server --open=week-1/6-css-properties", - "7": "live-server --open=week-1/7-css-box", - "8": "live-server --open=week-1/8-advanced-selectors", - "9": "live-server --open=week-1/9-git-branch", - "10": "live-server --open=week-2/10-media-queries", - "11": "live-server --open=week-2/11-flexbox", - "12": "live-server --open=week-2/12-justify-content", - "13": "live-server --open=week-2/13-align-items", - "14": "live-server --open=week-2/14-order", - "15": "live-server --open=week-2/15-align-self", - "16": "live-server --open=week-2/16-more-flexbox", - "17": "live-server --open=week-2/17-nav-menu", - "18": "live-server --open=week-2/18-git-merge", - "19": "live-server --open=week-3/19-search", - "20": "live-server --open=week-3/20-labels", - "21": "live-server --open=week-3/21-buttons", - "22": "live-server --open=week-3/22-checkout", - "23": "live-server --open=week-3/23-comments", - "24": "live-server --open=week-3/24-dietary", - "25": "live-server --open=week-3/25-shirt-size", - "26": "live-server --open=week-3/26-checkout-groups", - "27": "live-server --open=week-3/27-attributes", - "28": "live-server --open=week-3/28-git-conflict", - "29": "live-server --open=week-3/29-combined-skills", + "1": "live-server --open=part-1/1-parent-child", + "2": "live-server --open=part-1/2-html-attributes", + "3": "live-server --open=part-1/3-semantic-html", + "4": "live-server --open=part-1/4-links-scripts", + "5": "live-server --open=part-1/5-css-selectors", + "6": "live-server --open=part-1/6-css-properties", + "7": "live-server --open=part-1/7-css-box", + "8": "live-server --open=part-1/8-advanced-selectors", + "9": "live-server --open=part-1/9-git-branch", + "10": "live-server --open=part-2/10-media-queries", + "11": "live-server --open=part-2/11-flexbox", + "12": "live-server --open=part-2/12-justify-content", + "13": "live-server --open=part-2/13-align-items", + "14": "live-server --open=part-2/14-order", + "15": "live-server --open=part-2/15-align-self", + "16": "live-server --open=part-2/16-more-flexbox", + "17": "live-server --open=part-2/17-nav-menu", + "18": "live-server --open=part-2/18-git-merge", + "19": "live-server --open=part-3/19-search", + "20": "live-server --open=part-3/20-labels", + "21": "live-server --open=part-3/21-buttons", + "22": "live-server --open=part-3/22-checkout", + "23": "live-server --open=part-3/23-comments", + "24": "live-server --open=part-3/24-dietary", + "25": "live-server --open=part-3/25-shirt-size", + "26": "live-server --open=part-3/26-checkout-groups", + "27": "live-server --open=part-3/27-attributes", + "28": "live-server --open=part-3/28-git-conflict", + "29": "live-server --open=part-3/29-combined-skills", "precommit": "pretty-quick --staged --verbose", "serve": "live-server" }, diff --git a/part-1/1-parent-child/index.html b/part-1/1-parent-child/index.html index 458a4cb2..24036e81 100644 --- a/part-1/1-parent-child/index.html +++ b/part-1/1-parent-child/index.html @@ -27,6 +27,7 @@

I can meet on Tuesday and Wednesday after 4.

+ From 7cf95bf11d5bb26bfaa7c5ac055af4123b4a43f2 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 11:47:21 +0300 Subject: [PATCH 02/22] Completed 2-html-attributes exercise --- part-1/2-html-attributes/index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/part-1/2-html-attributes/index.html b/part-1/2-html-attributes/index.html index dc861fa4..34707785 100644 --- a/part-1/2-html-attributes/index.html +++ b/part-1/2-html-attributes/index.html @@ -23,14 +23,15 @@
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 + Ok!

7:38pm
From b0ec40bc7b98b5177c421939884d69eec599ef27 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 12:14:49 +0300 Subject: [PATCH 03/22] completed 3-semantic-html exercise --- part-1/3-semantic-html/index.html | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/part-1/3-semantic-html/index.html b/part-1/3-semantic-html/index.html index 3640deaf..38934b74 100644 --- a/part-1/3-semantic-html/index.html +++ b/part-1/3-semantic-html/index.html @@ -12,30 +12,32 @@
-
+
-
-
+ +
+
Won
-

Where should we meet later?

- Mar 25, 2018 7:25pm -
-
+
Where should we meet later?
+ + + +
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 c8d64172cc2b98a0c23b2c843ebeb3ebfc53bf3f Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 12:32:40 +0300 Subject: [PATCH 04/22] Completed 4-links-scripts exercise --- part-1/4-links-scripts/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/part-1/4-links-scripts/index.html b/part-1/4-links-scripts/index.html index 303c7fbd..b7574e07 100644 --- a/part-1/4-links-scripts/index.html +++ b/part-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 76274fb2401bb032de44e116d31f5a64f56a2334 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 12:43:19 +0300 Subject: [PATCH 05/22] Completed 5-css-selectors exercise --- part-1/5-css-selectors/message-backgrounds.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css index ffe48332..50d5e2a4 100644 --- a/part-1/5-css-selectors/message-backgrounds.css +++ b/part-1/5-css-selectors/message-backgrounds.css @@ -1 +1,11 @@ /* Add your CSS code below */ +#first-message { + background-color: red; +} +article { + background-color: cadetblue; +} + +.message--latest { + background-color: yellow; +} From 5db2813144ce8df1bb64eb14dcdeaedcb69d15db Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 13:12:19 +0300 Subject: [PATCH 06/22] Completed 6-Css-properties exercise --- part-1/6-css-properties/styles.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css index ffe48332..17efd6bd 100644 --- a/part-1/6-css-properties/styles.css +++ b/part-1/6-css-properties/styles.css @@ -1 +1,18 @@ /* Add your CSS code below */ +.link { + text-decoration: none; + font-weight: bold; + color: red; +} +.message__time { + font-size: 0.9rem; +} +.message--unread { + border-left: 5px solid blue; +} +.message__time--old { + opacity: 50%; +} +.message { + margin-bottom: 2.8rem; +} From 16ace7e235cd8d6237c29f0229e16a853ecddf57 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 13:22:50 +0300 Subject: [PATCH 07/22] Completed 7-css-box exercise --- part-1/7-css-box/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/part-1/7-css-box/styles.css b/part-1/7-css-box/styles.css index 013b94f1..f71c831b 100644 --- a/part-1/7-css-box/styles.css +++ b/part-1/7-css-box/styles.css @@ -4,3 +4,7 @@ border-radius: 4px; background: #fff; } + +.countries li { + margin-bottom: 2.5rem; +} From ad6063974f15aa72b47d9c5e7735199c5a0524a5 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 13:55:09 +0300 Subject: [PATCH 08/22] Completed 8-advanced-selectors exercise --- part-1/8-advanced-selectors/styles.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css index d35c3c37..3cfe4b4f 100644 --- a/part-1/8-advanced-selectors/styles.css +++ b/part-1/8-advanced-selectors/styles.css @@ -1 +1,13 @@ /* Try different box model properties below */ +.site-header > p { + color: white; + margin-bottom: 0.5rem; +} + +.site-footer > p { + font-size: 12px; + text-align: center; +} +.message:last-child { + box-shadow: 4px 4px 0 #dba944; +} From a83d77f6c09c099f16b84932d2d5039ace78e1d0 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 14:14:05 +0300 Subject: [PATCH 09/22] red-links --- part-1/9-git-branch/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/part-1/9-git-branch/styles.css b/part-1/9-git-branch/styles.css index 0051cdba..bc4104b3 100644 --- a/part-1/9-git-branch/styles.css +++ b/part-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 0daa09f7b368626f7089fc19243d0327a2c49170 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 15:18:57 +0300 Subject: [PATCH 10/22] Completed 11-flexbox exercise --- part-2/11-flexbox/flexbox.css | 10 ++++++++++ part-2/11-flexbox/index.html | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css index 43e80d23..e7345304 100644 --- a/part-2/11-flexbox/flexbox.css +++ b/part-2/11-flexbox/flexbox.css @@ -1 +1,11 @@ /* Add your own CSS code below */ +.container { + display: flex; +} +.countries--first { + flex-direction: row-reverse; +} + +.countries--third { + flex-direction: column-reverse; +} diff --git a/part-2/11-flexbox/index.html b/part-2/11-flexbox/index.html index 11dc3dbb..989b370f 100644 --- a/part-2/11-flexbox/index.html +++ b/part-2/11-flexbox/index.html @@ -24,7 +24,7 @@

Exercises

First

-
    +
    • 1. Brazil
    • 2. Croatia
    • 3. Ethiopia
      • @@ -40,7 +40,7 @@

      Solution

      Second

      -
        +
        • 1. Brazil
        • 2. Croatia
        • 3. Ethiopia
          • @@ -56,7 +56,7 @@

          Solution

          Third

          -
            +
            • 1. Brazil
            • 2. Croatia
            • 3. Ethiopia
              • From 5222830ba8330440c04af6b6299ca3e5dad2af26 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 15:33:44 +0300 Subject: [PATCH 11/22] Completed 10-media-queries exercise --- part-2/10-media-queries/columns.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/part-2/10-media-queries/columns.css b/part-2/10-media-queries/columns.css index 43e80d23..711e9b95 100644 --- a/part-2/10-media-queries/columns.css +++ b/part-2/10-media-queries/columns.css @@ -1 +1,12 @@ /* Add your own CSS code below */ +@media screen and (max-width: 768px) { + .countries { + columns: 2; + } +} + +@media screen and (max-width: 1200px) { + .countries { + columns: 3; + } +} From 718fa975e8fa0b0fede78e56a5e408ffbb0f6dd6 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 15:51:26 +0300 Subject: [PATCH 12/22] Completed 12-justify-content exercise --- part-2/12-justify-content/flexbox.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css index 3c4c7ff1..8f8c858f 100644 --- a/part-2/12-justify-content/flexbox.css +++ b/part-2/12-justify-content/flexbox.css @@ -7,3 +7,13 @@ } /* Add your own CSS code below */ + +.countries--third { + flex-direction: column; + justify-content: flex-end; +} + +.countries--fourth { + flex-direction: column-reverse; + justify-content: space-between; +} From 73cc957701a5e56239c7c7bc82093abe973ee060 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 16:04:33 +0300 Subject: [PATCH 13/22] Completed 13-align-items exercise --- part-2/13-align-items/flexbox.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css index 3675a0df..2f6385f4 100644 --- a/part-2/13-align-items/flexbox.css +++ b/part-2/13-align-items/flexbox.css @@ -2,3 +2,22 @@ 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 { + align-items: center; + flex-direction: column-reverse; +} From 4f46f20b805742acd234dec32832842fd4130584 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 16:27:23 +0300 Subject: [PATCH 14/22] Completed 15-align-self exercise --- part-2/15-align-self/flexbox.css | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/part-2/15-align-self/flexbox.css b/part-2/15-align-self/flexbox.css index ed621b79..e6379711 100644 --- a/part-2/15-align-self/flexbox.css +++ b/part-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; +} + +.countries--second .country--ethiopia { + align-self: flex-end; +} + +.countries--third { + align-items: flex-end; +} + +.countries--third .country--brazil { + align-self: flex-start; +} +.countries--third .country--uganda { + align-self: flex-start; +} + +.countries--fourth { + flex-direction: column; + align-items: flex-start; +} +.countries--fourth .country--uganda { + align-self: center; +} From 5a708df9329bebb31ec9b9f1287757584d8fa8f1 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 16:50:33 +0300 Subject: [PATCH 15/22] Completed 14-order exercise --- part-2/14-order/flexbox.css | 13 +++++++++++++ part-2/16-more-flexbox/flexbox.css | 3 +++ 2 files changed, 16 insertions(+) diff --git a/part-2/14-order/flexbox.css b/part-2/14-order/flexbox.css index ed621b79..06a5d1d7 100644 --- a/part-2/14-order/flexbox.css +++ b/part-2/14-order/flexbox.css @@ -3,3 +3,16 @@ } /* 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--third { + flex-direction: row-reverse; +} diff --git a/part-2/16-more-flexbox/flexbox.css b/part-2/16-more-flexbox/flexbox.css index ed621b79..96483f93 100644 --- a/part-2/16-more-flexbox/flexbox.css +++ b/part-2/16-more-flexbox/flexbox.css @@ -3,3 +3,6 @@ } /* Add your own CSS code below */ +.countries--first { + align-items: flex-end; +} From 1bbacf57b3a5d684d308fbd5a62fede392a80b06 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Mon, 17 May 2021 17:07:51 +0300 Subject: [PATCH 16/22] 16 completed --- part-2/16-more-flexbox/flexbox.css | 32 +++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/part-2/16-more-flexbox/flexbox.css b/part-2/16-more-flexbox/flexbox.css index 96483f93..b0a64374 100644 --- a/part-2/16-more-flexbox/flexbox.css +++ b/part-2/16-more-flexbox/flexbox.css @@ -3,6 +3,36 @@ } /* Add your own CSS code below */ -.countries--first { +.countries--second { align-items: flex-end; } +.countries--third { + align-items: flex-start; +} +.countries--third .country--brazil { + align-self: flex-end; +} +.countries--fourth { + flex-direction: column; + align-items: flex-end; +} +.countries--fourth .country--ethiopia { + align-self: flex-start; +} +.countries--fourth .country--laos { + align-self: flex-start; +} + +.countries--fifth { + flex-direction: column-reverse; + align-items: flex-end; + justify-content: space-between; +} + +.countries--fifth .country--laos { + order: 4; +} + +.countries--fifth .country--uganda { + align-self: center; +} From 862c50af9d5209bcc7b4544be46f1313297d2327 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Tue, 18 May 2021 06:46:15 +0300 Subject: [PATCH 17/22] adding orange branch --- part-2/18-git-merge/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/part-2/18-git-merge/styles.css b/part-2/18-git-merge/styles.css index 0051cdba..af46a4f7 100644 --- a/part-2/18-git-merge/styles.css +++ b/part-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; } From 5be0e0f291c28e260dfa8a88474d281d1ca8c304 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Tue, 18 May 2021 07:19:27 +0300 Subject: [PATCH 18/22] Completed 19-search exercise --- part-2/17-nav-menu/styles.css | 9 +++++++++ part-3/19-search/index.html | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/part-2/17-nav-menu/styles.css b/part-2/17-nav-menu/styles.css index f04f4c7b..71542886 100644 --- a/part-2/17-nav-menu/styles.css +++ b/part-2/17-nav-menu/styles.css @@ -1 +1,10 @@ /* Write your media queries and flexbox CSS below */ +@media screen and (max-width: 480px) { + .site-header { + columns: 3; + } +} + +.site-header { + flex-direction: column; +} diff --git a/part-3/19-search/index.html b/part-3/19-search/index.html index d94ec98d..e7544dbd 100644 --- a/part-3/19-search/index.html +++ b/part-3/19-search/index.html @@ -11,7 +11,9 @@
              -

              Delete this line and add your form.

              +
              + +
              From 0c5ac2b73c1575f243ea9a3419c83bea30276b65 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Tue, 18 May 2021 07:28:19 +0300 Subject: [PATCH 19/22] Completed 20-labels exercise --- part-3/20-labels/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/part-3/20-labels/index.html b/part-3/20-labels/index.html index ccdc8171..26aa6330 100644 --- a/part-3/20-labels/index.html +++ b/part-3/20-labels/index.html @@ -12,8 +12,8 @@
              - - + +
              From bdb668fabcbe4a688f16dacdd2b924738b3fa806 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Tue, 18 May 2021 07:33:46 +0300 Subject: [PATCH 20/22] 21 completed --- part-3/21-buttons/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/part-3/21-buttons/index.html b/part-3/21-buttons/index.html index ff87846d..fb566048 100644 --- a/part-3/21-buttons/index.html +++ b/part-3/21-buttons/index.html @@ -14,7 +14,7 @@
              - +
          From 7c4737af330b91eca920ec19e193b7e88ede61d9 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Tue, 18 May 2021 07:50:17 +0300 Subject: [PATCH 21/22] Completed 22-checkout exercise --- part-3/22-checkout/index.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/part-3/22-checkout/index.html b/part-3/22-checkout/index.html index 4c42ebba..c77a83cf 100644 --- a/part-3/22-checkout/index.html +++ b/part-3/22-checkout/index.html @@ -37,7 +37,14 @@

          Your Shopping Basket

          Checkout

          - + + + + + + + +
          From d1f154f0f799ad4e26fdb9a1f19a76bc6d8bc387 Mon Sep 17 00:00:00 2001 From: sharifa-assi Date: Tue, 18 May 2021 10:42:29 +0300 Subject: [PATCH 22/22] 27 completed --- part-3/23-comments/index.html | 6 +++- part-3/24-dietary/index.html | 23 +++++++++++++- part-3/25-shirt-size/index.html | 9 +++++- part-3/25-shirt-size/styles.css | 5 +++ part-3/26-checkout-groups/index.html | 46 ++++++++++++++++++++++++++++ part-3/27-attributes/index.html | 16 +++++----- part-3/28-git-conflict/styles.css | 2 +- 7 files changed, 95 insertions(+), 12 deletions(-) diff --git a/part-3/23-comments/index.html b/part-3/23-comments/index.html index 110a5027..eb305c5f 100644 --- a/part-3/23-comments/index.html +++ b/part-3/23-comments/index.html @@ -31,7 +31,11 @@

          Our t-shirts are amazing!

          Add your comments and let us know what you think!

          - +
          + + + +
          diff --git a/part-3/24-dietary/index.html b/part-3/24-dietary/index.html index 5593174b..ad65ecf3 100644 --- a/part-3/24-dietary/index.html +++ b/part-3/24-dietary/index.html @@ -19,7 +19,28 @@

          Codi Summit

          - + +
          + Please select all of your dietary requirements + + + +
          + + +
          + + +
          + + + +
          + + + + +
          diff --git a/part-3/25-shirt-size/index.html b/part-3/25-shirt-size/index.html index 9e4d606f..e74e8956 100644 --- a/part-3/25-shirt-size/index.html +++ b/part-3/25-shirt-size/index.html @@ -29,7 +29,14 @@

          Your Shopping Basket

          - Medium + 1 diff --git a/part-3/25-shirt-size/styles.css b/part-3/25-shirt-size/styles.css index f2831578..81ffc822 100644 --- a/part-3/25-shirt-size/styles.css +++ b/part-3/25-shirt-size/styles.css @@ -1 +1,6 @@ /* Add your CSS below */ +.shopping-basket__title { + clip: rect(1px, 1px, 1px, 1px); + position: absolute !important; + left: -2000px; + } \ No newline at end of file diff --git a/part-3/26-checkout-groups/index.html b/part-3/26-checkout-groups/index.html index 66513ddd..9287302e 100644 --- a/part-3/26-checkout-groups/index.html +++ b/part-3/26-checkout-groups/index.html @@ -38,6 +38,52 @@

          Your Shopping Basket

          Checkout

          +
          + +Billing Address + + + + + + + + + + + + + + + + +
          + +
          + + Delivery Address + + + + + + + + + + + + + + + + +
          + + + + +
          diff --git a/part-3/27-attributes/index.html b/part-3/27-attributes/index.html index e54fd838..04b3f56f 100644 --- a/part-3/27-attributes/index.html +++ b/part-3/27-attributes/index.html @@ -42,7 +42,7 @@

          Checkout

          Billing Address

          - +

          @@ -50,18 +50,18 @@

          Checkout

          - +

          - +

          Delivery Address

          - +

          @@ -72,16 +72,16 @@

          Checkout

          - +

          - +

          Delivery Options @@ -90,7 +90,7 @@

          Checkout

          type="radio" name="delivery-option" id="delivery-option" - value="standard" + value="standard" checked disabled /> Royal Mail diff --git a/part-3/28-git-conflict/styles.css b/part-3/28-git-conflict/styles.css index af46a4f7..45802275 100644 --- a/part-3/28-git-conflict/styles.css +++ b/part-3/28-git-conflict/styles.css @@ -1,6 +1,6 @@ /* Add your own CSS code below */ .link { - color: orangered; + color: #ff00ea; font-weight: 700; text-decoration: none; }