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,384 changes: 2,036 additions & 1,348 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion week-1/1-parent-child/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<body>
<div class="site-wrapper">
<div class="site-header">
<div class="site-header__title">Messages</div>
<div class="site-header__title">Mall the mssages</div>
</div>
<div class="messages">
<div class="message">
Expand All @@ -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
5 changes: 3 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,15 @@
<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.
</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
36 changes: 19 additions & 17 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,35 @@
</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>
<article class="site-wrapper">
<header role="banner" class="site-header">
<article class="site-header__title">Messages</article>
</header>

<main role="main" class="messages">
<article class="message">
<article class="message__author">Won</article>
<p class="message__content">Where should we meet later?</p>
<span class="message__time">Mar 25, 2018 7:25pm</span>
</div>
<div class="message">
<div class="message__author">Luke</div>
</article>
<article class="message">
<article class="message__author">Luke</article>
<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">
<div class="message__author">Won</div>
</article>
<article class="message">
<article class="message__author">Won</article>
<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>
<div id="result" class="result"></div>
</div>
</article>
</main>
</article>
<article id="result" class="result"></article>

<script defer src="/js/3-result.js"></script>
</body>
</html>
2 changes: 2 additions & 0 deletions week-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" type="text/css" 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 week-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;
}
18 changes: 18 additions & 0 deletions week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
/* Add your CSS code below */
a {
font-weight: bold;
color: red;
text-decoration: none;
}

.message__time {
font-size: 0.9 rem;
}

.message {
border-left: solid 2px blue;
padding-bottom: 50px;
}

.message:first-child {
opacity: 50%;
}
9 changes: 9 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,12 @@
border-radius: 4px;
background: #fff;
}

.country {
margin: 2px auto;
padding: 10px;
}

* {
border: 1px solid red;
}
12 changes: 12 additions & 0 deletions week-1/8-advanced-selectors/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/* Try different box model properties below */
body > div > div > div + p {
color: rgb(255, 255, 255);
margin-bottom: 0px;
}

body > div > div > p {
font-size: 12px;
text-align: center;
}
.message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
11 changes: 11 additions & 0 deletions week-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 screen and (min-width: 769px) {
.countries {
columns: 2;
}
}

@media screen and (min-width: 1199px) {
.countries {
columns: 3;
}
}
4 changes: 4 additions & 0 deletions week-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
/* Add your own CSS code below */
.countries--first {
display: flex;
flex-direction: row-reverse;
}
21 changes: 21 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,24 @@
}

/* Add your own CSS code below */
.countries--first {
justify-content: flex-end;
}

.countries--second {
justify-content: center;
}

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

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

.countries--fourth {
flex-direction: column-reverse;
justify-content: space-between;
}
20 changes: 20 additions & 0 deletions week-2/13-align-items/flexbox.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
.countries {
display: flex;
}

/* Add your own CSS code below */

.countries--first {
align-items: center;
}

.countries--second {
flex-direction: row-reverse;
align-items: self-end;
}

.countries--third {
flex-direction: column;
align-items: end;
}

.countries--fourth {
flex-direction: column-reverse;
align-items: center;
}
59 changes: 59 additions & 0 deletions week-2/14-order/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,62 @@
}

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

.countries--first .country--croatia {
order: 1;
}

.countries--first .country--ethiopia {
order: 2;
}

.countries--first .country--laos {
order: 3;
}

.countries--first .country--uganda {
order: 4;
}

.countries--second .country--brazil {
order: 4;
}

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

.countries--second .country--ethiopia {
order: 2;
}

.countries--second .country--laos {
order: 3;
}

.countries--second .country--uganda {
order: 5;
}

.countries--third .country--brazil {
order: 5;
}

.countries--third .country--croatia {
order: 4;
}

.countries--third .country--ethiopia {
order: 3;
}

.countries--third .country--laos {
order: 2;
}

.countries--third .country--uganda {
order: 1;
}
36 changes: 36 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,39 @@
}

/* Add your own CSS code below */
.countries {
display: flex;
}

/* Add your own CSS code below */
.countries--first .country--ethiopia {
align-self: flex-end;
}

.countries--second .country--ethiopia {
align-self: flex-end;
}

.countries--second {
align-items: center;
}

.countries--third .country--brazil {
align-self: first baseline;
}

.countries--third .country--uganda {
align-self: first baseline;
}
.countries--third {
align-items: flex-end;
}

.countries--fourth {
flex-direction: column;
align-items: flex-start;
}

.countries--fourth .country--uganda {
align-self: center;
}
58 changes: 58 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,61 @@
}

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

.countries--second {
flex-direction: row-reverse;
align-items: flex-end;
justify-content: center;
}

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

.countries--fourth {
flex-direction: column;
justify-content: center;
}
.countries--fourth .country--brazil,
.countries--fourth .country--croatia,
.countries--fourth .country--uganda {
align-self: flex-end;
}

.countries--fourth .country--ethiopia,
.countries--fourth .country--laos {
align-self: center;
}

.countries--fifth {
flex-direction: column-reverse;
justify-content: space-around;
align-items: flex-end;
}

.countries--fifth .country--laos {
order: 5;
}
.countries--fifth .country--uganda {
order: 4;
align-self: center;
}
.countries--fifth .country--ethiopia {
order: 3;
}
.countries--fifth .country--croatia {
order: 2;
}
.countries--fifth .country--brazil {
order: 1;
}
Loading