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 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
4 changes: 2 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,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
<a href="https://goo.gl/maps/aza4h9nUBhn" target="_blank">iCafe</a>
</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
<img style="width: 100%" src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif">
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
28 changes: 14 additions & 14 deletions part-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@

<body>
<div class="site-wrapper">
<div class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
<header class="site-header">
<div class="site-header__title" role="banner">Messages</div>
</header>
<main 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>
<div class="message">
<span class="message__time"><time datetime="2018-03-25T7:25pm">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-25T7:35pm"></time>Mar 25, 2018 7:35pm</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-25T7:38pm">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>
11 changes: 11 additions & 0 deletions part-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
/* Add your CSS code below */
#first-message{
background-color: red;
}

article{
background-color: cadetblue;
}

.message--latest{
background-color: yellow;
}
89 changes: 44 additions & 45 deletions part-1/6-css-properties/index.html
Original file line number Diff line number Diff line change
@@ -1,51 +1,50 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>6. CSS Properties - HTML, CSS and Git Exercises</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/css/normalize.css" />
<link rel="stylesheet" href="/css/part1.css" />
<link rel="stylesheet" href="/css/message.css" />
<link rel="stylesheet" href="styles.css" />
</head>

<body>
<div class="site-wrapper">
<div class="site-header">
<div class="site-header__title">Messages</div>
<head>
<meta charset="utf-8" />
<title>6. CSS Properties - HTML, CSS and Git Exercises</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/css/normalize.css" />
<link rel="stylesheet" href="/css/part1.css" />
<link rel="stylesheet" href="/css/message.css" />
<link rel="stylesheet" href="styles.css" />
</head>

<body>
<div class="site-wrapper">
<div class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
<div class="message__author">Won</div>
<p class="message__content">
Where should we meet tomorrrow?
</p>
<time class="message__time message__time--old">Yesterday, 7:25pm</time>
</div>
<div class="messages">
<div class="message">
<div class="message__author">Won</div>
<p class="message__content">
Where should we meet tomorrrow?
</p>
<time class="message__time message__time--old">Yesterday, 7:25pm</time>
</div>
<div class="message">
<div class="message__author">Luke</div>
<p class="message__content">
Let's meet at the iCafe in Merchant City.
<a href="https://goo.gl/maps/aza4h9nUBhn" class="link link--map">
https://goo.gl/maps/aza4h9nUBhn
</a>
</p>
<time class="message__time">7:35pm</time>
</div>
<div class="message message--unread">
<div class="message__author">Won</div>
<p class="message__content">
Ok!
<a
href="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif"
class="link link--gif"
>https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif</a
>
</p>
<time class="message__time">7:38pm</time>
</div>
<div class="message">
<div class="message__author">Luke</div>
<p class="message__content">
Let's meet at the iCafe in Merchant City.
<a href="https://goo.gl/maps/aza4h9nUBhn" class="link link--map">
https://goo.gl/maps/aza4h9nUBhn
</a>
</p>
<time class="message__time">7:35pm</time>
</div>
<div class="message message--unread">
<div class="message__author">Won</div>
<p class="message__content">
Ok!
<a href="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif"
class="link link--gif">https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif</a>
</p>
<time class="message__time">7:38pm</time>
</div>
</div>
</body>
</html>
</div>
</body>

</html>
24 changes: 24 additions & 0 deletions part-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
/* Add your CSS code below */

a {
font-weight: bold;
color: red;
text-decoration: none;
}

time{
font-size: 0.9rem !important;
}

.message{
line-height: 35px;
}

.message:not(:last-child){
line-height: 35px;
opacity: 0.6;
}


.message:last-child{
border-left: 4px solid rgb(29, 103, 214);
}
2 changes: 1 addition & 1 deletion part-1/7-css-box/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="/css/part1-pagination.css" />
<link rel="stylesheet" href="styles.css" />
</head>

<body>
<div class="site-wrapper">
<div class="site-header">
Expand Down
19 changes: 18 additions & 1 deletion part-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
/* Try different box model properties below */

.pages__page {
border: 1px solid #4491db;
border: 1px solid red;
border-radius: 4px;
background: #fff;
padding: 5px;
margin: 2px;
}

.country {
padding: 15px;
margin: 10px !important;
}

.site-wrapper {
height: 30em;
border: 5px solid #4491db;
}

.pages {
margin-top: 15px;
}
2 changes: 1 addition & 1 deletion part-1/8-advanced-selectors/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="/css/message.css" />
<link rel="stylesheet" href="styles.css" />
</head>

<body>
<div class="site-wrapper">
<div class="site-header">
Expand Down
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;
}

div.site-footer {
font-size: 12px;
text-align: center;
}

.messages > .message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
11 changes: 11 additions & 0 deletions part-2/10-media-queries/columns.css
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
/* Add your own CSS code below */
@media (min-width: 768px) {
.countries {
columns: 2;
}
}

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

.countries--first{
flex-direction: row-reverse;
}

.country{
padding: 10px !important;
}

.countries--second {
flex-direction: column;
}

.countries--third {
flex-direction: column-reverse;
}

20 changes: 20 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,23 @@
}

/* 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;
justify-content: space-around;
}
19 changes: 19 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,22 @@
display: flex;
}
/* Add your own CSS code below */

.countries--first {
flex-direction: row;
align-items: center;
}

.countries--second {
flex-direction: row-reverse;
align-items: end;
}
.countries--third {
flex-direction: column;
align-items: end;
}
.countries--fourth {
flex-direction: column-reverse;
align-items: center;
justify-content: flex-start;
}
Loading