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

Large diffs are not rendered by default.

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 iCafe in Merchant City. <a href=https://goo.gl/maps/aza4h9nUBhn> 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
Ok! <img src='https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif'>
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
14 changes: 7 additions & 7 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@
</head>

<body>
<div class="site-wrapper">
<header role class="banner">
<div class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<main role class="main">
<div 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>
<time datetime='Mar 25, 2018 7:25pm' class="message__time">Mar 25, 2018 7:25pm</time>
</div>
<div class="message">
<div class="article">
<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>
</p>
<time datetime='Mar 25, 2018 7:35pm'class="message__time">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 datetime='Mar 25, 2018 7:38pm'class="message__time">Mar 25, 2018 7:38pm</time>
</div>
</div>
<div id="result" class="result"></div>
Expand Down
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" href="missing-styles.css">
</head>

<body>
Expand Down Expand Up @@ -33,5 +34,6 @@
</div>
</div>
</div>
<script src="convertUrls.js"></script>
</body>
</html>
10 changes: 10 additions & 0 deletions week-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;
}

.message--latest {
background-color: yellow;
}
article {
background-color: cadetblue;
}
22 changes: 21 additions & 1 deletion week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
/* Add your CSS code below */
.link {
font-weight: bold;
color: red;
text-decoration: none;
}

.message__time {
font-size: 0.9rem;
}

.message--unread {
border-left: 3px solid blue;
}

.message:first-of-type {
opacity: 0.3;
}

.message {
line-height: 4em;
}
6 changes: 3 additions & 3 deletions week-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Try different box model properties below */
.pages__page {
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;
border: 3px solid #fa94cc;
border-radius: 1px;
background: rgb(43, 187, 43);
}
13 changes: 13 additions & 0 deletions week-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--unread: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 only screen and (min-width: 780px) {
.countries {
columns: 2;
}
}

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

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

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

.countries--third {
display: flex;
flex-direction: column-reverse;
}
20 changes: 20 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,23 @@
}

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

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

.countries--fourth {
display: flex;
flex-direction: column-reverse;
justify-content: space-evenly;
}
2 changes: 1 addition & 1 deletion week-2/12-justify-content/readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Justify Content
npm run 12# Justify Content

With flexbox, the `justify-content` property can be used to control how extra space is used. In this exercise, you'll apply a different `justify-content` property to each list. Follow the steps below to complete this exercise.

Expand Down
28 changes: 28 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,31 @@
display: flex;
}
/* Add your own CSS code below */

.countries--first {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}

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

.countries--third {
display: flex;
flex-direction: column;
justify-content: baseline;
align-items: flex-end;
}

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

/* Add your own CSS code below */

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

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

.countries--third {
display: flex;
flex-direction: row-reverse;
justify-content: flex-end;
}
35 changes: 35 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,38 @@
}

/* 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--croatia {
align-self: flex-end;
}
.countries--third .country--ethiopia {
align-self: flex-end;
}
.countries--third .country--laos {
align-self: 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;
}
48 changes: 48 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,51 @@
}

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

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

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

.countries--third .country--brazil {
align-self: flex-end;
}

.countries--fourth {
flex-direction: column;
justify-content: center;
align-items: flex-end;
}

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

.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: 4;
}
.countries--fifth .country--uganda {
order: 3;
align-self: center;
}
29 changes: 29 additions & 0 deletions week-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,30 @@
/* Write your media queries and flexbox CSS below */
@media screen and (max-width: 480px) {
.site-header__nav {
display: flex;
flex-direction: row;
align-items: center;
}
}

@media screen and (max-width: 700px) {
.site-wrapper {
display: flex;
flex-direction: row;
align-items: center;
}
}

@media screen and (max-width: 992px) {
.site-header__checkout {
display: flex;
align-self: flex-end;
}
}

@media screen and (max-width: 992px) {
.site-header__nav {
display: flex;
align-self: 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: #f54e25;
font-weight: 700;
text-decoration: none;
}