Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions week-1/1-parent-child/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<p class="message__content">
I can meet on Tuesday and Wednesday after 4.
</p>
<span class="message__time">7:15pm</span>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions week-1/2-html-attributes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<div class="message">
<div class="message__author">Luke</div>
<p class="message__content">
Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
Let's meet at the <a href=" https://goo.gl/maps/aza4h9nUBhn">iCafe</a> in Merchant City. https://goo.gl/maps/aza4h9nUBhn
</p>
<span class="message__time">7:35pm</span>
</div>
<div class="message">
<div class="message__author">Won</div>
<p class="message__content">
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
Ok! <img src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" />
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion week-1/2-html-attributes/readme.md
Original file line number Diff line number Diff line change
@@ -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?

Expand Down
16 changes: 8 additions & 8 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@

<body>
<div class="site-wrapper">
<div class="site-header">
<header class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
</header>
<div class="messages" role="main">
<article class="message">
<div class="message__author">Won</div>
<p class="message__content">Where should we meet later?</p>
<span class="message__time">Mar 25, 2018 7:25pm</span>
</div>
<time class="message__time" datetime="2018-03-25 19:25">Mar 25, 2018 7:25pm</time>
</article>
<div class="message">
<div class="message__author">Luke</div>
<p class="message__content">
Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
</p>
<span class="message__time">Mar 25, 2018 7:35pm</span>
<time class="message__time" datetime="2018-03-25 19:35">Mar 25, 2018 7:35pm</time>
</div>
<div class="message">
<div class="message__author">Won</div>
<p class="message__content">
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
</p>
<span class="message__time">Mar 25, 2018 7:38pm</span>
<time class="message__time" datetime="2018-03-25 19:38">Mar 25, 2018 7:38pm</time>
</div>
</div>
<div id="result" class="result"></div>
Expand Down
4 changes: 4 additions & 0 deletions week-1/4-links-scripts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="stylesheet" href="./css/missing-styles.css" />

<title>4. Adding Links and Scripts - HTML, CSS and Git Exercises</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
</head>
Expand Down Expand Up @@ -34,4 +36,6 @@
</div>
</div>
</body>
<script src="./js/convertUrls.js" type="text/javascript"></script>

</html>
12 changes: 12 additions & 0 deletions week-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/* Add your CSS code below */
#first-message {
background-color: red;
}

article {
background-color: cadetblue;
}

.message--latest {
background-color: yellow;
}

22 changes: 22 additions & 0 deletions week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -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;
}

3 changes: 3 additions & 0 deletions week-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
border-radius: 4px;
background: #fff;
}
.country {
padding-left: 50px;
}
14 changes: 14 additions & 0 deletions week-1/8-advanced-selectors/styles.css
Original file line number Diff line number Diff line change
@@ -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;
}

12 changes: 12 additions & 0 deletions week-2/10-media-queries/columns.css
Original file line number Diff line number Diff line change
@@ -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;
}
}

15 changes: 15 additions & 0 deletions week-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -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;
}

17 changes: 17 additions & 0 deletions week-2/12-justify-content/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
21 changes: 21 additions & 0 deletions week-2/13-align-items/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
20 changes: 20 additions & 0 deletions week-2/14-order/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
29 changes: 29 additions & 0 deletions week-2/15-align-self/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
45 changes: 45 additions & 0 deletions week-2/16-more-flexbox/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
23 changes: 23 additions & 0 deletions week-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -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;
}
}

2 changes: 1 addition & 1 deletion week-2/18-git-merge/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
color: #4491db;
color: orangered;
font-weight: 700;
text-decoration: none;
}