diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
index 458a4cb..3c8abf1 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:15pm
diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
index dc861fa..eaea938 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. https://goo.gl/maps/aza4h9nUBhn
7:35pm
Won
- Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
+ Ok!
7:38pm
diff --git a/week-1/2-html-attributes/readme.md b/week-1/2-html-attributes/readme.md
index 73c51cc..937e199 100644
--- a/week-1/2-html-attributes/readme.md
+++ b/week-1/2-html-attributes/readme.md
@@ -1,4 +1,4 @@
-# HTML Attributes
+g# HTML Attributes
Luke has sent a map to iCafe. Using HTML attributes, we can turn this into a link that we can click on. Won has responded with a funny gif. Wouldn't it be nice if we showed it as an image in the message?
diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
index 3640dea..7a3891f 100644
--- a/week-1/3-semantic-html/index.html
+++ b/week-1/3-semantic-html/index.html
@@ -12,28 +12,28 @@
-
-
-
+
+
+
Won
Where should we meet later?
- Mar 25, 2018 7:25pm
-
+
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
+
Mar 25, 2018 7:35pm
Won
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
-
Mar 25, 2018 7:38pm
+
Mar 25, 2018 7:38pm
diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
index 303c7fb..44b2df4 100644
--- a/week-1/4-links-scripts/index.html
+++ b/week-1/4-links-scripts/index.html
@@ -2,6 +2,8 @@
+
+
4. Adding Links and Scripts - HTML, CSS and Git Exercises
@@ -34,4 +36,6 @@
+
+
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index ffe4833..11ddd7b 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,13 @@
/* Add your CSS code below */
+#first-message {
+ background-color: red;
+ }
+
+ article {
+ background-color: cadetblue;
+ }
+
+ .message--latest {
+ background-color: yellow;
+ }
+
\ No newline at end of file
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
index ffe4833..8c9a8c2 100644
--- a/week-1/6-css-properties/styles.css
+++ b/week-1/6-css-properties/styles.css
@@ -1 +1,23 @@
/* Add your CSS code below */
+a {
+ color: red;
+ font-weight: bold;
+ text-decoration: none;
+ }
+
+ .message__time {
+ font-size: 0.9rem;
+ }
+
+ .message--unread {
+ border-left: 2px solid blue;
+ }
+
+ .message:has(.message__time--old) {
+ opacity: 0.5;
+ }
+
+ .message__content {
+ line-height: 3.5em;
+ }
+
\ No newline at end of file
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
index 013b94f..3cd0ef4 100644
--- a/week-1/7-css-box/styles.css
+++ b/week-1/7-css-box/styles.css
@@ -4,3 +4,6 @@
border-radius: 4px;
background: #fff;
}
+.country {
+ padding-left: 50px;
+}
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
index d35c3c3..f04d1a5 100644
--- a/week-1/8-advanced-selectors/styles.css
+++ b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,15 @@
/* Try different box model properties below */
+.site-header > p {
+ color: white;
+ margin-bottom: 0px;
+ }
+
+ .site-footer > p {
+ font-size: 12px;
+ text-align: center;
+ }
+
+ .messages div:last-child {
+ box-shadow: 4px 4px 0 #dba944;
+ }
+
\ No newline at end of file
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
index 43e80d2..559c9cb 100644
--- a/week-2/10-media-queries/columns.css
+++ b/week-2/10-media-queries/columns.css
@@ -1 +1,13 @@
/* Add your own CSS code below */
+@media screen and (min-width: 768px) {
+ .countries {
+ columns: 2;
+ }
+ }
+
+ @media screen and (min-width: 1200px) {
+ .countries {
+ columns: 3;
+ }
+ }
+
\ No newline at end of file
diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
index 43e80d2..5dc5432 100644
--- a/week-2/11-flexbox/flexbox.css
+++ b/week-2/11-flexbox/flexbox.css
@@ -1 +1,16 @@
/* Add your own CSS code below */
+.countries--first {
+ display: flex;
+ flex-direction: row-reverse;
+ }
+
+ .countries--second {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .countries--third {
+ display: flex;
+ flex-direction: column-reverse;
+ }
+
\ No newline at end of file
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
index 3c4c7ff..7924206 100644
--- a/week-2/12-justify-content/flexbox.css
+++ b/week-2/12-justify-content/flexbox.css
@@ -7,3 +7,20 @@
}
/* Add your own CSS code below */
+.countries--first {
+ justify-content: right;
+}
+
+.countries--second {
+ justify-content: space-between;
+}
+
+.countries--third {
+ justify-content: end;
+ flex-direction: column;
+}
+
+.countries--fourth {
+ justify-content: space-between;
+ flex-direction: column-reverse;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
index 3675a0d..593a7b8 100644
--- a/week-2/13-align-items/flexbox.css
+++ b/week-2/13-align-items/flexbox.css
@@ -2,3 +2,24 @@
display: flex;
}
/* Add your own CSS code below */
+.countries--first {
+ flex-direction: row;
+ align-items: center;
+}
+
+.countries--second {
+ flex-direction: row-reverse;
+ align-items: flex-end;
+}
+
+.countries--third {
+ flex-direction: column;
+ align-items: flex-end;
+ justify-content: start;
+}
+
+.countries--fourth {
+ flex-direction: column-reverse;
+ align-items: center;
+ justify-content: end;
+}
\ No newline at end of file
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
index ed621b7..6e50cb5 100644
--- a/week-2/14-order/flexbox.css
+++ b/week-2/14-order/flexbox.css
@@ -3,3 +3,23 @@
}
/* Add your own CSS code below */
+.countries--first :nth-child(1) {
+ order: 3;
+}
+
+.countries--second :nth-child(1) {
+ order: 3;
+}
+
+.countries--third :nth-child(1) {
+ order: 4;
+}
+.countries--third :nth-child(2) {
+ order: 3;
+}
+.countries--third :nth-child(3) {
+ order: 2;
+}
+.countries--third :nth-child(4) {
+ order: 1;
+}
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
index ed621b7..2050a63 100644
--- a/week-2/15-align-self/flexbox.css
+++ b/week-2/15-align-self/flexbox.css
@@ -3,3 +3,32 @@
}
/* 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 {
+ flex-direction: row;
+ align-items: flex-end;
+}
+.countries--third .country--brazil,
+.countries--third .country--uganda {
+ align-self: flex-start;
+}
+
+.countries--fourth {
+ flex-direction: column;
+ align-items: flex-start;
+}
+
+.countries--third,
+.country--uganda {
+ align-self: center;
+}
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
index ed621b7..9ad93b2 100644
--- a/week-2/16-more-flexbox/flexbox.css
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,48 @@
}
/* Add your own CSS code below */
+.countries--first {
+ align-items: flex-end;
+ justify-content: end;
+}
+
+.countries--second {
+ flex-direction: row-reverse;
+ align-items: flex-end;
+ justify-content: end;
+}
+
+.countries--third {
+ align-items: flex-start;
+ justify-content: end;
+}
+
+.countries--third .country--brazil {
+ align-self: flex-end;
+}
+
+.countries--fourth {
+ flex-direction: column;
+ align-items: flex-end;
+ justify-content: center;
+}
+
+.countries--fourth .country--ethiopia,
+.countries--fourth .country--laos {
+ align-self: center;
+}
+
+.countries--fifth {
+ flex-direction: column-reverse;
+ align-items: flex-end;
+ justify-content: space-around;
+}
+
+.countries--fifth .country--uganda {
+ align-self: center;
+ order: 4;
+}
+
+.countries--fifth .country--laos {
+ order: 5;
+}
\ No newline at end of file
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
index f04f4c7..75cf784 100644
--- a/week-2/17-nav-menu/styles.css
+++ b/week-2/17-nav-menu/styles.css
@@ -1 +1,24 @@
/* Write your media queries and flexbox CSS below */
+@media screen and (min-width: 480px) {
+ .site-header__nav {
+ flex-direction: row;
+ display: flex;
+ }
+ }
+
+ @media screen and (min-width: 700px) {
+ .site-header {
+ flex-direction: row;
+ display: flex;
+ justify-content: flex-start;
+ }
+ }
+
+ @media screen and (min-width: 992px) {
+ .site-header__checkout {
+ flex-direction: row;
+ display: flex;
+ justify-content: center;
+ }
+ }
+
\ No newline at end of file
diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css
index 0051cdb..af46a4f 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;
}