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 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
diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html index 3640deaff..9a3cc4dd3 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -12,22 +12,26 @@
-
+
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 +39,7 @@

Mar 25, 2018 7:38pm
-
+
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 @@ + diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css index ed621b793..f1fb483aa 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -3,3 +3,31 @@ } /* Add your own CSS code below */ + +.countries--first .country--brazil { + order: 5; +} + +.countries--second .country--uganda { + order: 10; +} + +.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; +} 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; +} 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 { +} 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; + } +} 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; } 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.

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

-
- - - -
-
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!

- +
+ + + +
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 + + + + + + + + + + +
+
+
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; +} diff --git a/week-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html index 870451a66..dcad623b7 100644 --- a/week-3/26-checkout-groups/index.html +++ b/week-3/26-checkout-groups/index.html @@ -37,7 +37,20 @@

Your Shopping Basket

Checkout

- +
+ Billing Address + + + + +
+
+ Delivery Address + + + + +
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 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