+
-
+
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 -
+ Mar 25, 2018 7:38pm +
diff --git a/part-1/4-links-scripts/index.html b/part-1/4-links-scripts/index.html index 303c7fb..9a30801 100644 --- a/part-1/4-links-scripts/index.html +++ b/part-1/4-links-scripts/index.html @@ -4,9 +4,11 @@ 4. Adding Links and Scripts - HTML, CSS and Git Exercises + +
Messages
@@ -33,5 +35,6 @@
+ diff --git a/part-1/5-css-selectors/index.html b/part-1/5-css-selectors/index.html index cce9c16..a5d4ec8 100644 --- a/part-1/5-css-selectors/index.html +++ b/part-1/5-css-selectors/index.html @@ -22,7 +22,7 @@

Where should we meet later?

-
+
Luke

Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css index ffe4833..a049a1e 100644 --- a/part-1/5-css-selectors/message-backgrounds.css +++ b/part-1/5-css-selectors/message-backgrounds.css @@ -1 +1,10 @@ /* Add your CSS code below */ +#first-message{ + background-color: red; +} +#second-message{ + background-color: cadetblue; +} +.message--latest{ + background-color: yellow; +} diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css index ffe4833..473c8f0 100644 --- a/part-1/6-css-properties/styles.css +++ b/part-1/6-css-properties/styles.css @@ -1 +1,19 @@ /* Add your CSS code below */ +.link { + + color: red; + text-decoration: none; + font-weight: bold; +} +.message__time{ + font-size: 0.9em; +} +.message--unread{ + border-left: 1px blue solid; +} +.message:first-child{ + opacity: 0.4; +} +.message > *{ + line-height: 50px; +} \ No newline at end of file diff --git a/part-1/7-css-box/styles.css b/part-1/7-css-box/styles.css index 013b94f..224e94a 100644 --- a/part-1/7-css-box/styles.css +++ b/part-1/7-css-box/styles.css @@ -3,4 +3,18 @@ border: 1px solid #4491db; border-radius: 4px; background: #fff; + + width: 50px; + height: 40px; + margin: 60px; + padding: 10px; + border: 1px; } +.country +{ + background-color: lightgrey; + width: 300px; + border: 15px solid blueviolet; + padding: 20px; + margin: 30px; +} \ No newline at end of file diff --git a/part-1/8-advanced-selectors/readme.md b/part-1/8-advanced-selectors/readme.md index 9ec9bec..6402744 100644 --- a/part-1/8-advanced-selectors/readme.md +++ b/part-1/8-advanced-selectors/readme.md @@ -11,6 +11,6 @@ Follow the steps below to complete this exercise. _Do not modify the index.html When you complete this exercise it should look like the image below. -![Screenshot of the solution](/images/8/solution.png). +![Screenshot of 4px 4px 0 #dba944 solution](/images/8/solution.png). _Hint: All of the selectors you need are described [in this guide](https://learn.shayhowe.com/advanced-html-css/complex-selectors/)._ diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css index d35c3c3..487fd26 100644 --- a/part-1/8-advanced-selectors/styles.css +++ b/part-1/8-advanced-selectors/styles.css @@ -1 +1,12 @@ /* Try different box model properties below */ +.site-header p { + color: white; + margin-bottom: -4px; +} +.site-footer p{ + font-size: 12px; + text-align: center; +} +.message:last-child{ + box-shadow: 4px 4px 0 #dba944; +} \ No newline at end of file diff --git a/part-2/10-media-queries/columns.css b/part-2/10-media-queries/columns.css index 43e80d2..4589530 100644 --- a/part-2/10-media-queries/columns.css +++ b/part-2/10-media-queries/columns.css @@ -1 +1,14 @@ /* 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; } +} \ No newline at end of file diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css index 43e80d2..0ecd0e0 100644 --- a/part-2/11-flexbox/flexbox.css +++ b/part-2/11-flexbox/flexbox.css @@ -1 +1,11 @@ /* Add your own CSS code below */ +.countries{ + display: flex; + flex-direction: row-reverse; +} +.countries--second{ + flex-direction: column +} +.countries--third{ + flex-direction: column-reverse; +} diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css index 3c4c7ff..b5df86f 100644 --- a/part-2/12-justify-content/flexbox.css +++ b/part-2/12-justify-content/flexbox.css @@ -4,6 +4,24 @@ .countries--second .country { padding: 0.5em; + } /* Add your own CSS code below */ +.countries--second{ + justify-content: space-around; + +} +.countries--third{ + flex-direction: column; + justify-content: end; + +} +.countries--fourth{ + flex-direction: column-reverse; + justify-content: space-around; +} +.countries--first +{ + justify-content: end; +} \ No newline at end of file diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css index 3675a0d..156d9c2 100644 --- a/part-2/13-align-items/flexbox.css +++ b/part-2/13-align-items/flexbox.css @@ -2,3 +2,21 @@ 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; +} +.countries--fourth{ + flex-direction: column-reverse; + align-items:center + +} \ No newline at end of file diff --git a/part-2/14-order/flexbox.css b/part-2/14-order/flexbox.css index ed621b7..af4ca90 100644 --- a/part-2/14-order/flexbox.css +++ b/part-2/14-order/flexbox.css @@ -3,3 +3,30 @@ } /* Add your own CSS code below */ +.countries--first .country--brazil{ + order: 6; +} +.countries--second .country--laos{ + order: -2; +} +.countries--second .country--ethiopia{ + order: -3; +} +.countries--second .country--croatia{ + order: -4; +} +.countries--third .country--brazil{ + order: 5; +} +.countries--third .country--laos{ + order: 2; +} +.countries--third .country--ethiopia{ + order: 3; +} +.countries--third .country--croatia{ + order: 4 +} +.countries--third .country--uganda{ + order: 1; +} \ No newline at end of file diff --git a/part-2/15-align-self/flexbox.css b/part-2/15-align-self/flexbox.css index ed621b7..c74ab7c 100644 --- a/part-2/15-align-self/flexbox.css +++ b/part-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{ + align-items: flex-start; + flex-direction: column; +} +.countries--fourth .country--uganda { + align-self: center; +} \ No newline at end of file diff --git a/part-2/16-more-flexbox/flexbox.css b/part-2/16-more-flexbox/flexbox.css index ed621b7..4cd669d 100644 --- a/part-2/16-more-flexbox/flexbox.css +++ b/part-2/16-more-flexbox/flexbox.css @@ -3,3 +3,41 @@ } /* 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: center; +} +.countries--third .country--brazil{ + align-self: flex-end; +} +.countries--third{ + align-items: flex-start; +} +.countries--fourth{ + align-items: flex-end; + justify-content: center; + flex-direction: column; +} +.countries--fourth .country--laos{ + align-self: center; +} +.countries--fourth .country--ethiopia{ + align-self: center; +} +.countries--fifth{ + flex-direction: column-reverse; + align-items: flex-end; + justify-content: space-around; +} +.countries--fifth .country--laos{ + order: 5; +} +.countries--fifth .country--uganda{ + order: 4; + align-self: center; +} diff --git a/part-2/17-nav-menu/styles.css b/part-2/17-nav-menu/styles.css index f04f4c7..7ecc1f9 100644 --- a/part-2/17-nav-menu/styles.css +++ b/part-2/17-nav-menu/styles.css @@ -1 +1,29 @@ /* Write your media queries and flexbox CSS below */ +@media only screen and (min-width:480px) { + .site-header__nav{ + display:flex; + flex-direction: column; + + } +} +@media only screen and (min-width:700px) { + .site-header__nav{ + display:flex; + flex-direction: row; + + } + .site-wrapper { + display: flex; + flex-direction: row; + } + +} +@media only screen and (min-width:992px) { + .site-header__nav{ + display:flex; + } + .site-wrapper { + display: flex; + flex-direction: row; + } +} \ No newline at end of file diff --git a/part-2/18-git-merge/styles.css b/part-2/18-git-merge/styles.css index 0051cdb..b0988b2 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: orange; font-weight: 700; text-decoration: none; } diff --git a/part-3/19-search/index.html b/part-3/19-search/index.html index d94ec98..f4607f3 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.

+
+ +
diff --git a/part-3/20-labels/index.html b/part-3/20-labels/index.html index ccdc817..8fea078 100644 --- a/part-3/20-labels/index.html +++ b/part-3/20-labels/index.html @@ -13,7 +13,8 @@
- + +
diff --git a/part-3/21-buttons/index.html b/part-3/21-buttons/index.html index ff87846..ca575ee 100644 --- a/part-3/21-buttons/index.html +++ b/part-3/21-buttons/index.html @@ -15,6 +15,7 @@ +