Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Completed 18-git-merge part2 #78

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
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
4 changes: 2 additions & 2 deletions week-1/1-parent-child/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
<div class="message">
<div class="message__author">Anthony</div>
<p class="message__content">
Who is available to meet this week to work on our group project?
Who is not available to meet this week to work on our group project?
</p>
<span class="message__time">6:48pm</span>
</div>
<div class="message">
<div class="message__author">Habiba</div>
<p class="message__content">
I can meet on Tuesday and Wednesday after 4.
I can meet on Tuesday and Wednesday after 7.15pm.
</p>
</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
<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
26 changes: 13 additions & 13 deletions week-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 class="message__time" datetime="2018-03-25 19:25">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 class="message__time" datetime="2018-03-25 19:35">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:38">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 week-1/4-links-scripts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<title>4. Adding Links and Scripts - HTML, CSS and Git Exercises</title>
<link href="css/missing-styles.css" rel="stylesheet" type="text/css" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
</head>

Expand Down Expand Up @@ -33,5 +34,6 @@
</div>
</div>
</div>
<script src="js/convertUrls.js"></script>
</body>
</html>
12 changes: 12 additions & 0 deletions week-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/* 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 week-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;
font-weight: bold;
text-decoration: none;
}

.message__time {
font-size: 14px;
}

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

.message--old {
opacity: 0.5;
}

.message__content {
line-height: 45px;
}
7 changes: 7 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,10 @@
border-radius: 4px;
background: #fff;
}

.country {
border: 1px solid grey;
border-radius: 5px;
background: #fff;
padding: 20px;
}
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: #fff;
margin-bottom: 0px;
}

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

.message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
12 changes: 12 additions & 0 deletions week-2/10-media-queries/columns.css
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/* Add your own CSS code below */

@media screen and (min-width: 768px) {
.countries {
columns: 2;
}
}

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

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

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

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

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

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

.countries--fourth {
flex-direction: column-reverse;
justify-content: space-around;
}
19 changes: 19 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,22 @@
display: flex;
}
/* Add your own CSS code below */

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

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

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

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

/* Add your own CSS code below */

.countries--first :nth-child(1) {
order: 1;
}

.countries--second :nth-child(1) {
order: 1;
}
.countries--second :nth-child(5) {
order: 2;
}

.countries--third :nth-child(1) {
order: 4;
}
.countries--third :nth-child(2) {
order: 3;
}
.countries--third :nth-child(3) {
order: 2;
}
.countries--third :nth-child(4) {
order: 1;
}
.countries--third :nth-child(5) {
order: 0;
}

/* OR .countries--third {flex direction: row-reverse; } */
29 changes: 29 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,32 @@
}

/* Add your own CSS code below */

.countries--first :nth-child(3) {
align-self: flex-end;
}

.countries--second {
align-items: center;
}
.countries--second :nth-child(3) {
align-self: flex-end;
}

.countries--third {
align-items: flex-end;
}
.countries--third :nth-child(1) {
align-self: flex-start;
}
.countries--third :nth-child(5) {
align-self: flex-start;
}

.countries--fourth {
flex-direction: column;
align-items: baseline;
}
.countries--fourth :last-child {
align-self: center;
}
53 changes: 53 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,56 @@
}

/* Add your own CSS code below */

.countries--first {
align-items: flex-end;
justify-content: flex-end;
}

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

.countries--third {
align-items: flex-start;
justify-content: center;
}
.countries--third :first-child {
align-self: flex-end;
}

.countries--fourth {
flex-direction: column;
align-items: flex-end;
justify-content: center;
}
.countries--fourth :nth-child(3) {
align-self: center;
}
.countries--fourth :nth-child(4) {
align-self: center;
}

.countries--fifth {
flex-direction: column;
justify-content: space-around;
align-items: flex-end;
}
.countries--fifth :nth-child(1) {
order: 4;
}
.countries--fifth :nth-child(2) {
order: 3;
}
.countries--fifth :nth-child(3) {
order: 2;
}
.countries--fifth :nth-child(4) {
order: 0;
}
.countries--fifth :nth-child(5) {
order: 1;
align-self: center;
}
22 changes: 22 additions & 0 deletions week-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
/* Write your media queries and flexbox CSS below */

@media screen and (min-width: 480px) {
.site-header__nav {
display: flex;
flex-direction: row;
}
}

@media screen and (min-width: 700px) {
.side-header {
display: flex;
flex-direction: row;
justify-content: flex-start;
}
}

@media screen and (min-width: 992px) {
.site-header {
display: flex;
justify-content: space-between;
}
}
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: orangered;
font-weight: 700;
text-decoration: none;
}