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
6 changes: 0 additions & 6 deletions package-lock.json

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

61 changes: 30 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,41 @@
"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"
},
"devDependencies": {
"live-server": "^1.2.1",
"husky": "^0.14.3",
"prettier": "^1.14.2",
"live-server": "^1.2.1",
"pretty-quick": "^1.6.0"
}
}
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
Let's meet at the <a href="https://goo.gl/maps/aza4h9nUBhn" target="_blank"> 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="SeeYouSoon Gif" width="50%" height="50%" >
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
11 changes: 8 additions & 3 deletions part-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html lang="en">
<head>
<head>
<meta charset="utf-8" />
<title>3. Semantic HTML - HTML, CSS and Git Exercises</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand All @@ -11,10 +11,13 @@
</head>

<body>

<div class="site-wrapper">
<div class="site-header">

<header class="site-header">
<div class="site-header__title">Messages</div>
</div>
</header>

<div class="messages">
<div class="message">
<div class="message__author">Won</div>
Expand All @@ -37,7 +40,9 @@
</div>
</div>
<div id="result" class="result"></div>

</div>
<script defer src="/js/3-result.js"></script>

</body>
</html>
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" 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 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;
}
22 changes: 22 additions & 0 deletions part-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
/* Add your CSS code below */
a {
color: red;
text-decoration: none;
font-weight: bold;
}
.message__time {
font-size: 0.9rem;
}
.message__time.message__time--old {
font-size: 0.9rem;
}

.message:first-child {
opacity: 40%;
}
.message.message--unread {
border-left: 2px solid blue;
}

.message__content {
line-height: 2.5rem;
}
7 changes: 7 additions & 0 deletions part-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,11 @@
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;

}


.country {
padding: 20px;

}
1 change: 1 addition & 0 deletions part-1/8-advanced-selectors/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ When you complete this exercise it should look like the image below.
![Screenshot of the solution](/images/8/solution.png).

_Hint: All of the selectors you need are described [in this guide](https://learn.shayhowe.com/advanced-html-css/complex-selectors/)._

19 changes: 18 additions & 1 deletion part-1/8-advanced-selectors/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
/* Try different box model properties below */


.site-header p {
color: white;
}

.site-header{
margin-bottom: -15px;
}

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

.message.message--unread: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;
}
}
16 changes: 16 additions & 0 deletions part-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
/* Add your own CSS code below */
.countries {
display: flex;
}
.countries.countries--first{
flex-direction: row-reverse;
}

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


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

15 changes: 15 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,18 @@
}

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

}
.countries.countries--second{
justify-content: space-around;
}
.countries.countries--tall.countries--third{
flex-direction: column;
justify-content:flex-end;
}
.countries.countries--tall.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.countries--tall.countries--first{
flex-direction:row ;
align-items:center ;
}

.countries.countries--tall.countries--second{
flex-direction: row-reverse;
align-items: flex-end;
}
.countries.countries--tall.countries--third{
flex-direction: column;
align-items:flex-end;
}
.countries.countries--tall.countries--fourth{
flex-direction: column-reverse;
align-items: center;
}
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.countries--first .country:nth-of-type(1){
order: 4;
}
.countries.countries--second .country:nth-of-type(1){
order: 3;
}
.countries.countries--second .country:nth-of-type(5){
order: 4;
}
.countries.countries--third .country:nth-of-type(1){
order: 5;
}
.countries.countries--third .country:nth-of-type(4){
order: 1;
}

.countries.countries--third .country:nth-of-type(3){
order: 2;
}
.countries.countries--third .country:nth-of-type(2){
order: 3;
}
32 changes: 32 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,35 @@
}

/* Add your own CSS code below */

.countries.countries--tall.countries--first .country.country--ethiopia{
align-self: flex-end;
}
.countries.countries--tall.countries--second{
align-items: center;
}
.countries.countries--tall.countries--second .country.country--ethiopia{
align-self: flex-end;
}

.countries.countries--tall.countries--third {
align-items:flex-end;
}
.countries.countries--tall.countries--third .country.country--brazil{
align-self: flex-start;
}
.countries.countries--tall.countries--third .country.country--uganda{
align-self: flex-start;
}

.countries.countries--tall.countries--fourth {
flex-direction: column;
align-items: flex-start;
}
.countries.countries--tall.countries--fourth .country.country--uganda {
align-self: center;
}

.countries.countries--tall.countries--fourth .country.country--ethiopia {
align-self:flex-start;
}
Loading