From cc1556aa935bb66de95d34f8f2c804911041f7ef Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 05:20:56 -0400 Subject: [PATCH 01/21] first --- 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..440d67e59 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:00pm From 3b3eff16f2f499cbb3a3a3cc74596f69848231b7 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 05:27:42 -0400 Subject: [PATCH 02/21] second --- week-1/2-html-attributes/index.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html index dc861fa4f..7cb72456b 100644 --- a/week-1/2-html-attributes/index.html +++ b/week-1/2-html-attributes/index.html @@ -23,7 +23,11 @@
Luke

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

7:35pm
From d8a150f01545c1253746b592858ce0e3f66e08c6 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 06:46:19 -0400 Subject: [PATCH 03/21] 14 --- week-1/3-semantic-html/index.html | 15 ++++++++------- week-2/14-order/flexbox.css | 12 ++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html index 3640deaff..b0abae3ea 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -12,22 +12,23 @@
-
+
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

@@ -35,7 +36,7 @@

Mar 25, 2018 7:38pm
-
+
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css index ed621b793..595ae9fa6 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -3,3 +3,15 @@ } /* Add your own CSS code below */ + +.countries--first .country--brazil { + order: 5; +} + +.countries--second .country--uganda { + order: 10; +} + +.countries--second .country--brazil { + order: 1; +} From f453b6ac1532f3a1375d8f63293812cac04b8199 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 06:53:21 -0400 Subject: [PATCH 04/21] 14 --- week-2/14-order/flexbox.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css index 595ae9fa6..f1fb483aa 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -15,3 +15,19 @@ .countries--second .country--brazil { order: 1; } + +.countries--third .country--brazil { + order: 5; +} + +.countries--third .country--croatia { + order: 4; +} + +.countries--third .country--ethiopia { + order: 3; +} + +.countries--third .country--laos { + order: 2; +} From 596d72bb1b07af555e3670ec4d49d9ddaf47179f Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 07:43:40 -0400 Subject: [PATCH 05/21] 15 --- week-2/15-align-self/flexbox.css | 69 ++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css index ed621b793..0f74fa87c 100644 --- a/week-2/15-align-self/flexbox.css +++ b/week-2/15-align-self/flexbox.css @@ -2,4 +2,73 @@ display: flex; } +.countries--first .country--ethiopia { + align-self: flex-end; +} + /* Add your own CSS code below */ + +.countries--second .country--brazil { + align-self: center; +} + +.countries--second .country--croatia { + align-self: center; +} + +.countries--second .country--ethiopia { + align-self: flex-end; +} + +.countries--second .country--laos { + align-self: center; +} + +.countries--second .country--uganda { + align-self: center; +} + +.countries--third .country--brazil { + 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--third .country--uganda { + align-self: flex-start; +} + +.countries--fourth { + flex-direction: column; + align-items: left; +} + +.countries--fourth .country--brazil { + align-self: flex-start; +} + +.countries--fourth .country--croatia { + align-self: flex-start; +} + +.countries--fourth .country--uganda { + align-self: center; +} + +.countries--fourth .country--laos { + align-self: flex-start; +} + +.countries--fourth .country--ethiopia { + align-self: flex-start; +} From ac257996800455782207a63ea06a2fa8e1af5a95 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 17:21:45 -0400 Subject: [PATCH 06/21] 16 --- week-2/16-more-flexbox/flexbox.css | 73 ++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css index ed621b793..b4fe13b26 100644 --- a/week-2/16-more-flexbox/flexbox.css +++ b/week-2/16-more-flexbox/flexbox.css @@ -3,3 +3,76 @@ } /* Add your own CSS code below */ + +.countries--first { + justify-content: right; + align-items: flex-end; +} + +.countries--second { + justify-content: center; + align-items: flex-end; +} + +.countries--third { + justify-content: right; + align-items: flex-start; +} + +.countries--third .country--brazil { + align-self: flex-end; +} + +.countries--fourth { + align-self: flex-start; + flex-direction: column; + justify-content: right; + align-items: flex-end; +} + +.countries--fourth .country--brazil { + align-items: flex-end; + margin-top: 60px; +} + +.countries--fourth .country--croatia { + align-items: flex-end; +} + +.countries--fourth .country--ethiopia { + align-self: center; +} + +.countries--fourth .country--laos { + align-self: center; +} + +.countries--fourth .country--uganda { + align-self: flex-end; + justify-content: right; +} + +.countries--fifth { + align-self: flex-end; + flex-direction: column; + justify-content: right; + align-items: flex-end; + justify-content: space-between; + flex-direction: column-reverse; +} + +.countries--fifth .country--brazil { + align-self: flex-end; +} +.countries--fifth .country--uganda { + align-self: center; +} + +.countries--fifth .country--laos { + align-self: flex-end; + align-items: flex-start; + order: 1; +} + +.countries--fifth .country--croatia { +} From 595a4862bb2ded0daeaee8dbf34b1b84b646208d Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 17:39:32 -0400 Subject: [PATCH 07/21] 17 --- week-2/17-nav-menu/styles.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css index f04f4c7ba..ea8afa0ee 100644 --- a/week-2/17-nav-menu/styles.css +++ b/week-2/17-nav-menu/styles.css @@ -1 +1,21 @@ /* Write your media queries and flexbox CSS below */ +@media only screen and (min-width: 480px) { + .site-header__nav { + display: flex; + flex-direction: row; + } +} + +@media (min-width: 700px) { + .site-header { + display: flex; + flex-direction: row; + align-items: center; + } +} + +@media (min-width: 992px) { + .site-header { + justify-content: space-between; + } +} From 2f2d583d47e54db8fc89cd4c590f8460a9388ea3 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 18:22:04 -0400 Subject: [PATCH 08/21] 3 --- week-1/3-semantic-html/index.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html index b0abae3ea..9a3cc4dd3 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -20,15 +20,18 @@
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

- +
+
Won

From f806438ebefa5285ed2328478467348386d3d9ff Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 19 Oct 2019 18:38:24 -0400 Subject: [PATCH 09/21] 4 --- 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..2b7aab2c2 100644 --- a/week-1/4-links-scripts/index.html +++ b/week-1/4-links-scripts/index.html @@ -1,6 +1,7 @@ + 4. Adding Links and Scripts - HTML, CSS and Git Exercises @@ -33,5 +34,6 @@

+ From c43131b97f423d8c6cb14374a0374006ede69411 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Sat, 26 Oct 2019 06:11:32 -0400 Subject: [PATCH 10/21] 18_branch --- week-2/18-git-merge/styles.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css index 0051cdbaf..67439248b 100644 --- a/week-2/18-git-merge/styles.css +++ b/week-2/18-git-merge/styles.css @@ -1,6 +1,7 @@ /* Add your own CSS code below */ + .link { - color: #4491db; + color: orangered; font-weight: 700; text-decoration: none; } From ef615ce2ca277eb14e9558d09f0f1b6d04efdd15 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Tue, 29 Oct 2019 12:55:42 -0400 Subject: [PATCH 11/21] 19 --- week-3/19-search/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/week-3/19-search/index.html b/week-3/19-search/index.html index d94ec98dd..57e4ea72b 100644 --- a/week-3/19-search/index.html +++ b/week-3/19-search/index.html @@ -11,7 +11,9 @@
-

Delete this line and add your form.

+
+ +
From f2960e8d5d25b4f675026c93b8014c6c088a7dd3 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Tue, 29 Oct 2019 12:56:46 -0400 Subject: [PATCH 12/21] 20 --- week-3/20-labels/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/week-3/20-labels/index.html b/week-3/20-labels/index.html index ccdc81717..909dc514d 100644 --- a/week-3/20-labels/index.html +++ b/week-3/20-labels/index.html @@ -12,8 +12,8 @@
- - + +
From a1dfb46a78c5d19de90d856c527f9fe50c02936b Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Tue, 29 Oct 2019 13:07:26 -0400 Subject: [PATCH 13/21] 21 --- week-3/21-buttons/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week-3/21-buttons/index.html b/week-3/21-buttons/index.html index ff87846df..fb5660488 100644 --- a/week-3/21-buttons/index.html +++ b/week-3/21-buttons/index.html @@ -14,7 +14,7 @@
- +
From de20a8ee7f8f360c1be8a7418e3360ffc403fd0d Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Fri, 1 Nov 2019 08:32:17 -0400 Subject: [PATCH 14/21] 22 --- week-3/22-checkout/index.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/week-3/22-checkout/index.html b/week-3/22-checkout/index.html index 8d81ffb13..ad84c48fd 100644 --- a/week-3/22-checkout/index.html +++ b/week-3/22-checkout/index.html @@ -33,15 +33,6 @@

Your Shopping Basket

- -
-

Checkout

-
- - - -
-
From e50052b6b72f132444a8122e248c96562ffd40a7 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Fri, 1 Nov 2019 08:48:59 -0400 Subject: [PATCH 15/21] 29 --- week-3/29-combined-skills/about.html | 7 ++++--- week-3/29-combined-skills/contact.html | 5 +++-- week-3/29-combined-skills/index.html | 9 +++++---- week-3/29-combined-skills/styles.css | 4 ++++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/week-3/29-combined-skills/about.html b/week-3/29-combined-skills/about.html index dcac2574d..81921c117 100644 --- a/week-3/29-combined-skills/about.html +++ b/week-3/29-combined-skills/about.html @@ -12,7 +12,7 @@
-

C.Y.F

+
  • @@ -51,7 +51,7 @@

    C.Y.F

    -

    About C.Y.F

    +
    About C.Y.F

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suspendisse sed nisi lacus sed viverra @@ -120,7 +120,8 @@

    About C.Y.F

    Built - with ♥ for CodeYourFuture. + with ♥ for + CodeYourFuture.

    -
    C.Y.F
    +
    • @@ -71,7 +71,8 @@

      Contact Us

      Built - with ♥ for CodeYourFuture. + with ♥ for + CodeYourFuture.

      -

      C.Y.F

      +
      • @@ -69,9 +69,9 @@

        View:

        -

        +
        Consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore -

        +

        By Aliquip Occaecat

        @@ -103,7 +103,8 @@

        Built - with ♥ for CodeYourFuture. + with ♥ for + CodeYourFuture.

        Date: Fri, 1 Nov 2019 08:53:17 -0400 Subject: [PATCH 16/21] 23 --- week-3/23-comments/index.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/week-3/23-comments/index.html b/week-3/23-comments/index.html index 110a5027b..ff5ddc3cf 100644 --- a/week-3/23-comments/index.html +++ b/week-3/23-comments/index.html @@ -31,7 +31,11 @@

        Our t-shirts are amazing!

        Add your comments and let us know what you think!

        - +
        + + + +

From 2796f853f032a47dabdcfe393d7512d513e39051 Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Fri, 1 Nov 2019 08:56:27 -0400 Subject: [PATCH 17/21] 24 --- week-3/24-dietary/index.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/week-3/24-dietary/index.html b/week-3/24-dietary/index.html index 6bc254f7c..a9a6c8af4 100644 --- a/week-3/24-dietary/index.html +++ b/week-3/24-dietary/index.html @@ -19,7 +19,21 @@

CodeYourFuture Summit

- +
+ Please select all of your dietary requirements + + + + + + + + + + +
+
+
From 07971dffe7e9619b49832d01a45d04ca805078fa Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Fri, 1 Nov 2019 09:03:54 -0400 Subject: [PATCH 18/21] 25 --- week-3/25-shirt-size/index.html | 9 ++++++++- week-3/25-shirt-size/styles.css | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/week-3/25-shirt-size/index.html b/week-3/25-shirt-size/index.html index 56d5a1054..4c7f31f90 100644 --- a/week-3/25-shirt-size/index.html +++ b/week-3/25-shirt-size/index.html @@ -29,7 +29,14 @@

Your Shopping Basket

- Medium +
+ + +
1 diff --git a/week-3/25-shirt-size/styles.css b/week-3/25-shirt-size/styles.css index f28315785..d2422d701 100644 --- a/week-3/25-shirt-size/styles.css +++ b/week-3/25-shirt-size/styles.css @@ -1 +1,7 @@ /* Add your CSS below */ + +.screenreader { + clip: rect(1px, 1px, 1px, 1px); + position: absolute !important; + left: -2000px; +} From 7be534e9521717aa2a11b826e4ef40ddb6bb157c Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Fri, 1 Nov 2019 09:13:09 -0400 Subject: [PATCH 19/21] 26 --- week-3/26-checkout-groups/index.html | 127 +++++++++++++++++---------- 1 file changed, 81 insertions(+), 46 deletions(-) diff --git a/week-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html index 870451a66..e7b55f216 100644 --- a/week-3/26-checkout-groups/index.html +++ b/week-3/26-checkout-groups/index.html @@ -1,48 +1,83 @@ - - - - 26 - Checkout Groups - HTML, CSS and Git Exercises - - - - - -
-
-
-

Your Shopping Basket

- - - - - - - - - - - - - -
ProductSizeUnitsPrice
-
- CodeYourFuture t-shirts in black -

CodeYourFuture t-shirt, black

-
- 		Medium1£10.00
-
- -
-

Checkout

-
- - - -
-
-
-
- - + + + + + 26 - Checkout Groups - HTML, CSS and Git Exercises + + + + + +
+
+ +
+

Your Shopping Basket

+ + + + + + + + + + + + + +
ProductSizeUnitsPrice
+
+ CodeYourFuture t-shirts in black +

CodeYourFuture t-shirt, black

+
+ 		Medium1£10.00
+
+ +
+

Checkout

+
+
+ Billing Address + + + + +
+
+Delivery Address + + + + + + +
+ + +
+
+ +
+
+ + + \ No newline at end of file From 8caf6fa7e15668ac7501c312421304464efb177c Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Fri, 1 Nov 2019 09:15:40 -0400 Subject: [PATCH 20/21] 27 --- week-3/27-attributes/index.html | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/week-3/27-attributes/index.html b/week-3/27-attributes/index.html index 1b9e12c0e..62101768c 100644 --- a/week-3/27-attributes/index.html +++ b/week-3/27-attributes/index.html @@ -42,7 +42,7 @@

Checkout

Billing Address

- +

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

Checkout

- +

- +

Delivery Address

- +

@@ -73,15 +73,27 @@

Checkout

type="text" name="delivery-address-postcode" id="delivery-address-postcode" + required />

- +

- +

Delivery Options @@ -91,6 +103,8 @@

Checkout

name="delivery-option" id="delivery-option" value="standard" + checked + disabled /> Royal Mail From 2e77c9d51dba8c46f6e07fac74011287471490da Mon Sep 17 00:00:00 2001 From: rahaf89 Date: Fri, 1 Nov 2019 09:23:21 -0400 Subject: [PATCH 21/21] 26 --- week-3/26-checkout-groups/index.html | 140 +++++++++++---------------- 1 file changed, 59 insertions(+), 81 deletions(-) diff --git a/week-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html index e7b55f216..dcad623b7 100644 --- a/week-3/26-checkout-groups/index.html +++ b/week-3/26-checkout-groups/index.html @@ -1,83 +1,61 @@ - - - - - 26 - Checkout Groups - HTML, CSS and Git Exercises - - - - - -
-
- -
-

Your Shopping Basket

- - - - - - - - - - - - - -
ProductSizeUnitsPrice
-
- CodeYourFuture t-shirts in black -

CodeYourFuture t-shirt, black

-
- 		Medium1£10.00
-
- -
-

Checkout

-
-
- Billing Address - - - - -
-
-Delivery Address - - - - - - -
- - -
-
- -
-
- - - \ No newline at end of file + + + + 26 - Checkout Groups - HTML, CSS and Git Exercises + + + + + +
+
+
+

Your Shopping Basket

+ + + + + + + + + + + + + +
ProductSizeUnitsPrice
+
+ CodeYourFuture t-shirts in black +

CodeYourFuture t-shirt, black

+
+ 		Medium1£10.00
+
+ +
+

Checkout

+
+
+ Billing Address + + + + +
+
+ Delivery Address + + + + +
+ + +
+
+
+
+ +