diff --git a/package-lock.json b/package-lock.json
index b15084556..8e15d45d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -768,7 +768,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -789,12 +790,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -809,17 +812,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -936,7 +942,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -948,6 +955,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -962,6 +970,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -969,12 +978,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -993,6 +1004,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -1073,7 +1085,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -1085,6 +1098,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -1170,7 +1184,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -1206,6 +1221,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -1225,6 +1241,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -1268,12 +1285,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
index 458a4cb21..3c8abf1bc 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 dc861fa4f..5ce57b08e 100644
--- a/week-1/2-html-attributes/index.html
+++ b/week-1/2-html-attributes/index.html
@@ -23,14 +23,16 @@
Luke
- Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
+ Let's meet at the iCafe in Merchant
+ City.
7:35pm
Won
- Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
+ Ok!
+
7:38pm
diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
index 3640deaff..fe0dd9f4c 100644
--- a/week-1/3-semantic-html/index.html
+++ b/week-1/3-semantic-html/index.html
@@ -12,30 +12,31 @@
-
-
-
+
+
+
+
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
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
- 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..9fd44f023 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-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index ffe483325..4ea61c511 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,10 @@
/* Add your CSS code below */
+#first-message {
+ background: red;
+}
+article {
+ background: cadetblue;
+}
+.message--latest {
+ background: yellow;
+}
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
index ffe483325..aa051cc83 100644
--- a/week-1/6-css-properties/styles.css
+++ b/week-1/6-css-properties/styles.css
@@ -1 +1,20 @@
/* Add your CSS code below */
+
+a {
+ text-decoration: none;
+ font-weight: bold;
+ color: red;
+}
+.message__time {
+ font-size: 0.9rem;
+}
+.message--unread {
+ border-left-style: solid;
+ border-color: blue;
+}
+.message__time--old {
+ opacity: 0.5;
+}
+.message__content {
+ line-height: 1.8;
+}
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
index 013b94f1e..1a43a155e 100644
--- a/week-1/7-css-box/styles.css
+++ b/week-1/7-css-box/styles.css
@@ -1,6 +1,6 @@
/* Try different box model properties below */
.pages__page {
- border: 1px solid #4491db;
+ border: 1px solid red;
border-radius: 4px;
background: #fff;
}
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
index d35c3c371..794fb30e3 100644
--- a/week-1/8-advanced-selectors/styles.css
+++ b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,12 @@
/* Try different box model properties below */
+.site-header > p {
+ color: white;
+ margin-bottom: 0rem;
+}
+.site-footer > p {
+ font-size: 12px;
+ text-align: center;
+}
+.message:last-child {
+ box-shadow: 4px 4px 0 #dba944;
+}
diff --git a/week-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css
index 0051cdbaf..bc4104b39 100644
--- a/week-1/9-git-branch/styles.css
+++ b/week-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;
}
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
index 43e80d23c..8814c54d4 100644
--- a/week-2/10-media-queries/columns.css
+++ b/week-2/10-media-queries/columns.css
@@ -1 +1,12 @@
/* Add your own CSS code below */
+
+@media only screen and (min-width: 768px) {
+ .countries {
+ columns: 2;
+ }
+}
+@media only screen and (min-width: 1200px) {
+ .countries {
+ columns: 3;
+ }
+}
diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
index 43e80d23c..ff7cc03b3 100644
--- a/week-2/11-flexbox/flexbox.css
+++ b/week-2/11-flexbox/flexbox.css
@@ -1 +1,10 @@
/* Add your own CSS code below */
+.countries--first {
+ display: flex;
+ flex-direction: row-reverse;
+ justify-content: end;
+}
+.countries--third {
+ display: flex;
+ flex-direction: column-reverse;
+}
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
index 3c4c7ff18..5ce32a7f3 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 {
+ display: flex;
+ justify-content: flex-end;
+}
+.countries--second {
+ display: flex;
+ justify-content: space-around;
+}
+.countries--third {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-end;
+}
+.countries--fourth {
+ display: flex;
+ flex-direction: column-reverse;
+ justify-content: space-around;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
index 3675a0df3..4d21c60fc 100644
--- a/week-2/13-align-items/flexbox.css
+++ b/week-2/13-align-items/flexbox.css
@@ -2,3 +2,19 @@
display: flex;
}
/* Add your own CSS code below */
+.countries--first {
+ flex-direction: row;
+ align-items: center;
+}
+.countries--second {
+ flex-direction: row;
+ align-items: flex-end;
+}
+.countries--third {
+ flex-direction: column;
+ align-items: flex-end;
+}
+.countries--fourth {
+ flex-direction: column-reverse;
+ align-items: center;
+}
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
index ed621b793..d2bea03dc 100644
--- a/week-2/14-order/flexbox.css
+++ b/week-2/14-order/flexbox.css
@@ -3,3 +3,19 @@
}
/* Add your own CSS code below */
+
+.countries--first .country--brazil {
+ display: flex;
+
+ order: 1;
+}
+.countries--second .country--uganda {
+ order: 2;
+}
+.countries--second .country--brazil {
+ order: 1;
+}
+.countries--third {
+ flex-direction: row-reverse;
+ justify-content: flex-end;
+}
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
index ed621b793..d4cff3331 100644
--- a/week-2/15-align-self/flexbox.css
+++ b/week-2/15-align-self/flexbox.css
@@ -3,3 +3,31 @@
}
/* 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-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;
+}
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
index ed621b793..a57bb5dc1 100644
--- a/week-2/16-more-flexbox/flexbox.css
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,39 @@
}
/* Add your own CSS code below */
+.countries--first {
+ justify-content: flex-end;
+ align-items: flex-end;
+}
+.countries--second {
+ flex-direction: row-reverse;
+ align-items: flex-end;
+ justify-content: center;
+}
+.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: center;
+}
+.countries--fourth .country--laos {
+ align-self: center;
+}
+.countries--fifth {
+ flex-direction: column-reverse;
+ align-items: flex-end;
+ justify-content: space-evenly;
+}
+.countries--fifth .country--uganda {
+ align-self: center;
+}
+.countries--fifth .country--laos {
+ order: 1;
+}
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
index f04f4c7ba..73c73b0c2 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 only screen and (min-width: 700px) {
+ .site-header {
+ display: flex;
+ flex-direction: row;
+ }
+}
+@media only screen and (min-width: 992px) {
+ .site-header__nav {
+ align-content: center;
+ }
+ .site-header {
+ justify-content: space-between;
+ }
+}
diff --git a/week-3/19-search/index.html b/week-3/19-search/index.html
index d94ec98dd..e7544dbd3 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..69294211e 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..e94d36029 100644
--- a/week-3/22-checkout/index.html
+++ b/week-3/22-checkout/index.html
@@ -37,7 +37,14 @@
Checkout
diff --git a/week-3/23-comments/index.html b/week-3/23-comments/index.html
index 110a5027b..51d5872e7 100644
--- a/week-3/23-comments/index.html
+++ b/week-3/23-comments/index.html
@@ -32,6 +32,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..094207300 100644
--- a/week-3/24-dietary/index.html
+++ b/week-3/24-dietary/index.html
@@ -20,6 +20,20 @@ CodeYourFuture Summit
diff --git a/week-3/25-shirt-size/index.html b/week-3/25-shirt-size/index.html
index 56d5a1054..b1d9cb52a 100644
--- a/week-3/25-shirt-size/index.html
+++ b/week-3/25-shirt-size/index.html
@@ -29,7 +29,11 @@
- Medium
+
|
1
diff --git a/week-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html
index 870451a66..c7b9c6cf6 100644
--- a/week-3/26-checkout-groups/index.html
+++ b/week-3/26-checkout-groups/index.html
@@ -38,6 +38,34 @@
Checkout
diff --git a/week-3/27-attributes/index.html b/week-3/27-attributes/index.html
index 1b9e12c0e..6b591673a 100644
--- a/week-3/27-attributes/index.html
+++ b/week-3/27-attributes/index.html
@@ -42,7 +42,12 @@ Checkout
-
+
@@ -50,18 +55,28 @@ Checkout
-
+
-
+
|