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
3,365 changes: 3,350 additions & 15 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions part-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
9 changes: 7 additions & 2 deletions part-1/2-html-attributes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,19 @@
<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
style="max-width: 400px;"
src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif"
/>
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
32 changes: 19 additions & 13 deletions part-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,36 @@

<body>
<div class="site-wrapper">
<div class="site-header">
<header role="banner" class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
</header>
<main role="main" class="messages">
<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>
<div class="message">
<span class="message__time"
><time datetime="2018-03-25T19:25:00">Mar 25, 2018 7:25pm</time></span
>
</article>
<article 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>
</div>
<div class="message">
<span class="message__time"
><time datetime="2018-03-25T19:35:00">Mar 25, 2018 7:35pm</time></span
>
</article>
<article 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>
</div>
</div>
<span class="message__time"
><time datetime="2018-03-25T19:38:00">Mar 25, 2018 7:38pm</time></span
>
</article>
</main>
<div id="result" class="result"></div>
</div>
<script defer src="/js/3-result.js"></script>
Expand Down
2 changes: 2 additions & 0 deletions part-1/4-links-scripts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8" />
<title>4. Adding Links and Scripts - HTML, CSS and Git Exercises</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="css/missing-styles.css" />
</head>

<body>
Expand Down Expand Up @@ -33,5 +34,6 @@
</div>
</div>
</div>
<script src="js/convertUrls.js"></script>
</body>
</html>
10 changes: 10 additions & 0 deletions part-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
/* Add your CSS code below */
#first-message {
background-color: red;
}
article {
background-color: cadetblue;
}

.message--latest {
background-color: yellow;
}
15 changes: 15 additions & 0 deletions part-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
/* Add your CSS code below */
.site-wrapper a {
color: red;
font-weight: bold;
text-decoration: none;
font-size: 0.9rem;
}
.message--unread {
border-left: 5px solid blue;
}
.message:first-of-type {
opacity: 0.5;
}
.message {
line-height: 30px;
}
6 changes: 6 additions & 0 deletions part-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;
margin: 20px;
}

.country {
border: 2px solid transparent;
margin: 10px;
}
13 changes: 13 additions & 0 deletions part-1/8-advanced-selectors/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
/* 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;
}
12 changes: 12 additions & 0 deletions part-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 only screen and (min-width: 768px) {
.countries {
columns: 2;
}
}

@media only screen and (min-width: 1200px) {
.countries {
columns: 3;
}
}
9 changes: 9 additions & 0 deletions part-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
/* Add your own CSS code below */
.countries--first {
display: flex;
flex-direction: row-reverse;
}

.countries--third {
display: flex;
flex-direction: column-reverse;
}
17 changes: 17 additions & 0 deletions part-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: end;
}

.countries--second {
justify-content: space-around;
}

.countries--third {
justify-content: end;
flex-direction: column;
}

.countries--fourth {
flex-direction: column-reverse;
justify-content: space-around;
}
16 changes: 16 additions & 0 deletions part-2/13-align-items/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,19 @@
display: flex;
}
/* Add your own CSS code below */
.countries--first {
align-items: center;
}
.countries--second {
align-items: flex-end;
flex-direction: row-reverse;
}
.countries--third {
align-items: flex-end;
flex-direction: column;
}
.countries--fourth {
align-items: center;
flex-direction: column-reverse;
justify-content: end;
}
18 changes: 18 additions & 0 deletions part-2/14-order/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,21 @@
}

/* Add your own CSS code below */
.countries--first .country--brazil {
order: 5;
}

.countries--second .country--croatia {
order: -1;
}
.countries--second .country--brazil {
order: 1;
}
.countries--second .country--uganda {
order: 1;
}

.countries--third {
flex-direction: row-reverse;
justify-content: start;
}
26 changes: 26 additions & 0 deletions part-2/15-align-self/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,29 @@
}

/* 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-end;
}
.countries--third .country--brazil {
align-self: flex-start;
}
.countries--third .country--uganda {
align-self: flex-start;
}
.countries--fourth {
flex-direction: column;
align-items: flex-start;
}
.countries--fourth .country--uganda {
align-self: center;
}
42 changes: 42 additions & 0 deletions part-2/16-more-flexbox/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,45 @@
}

/* Add your own CSS code below */
.countries--first {
justify-content: flex-end;
align-items: flex-end;
}
.countries--second {
align-items: flex-end;
justify-content: center;
flex-direction: row-reverse;
}

.countries--third {
align-items: flex-start;
justify-content: flex-end;
}
.countries--third .country--brazil {
align-self: flex-end;
}
.countries--fourth {
align-items: end;
flex-direction: column;
justify-content: center;
}
.countries--fourth .country--ethiopia {
align-self: center;
}
.countries--fourth .country--laos {
align-self: center;
}

.countries--fifth {
align-items: end;
flex-direction: column-reverse;
justify-content: center;
justify-content: space-between;
}
.countries--fifth .country--uganda {
align-self: center;
order: 0;
}
.countries--fifth .country--laos {
order: 1;
}
20 changes: 20 additions & 0 deletions part-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -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) {
header {
display: flex;
flex-direction: row;
}
}
@media only screen and (min-width: 992px) {
header {
display: flex;
flex-direction: row;
justify-content: space-between;
}
}
2 changes: 1 addition & 1 deletion part-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;
}