Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0caf47e
Completed 1-parent-child exercise
taporian May 12, 2021
278ce06
Completed 2-html-attributes exercise
taporian May 12, 2021
8711e78
Completed 3-html-attributes exercise
taporian May 12, 2021
2d051ab
Completed 4-html-attributes exercise
taporian May 13, 2021
3e1157e
Completed 5-html-attributes exercise
taporian May 14, 2021
4b631a5
Completed 6-html-attributes exercise
taporian May 14, 2021
2bbdc4e
Completed 7-html-attributes exercise
taporian May 14, 2021
83047c3
Completed 8-html-attributes exercise
taporian May 14, 2021
de3baff
Completed 9-git-branch
taporian May 14, 2021
9db7014
Completed 3-semantic-html
taporian May 14, 2021
814d475
Completed 4-links-scripts
taporian May 14, 2021
5d91f68
Completed 5-css-selectors
taporian May 14, 2021
85ba702
Completed 6-css-properties
taporian May 14, 2021
3547bb7
Completed 7-css-box
taporian May 14, 2021
aa3f97e
8-advanced-selectors
taporian May 14, 2021
ebe1d85
9-git-branch(note I pushed all my other exercises again to fix the na…
taporian May 14, 2021
cf9b8b6
Completed 10-media-queries
taporian May 14, 2021
8aba287
Completed 11-flexbox
taporian May 14, 2021
06cf9db
Completed 12-justify-content
taporian May 14, 2021
8e1b5ff
Completed 13-align-items
taporian May 14, 2021
3305a73
Completed 14-order
taporian May 14, 2021
23eb992
Completed 15-align-self
taporian May 14, 2021
e370d79
Completed 16-more-flexbox
taporian May 14, 2021
c04ff5c
Completed 16-more-flexbox
taporian May 14, 2021
9d5c3b1
Added orangered links and branch orange_links
taporian May 14, 2021
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
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>
<span class="message__time">7:15pm</span>
</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.
</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" alt="Funny Gif" />
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
26 changes: 13 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,30 @@

<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">
<time datetime="2018-03-25T19:25:00" class="message__time">Mar 25, 2018 7:25pm</time>
</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">
<time datetime="2018-03-25T19:35:00" class="message__time">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 datetime="2018-03-25T19:38:00" class="message__time">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
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" type="text/css" href="css/missing-styles.css" />
<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" />
Expand Down Expand Up @@ -33,5 +34,6 @@
</div>
</div>
</div>
<script defer src="js/convertUrls.js"></script>
</body>
</html>
9 changes: 9 additions & 0 deletions part-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
/* Add your CSS code below */
#first-message {
background-color: red;
}
article {
background-color: cadetblue;
}
.message--latest {
background-color: yellow;
}
19 changes: 19 additions & 0 deletions part-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
/* Add your CSS code below */
a {
font-weight: 900;
color: red;
text-decoration: underline;
}
.message__time {
font-size: 0.9rem;
}
div:nth-child(3) {
border-width: thick;
border-left: solid;
border-color: blue;
}
div:nth-child(1) > p {
color: rgba(173, 173, 173, 0.582);
}
.message {
margin: 5%;
}
4 changes: 3 additions & 1 deletion part-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* Try different box model properties below */
.pages__page {
border: 1px solid #4491db;
border: 1px solid red;
border-radius: 4px;
background: #fff;
margin: 1%;
padding: 1%;
}
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;
}
.site-header__title {
margin-bottom: -3%;
}
.site-footer > p {
font-size: 12px;
text-align: center;
}
.message--unread:last-child > p:nth-child(2) {
box-shadow: 4px 4px 0 #dba944;
}
10 changes: 10 additions & 0 deletions part-2/10-media-queries/columns.css
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
/* Add your own CSS code below */
@media screen and (min-width: 768px) {
.countries {
columns: 2;
}
}
@media screen and (min-width: 1200px) {
.countries {
columns: 3;
}
}
13 changes: 13 additions & 0 deletions part-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
/* Add your own CSS code below */
.countries {
display: flex;
}

.countries--first {
flex-direction: row;
}
.countries--second {
flex-direction: column;
}
.countries--third {
flex-direction: column-reverse;
}
16 changes: 16 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,19 @@
}

/* Add your own CSS code below */
.countries--first {
justify-content: flex-end;
}
.countries--second {
justify-content: flex-start;
justify-content: space-evenly;
}
.countries--third {
flex-direction: column;
justify-content: flex-end;
}
.countries--fourth {
flex-direction: column-reverse;
justify-content: center;
justify-content: space-evenly;
}
18 changes: 18 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,21 @@
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 {
justify-content: flex-start;
align-items: flex-end;
flex-direction: column;
}
.countries--fourth {
justify-content: flex-start;
align-items: center;
flex-direction: column-reverse;
}
22 changes: 22 additions & 0 deletions part-2/14-order/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,25 @@
}

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

.countries--third .country--brazil {
order: 5;
}
.countries--third .country--croatia {
order: 4;
}
.countries--third .country--ethiopia {
order: 3;
}
.countries--third .country--laos {
order: 2;
}
25 changes: 25 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,28 @@
}

/* 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 {
align-items: flex-start;
flex-direction: column;
}
.countries--fourth .country--uganda {
align-self: center;
}
50 changes: 50 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,53 @@
}

/* Add your own CSS code below */
.countries--first {
align-items: flex-end;
justify-content: flex-end;
}
.countries--second {
align-items: flex-end;
justify-content: flex-end;
flex-direction: row-reverse;
}
.countries--third {
align-items: flex-start;
}
.countries--third .country--brazil {
align-self: flex-end;
}
.countries--fourth {
align-items: flex-end;
flex-direction: column;
}
.countries--fourth .country--ethiopia {
align-self: center;
}
.countries--fourth .country--laos {
align-self: center;
}
.countries--fifth {
align-items: flex-end;
justify-content: flex-end;
flex-direction: column-reverse;
justify-content: space-between;
}
.country:nth-of-type(1) {
order: 1;
}
.country:nth-of-type(2) {
order: 2;
}
.country:nth-of-type(3) {
order: 3;
}
.country:nth-of-type(4) {
order: 5;
}
.country:nth-of-type(5) {
order: 4;
}

.countries .country--uganda {
align-self: center;
}
Loading