diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..cb48b6cd4 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "skipFiles": ["/**"], + "program": "${file}" + } + ] +} 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..a449d033f 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.

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..9b4d102a9 100644 --- a/week-1/3-semantic-html/index.html +++ b/week-1/3-semantic-html/index.html @@ -12,30 +12,30 @@
-
+
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

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..d197deffe 100644 --- a/week-1/4-links-scripts/index.html +++ b/week-1/4-links-scripts/index.html @@ -1,37 +1,42 @@ - - - 4. Adding Links and Scripts - HTML, CSS and Git Exercises - - - -
-
-
Messages
+ + + 4. Adding Links and Scripts - HTML, CSS and Git Exercises + + + + + + +
+
+
Messages
+
+
+
+
Won
+

Where should we meet later?

+
-
-
-
Won
-

Where should we meet later?

- -
-
-
Luke
-

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

- -
-
-
Won
-

- No, I prefer the one on Sauchiehall Street. https://goo.gl/maps/wKDoARcHDp42 -

- -
+
+
Luke
+

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

+ +
+
+
Won
+

+ No, I prefer the one on Sauchiehall Street. https://goo.gl/maps/wKDoARcHDp42 +

+
- - +
+ + + + \ No newline at end of file diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css index ffe483325..a8f3a711c 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-color: red; +} +article { + background-color: cadetblue; +} +.message--latest { + background-color: yellow; +} diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css index ffe483325..9c8ce94a7 100644 --- a/week-1/6-css-properties/styles.css +++ b/week-1/6-css-properties/styles.css @@ -1 +1,19 @@ /* Add your CSS code below */ +a { + color: red; + font-weight: bold; + text-decoration: none; +} +.message_time { + font-size: 0.9em; +} +.message--unread .message__content { + border-color: blue; + border-left-style: solid; +} +.message--old .message__content { + opacity: 0.3; +} +.message { + line-height: 3; +} diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css index 013b94f1e..9523c16db 100644 --- a/week-1/7-css-box/styles.css +++ b/week-1/7-css-box/styles.css @@ -4,3 +4,11 @@ border-radius: 4px; background: #fff; } + +.country { + margin-bottom: 2px; + padding: 10px; + height: auto; + width: auto; + /*border: 1px solid red;*/ +} diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css index d35c3c371..da457f162 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: 0; +} +.site-footer p { + font-size: 12px; + text-align: center; +} +.message:last-child { + box-shadow: 4px 4px 0 #dba944; +} diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css index 43e80d23c..789104ad9 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: 10px) { + .countries { + columns: 2; + } +} + +@media 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..5a4e84707 100644 --- a/week-2/11-flexbox/flexbox.css +++ b/week-2/11-flexbox/flexbox.css @@ -1 +1,13 @@ /* Add your own CSS code below */ +.countries { + display: flex; +} +.countries--first { + flex-direction: row-reverse; +} +.countries--second { + flex-direction: column; +} +.countries--third { + flex-direction: column-reverse; +} diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css index 3c4c7ff18..e8d975b1c 100644 --- a/week-2/12-justify-content/flexbox.css +++ b/week-2/12-justify-content/flexbox.css @@ -5,5 +5,20 @@ .countries--second .country { padding: 0.5em; } - /* Add your own CSS code below */ +.countries--first { + flex-direction: row; + justify-content: flex-end; +} +.countries--second { + flex-direction: row; + justify-content: space-around; +} +.countries--third { + flex-direction: column; + justify-content: flex-end; +} +.countries--fourth { + 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..8a67dc035 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-reverse; + 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..3f744da2e 100644 --- a/week-2/14-order/flexbox.css +++ b/week-2/14-order/flexbox.css @@ -3,3 +3,52 @@ } /* Add your own CSS code below */ + +/* countries--first*/ +.countries--first .country--brazil { + order: 5; +} +.countries--first .country--croatia { + order: 1; +} +.countries--first .country--laos { + order: 3; +} +.countries--first .country--uganda { + order: 5; +} +.countries--first .country--ethiopia { + order: 2; +} +/* countries--second*/ +.countries--second .country--brazil { + order: 4; +} +.countries--second .country--croatia { + order: 1; +} +.countries--second .country--laos { + order: 3; +} +.countries--second .country--uganda { + order: 5; +} +.countries--second .country--ethiopia { + order: 2; +} +/* countries--thirdd*/ +.countries--third .country--brazil { + order: 5; +} +.countries--third .country--croatia { + order: 4; +} +.countries--third .country--laos { + order: 2; +} +.countries--third .country--uganda { + order: 1; +} +.countries--third .country--ethiopia { + order: 3; +} diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css index ed621b793..78dbe5483 100644 --- a/week-2/15-align-self/flexbox.css +++ b/week-2/15-align-self/flexbox.css @@ -3,3 +3,34 @@ } /* Add your own CSS code below */ +/* first*/ +.countries--first :nth-child(3) { + align-self: flex-end; +} + +/*second*/ +.countries--second { + align-items: center; +} +.countries--second :nth-child(3) { + align-self: flex-end; +} + +/*third*/ +.countries--third { + align-items: flex-end; +} +.countries--third :first-child { + align-self: flex-start; +} +.countries--third :last-child { + align-self: flex-start; +} +/*fourth*/ +.countries--fourth { + flex-direction: column; + align-items: flex-start; +} +.countries--fourth :last-child { + align-self: center; +} diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css index ed621b793..a05186bba 100644 --- a/week-2/16-more-flexbox/flexbox.css +++ b/week-2/16-more-flexbox/flexbox.css @@ -3,3 +3,45 @@ } /* Add your own CSS code below */ +.countries--first { + justify-content: flex-end; + align-items: flex-end; +} + +.countries--second { + flex-direction: row-reverse; + justify-content: center; + align-items: flex-end; +} + +.countries--third { + align-items: flex-start; +} +.countries--third :first-child { + align-self: flex-end; +} + +.countries--fourth { + flex-direction: column; + justify-content: center; + align-items: flex-end; +} +.countries--fourth :nth-child(3) { + align-self: center; +} +.countries--fourth :nth-child(4) { + align-self: center; +} + +.countries--fifth { + flex-direction: column-reverse; + justify-content: space-around; + align-items: flex-end; +} +.countries--fifth :nth-child(4) { + order: 5; +} +.countries--fifth :nth-child(5) { + align-self: center; + order: 4; +} diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css index f04f4c7ba..325c178a7 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 screen and (min-width: 480px) { + .site-header__nav { + display: flex; + flex-direction: row; + } +} + +@media screen and (min-width: 700px) { + .site-header { + display: flex; + flex-direction: row; + } +} + +@media screen and (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..af46a4f77 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; }