Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,35 @@
"author": "Codi",
"license": "ISC",
"scripts": {
"1": "live-server --open=week-1/1-parent-child",
"2": "live-server --open=week-1/2-html-attributes",
"3": "live-server --open=week-1/3-semantic-html",
"4": "live-server --open=week-1/4-links-scripts",
"5": "live-server --open=week-1/5-css-selectors",
"6": "live-server --open=week-1/6-css-properties",
"7": "live-server --open=week-1/7-css-box",
"8": "live-server --open=week-1/8-advanced-selectors",
"9": "live-server --open=week-1/9-git-branch",
"10": "live-server --open=week-2/10-media-queries",
"11": "live-server --open=week-2/11-flexbox",
"12": "live-server --open=week-2/12-justify-content",
"13": "live-server --open=week-2/13-align-items",
"14": "live-server --open=week-2/14-order",
"15": "live-server --open=week-2/15-align-self",
"16": "live-server --open=week-2/16-more-flexbox",
"17": "live-server --open=week-2/17-nav-menu",
"18": "live-server --open=week-2/18-git-merge",
"19": "live-server --open=week-3/19-search",
"20": "live-server --open=week-3/20-labels",
"21": "live-server --open=week-3/21-buttons",
"22": "live-server --open=week-3/22-checkout",
"23": "live-server --open=week-3/23-comments",
"24": "live-server --open=week-3/24-dietary",
"25": "live-server --open=week-3/25-shirt-size",
"26": "live-server --open=week-3/26-checkout-groups",
"27": "live-server --open=week-3/27-attributes",
"28": "live-server --open=week-3/28-git-conflict",
"29": "live-server --open=week-3/29-combined-skills",
"1": "live-server --open=part-1/1-parent-child",
"2": "live-server --open=part-1/2-html-attributes",
"3": "live-server --open=part-1/3-semantic-html",
"4": "live-server --open=part-1/4-links-scripts",
"5": "live-server --open=part-1/5-css-selectors",
"6": "live-server --open=part-1/6-css-properties",
"7": "live-server --open=part-1/7-css-box",
"8": "live-server --open=part-1/8-advanced-selectors",
"9": "live-server --open=part-1/9-git-branch",
"10": "live-server --open=part-2/10-media-queries",
"11": "live-server --open=part-2/11-flexbox",
"12": "live-server --open=part-2/12-justify-content",
"13": "live-server --open=part-2/13-align-items",
"14": "live-server --open=part-2/14-order",
"15": "live-server --open=part-2/15-align-self",
"16": "live-server --open=part-2/16-more-flexbox",
"17": "live-server --open=part-2/17-nav-menu",
"18": "live-server --open=part-2/18-git-merge",
"19": "live-server --open=part-3/19-search",
"20": "live-server --open=part-3/20-labels",
"21": "live-server --open=part-3/21-buttons",
"22": "live-server --open=part-3/22-checkout",
"23": "live-server --open=part-3/23-comments",
"24": "live-server --open=part-3/24-dietary",
"25": "live-server --open=part-3/25-shirt-size",
"26": "live-server --open=part-3/26-checkout-groups",
"27": "live-server --open=part-3/27-attributes",
"28": "live-server --open=part-3/28-git-conflict",
"29": "live-server --open=part-3/29-combined-skills",
"precommit": "pretty-quick --staged --verbose",
"serve": "live-server"
},
Expand Down
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>
<time class="message__time">7:15pm</time>
</div>
</div>
</div>
Expand Down
5 changes: 3 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,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.
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
34 changes: 18 additions & 16 deletions part-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,32 @@

<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">
<div class="message__content">Where should we meet later?</div>
<time class="message__time" datetime="2018-03-25 19:25pm">Mar 25, 2018 7:25pm</time>
</article>

<article class="message">
<div class="message__author">Luke</div>
<p class="message__content">
<article role="main" 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">
</article>
<time class="message__time" datetime="2018-03-25 19:35pm">Mar 25, 2018 7:35pm</time>
</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>
<time class="message__time" datetime="2018-03-25 19:38pm">Mar 25, 2018 7:38pm</time>
</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="/part-1/4-links-scripts/css/missing-styles.css" />
</head>

<body>
Expand Down Expand Up @@ -33,5 +34,6 @@
</div>
</div>
</div>
<script src="/part-1/4-links-scripts/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;
}
17 changes: 17 additions & 0 deletions part-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
/* Add your CSS code below */
.link {
text-decoration: none;
font-weight: bold;
color: red;
}
.message__time {
font-size: 0.9rem;
}
.message--unread {
border-left: 5px solid blue;
}
.message__time--old {
opacity: 50%;
}
.message {
margin-bottom: 2.8rem;
}
4 changes: 4 additions & 0 deletions part-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
border-radius: 4px;
background: #fff;
}

.countries li {
margin-bottom: 2.5rem;
}
12 changes: 12 additions & 0 deletions part-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 */
.site-header > p {
color: white;
margin-bottom: 0.5rem;
}

.site-footer > p {
font-size: 12px;
text-align: center;
}
.message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
2 changes: 1 addition & 1 deletion part-1/9-git-branch/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: green;
font-weight: 700;
text-decoration: none;
}
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 screen and (max-width: 768px) {
.countries {
columns: 2;
}
}

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

.countries--third {
flex-direction: column-reverse;
}
6 changes: 3 additions & 3 deletions part-2/11-flexbox/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="site-header__title">Exercises</h1>
<div class="panel">
<div class="exercise">
<h2 class="exercise__title">First</h2>
<ul class="countries countries--first">
<ul class="countries container countries--first">
<li class="country">1. Brazil</li>
<li class="country">2. Croatia</li>
<li class="country">3. Ethiopia</li>
Expand All @@ -40,7 +40,7 @@ <h3 class="solution__title">Solution</h3>
<div class="panel">
<div class="exercise">
<h2 class="exercise__title">Second</h2>
<ul class="countries countries--second">
<ul class="countries container countries--second">
<li class="country">1. Brazil</li>
<li class="country">2. Croatia</li>
<li class="country">3. Ethiopia</li>
Expand All @@ -56,7 +56,7 @@ <h3 class="solution__title">Solution</h3>
<div class="panel">
<div class="exercise">
<h2 class="exercise__title">Third</h2>
<ul class="countries countries--third">
<ul class="countries container countries--third">
<li class="country">1. Brazil</li>
<li class="country">2. Croatia</li>
<li class="country">3. Ethiopia</li>
Expand Down
10 changes: 10 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,13 @@
}

/* Add your own CSS code below */

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

.countries--fourth {
flex-direction: column-reverse;
justify-content: space-between;
}
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 {
align-items: center;
flex-direction: row;
}

.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;
}
13 changes: 13 additions & 0 deletions part-2/14-order/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,16 @@
}

/* 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 {
flex-direction: row-reverse;
}
31 changes: 31 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,34 @@
}

/* 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;
}
Loading