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

Yellow links #76

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 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
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 <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" />
</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 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-25 19:25" 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-25 19:35" 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-25 19:38" 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 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="css/missing-styles.css" />
</head>

<body>
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 week-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;
}
18 changes: 18 additions & 0 deletions week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
/* Add your CSS code below */
.link--map,
.link--gif {
color: red;
font-weight: bold;
text-decoration: none;
}
.message__time {
font-size: 0.9rem;
}
.message--unread {
border-left: 5px solid blue;
}
.message--old {
opacity: 40%;
}
.message {
line-height: 1.9em;
}
14 changes: 11 additions & 3 deletions week-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
/* Try different box model properties below */
/*
* {
border: 1px solid red;
}
*/
.pages__page {
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;
border: 2px double #3078bd;
border-radius: 3px;
background: rgb(226, 214, 214);
}
.country {
padding: 0.4em;
}
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;
}
.site-wrapper p {
margin-bottom: 0em;
}
.site-footer p {
font-size: 12px;
text-align: center;
}
.message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
1 change: 1 addition & 0 deletions week-1/9-git-branch/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
font-weight: 700;
text-decoration: none;
}
//nothing new
12 changes: 11 additions & 1 deletion week-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;
}
}
19 changes: 19 additions & 0 deletions week-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
/* Add your own CSS code below */
.countries {
display: flex;
}

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

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

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

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

.countries--second {
display: flex;
justify-content: space-around;
}

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

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

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

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

.countries--fourth {
flex-direction: column-reverse;
align-items: center;
justify-content: flex-start;
}
48 changes: 48 additions & 0 deletions week-2/14-order/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 :nth-child(1) {
order: 5;
}
.countries--first :nth-child(2) {
order: 1;
}
.countries--first :nth-child(3) {
order: 2;
}
.countries--first :nth-child(4) {
order: 3;
}
.countries--first :nth-child(5) {
order: 4;
}

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

.countries--third :nth-child(1) {
order: 5;
}
.countries--third :nth-child(2) {
order: 4;
}
.countries--third :nth-child(3) {
order: 3;
}
.countries--third :nth-child(4) {
order: 2;
}
.countries--third :nth-child(5) {
order: 1;
}
30 changes: 30 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,33 @@
}

/* Add your own CSS code below */
.countries--first :nth-child(3) {
align-self: flex-end;
}

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

.countries--second :not(.country--ethiopia) {
align-self: center;
}

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

.countries--third :first-child,
.countries--third :last-child {
align-self: flex-start;
}

.countries--fourth {
flex-direction: column;
align-items: flex-start;
}

.countries--fourth :last-child {
align-self: center;
}
60 changes: 60 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,63 @@
}

/* 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--second :nth-child(1) {
order: 5;
}
.countries--second :nth-child(2) {
order: 4;
}
.countries--second :nth-child(3) {
order: 3;
}
.countries--second :nth-child(4) {
order: 2;
}
.countries--second :nth-child(5) {
order: 1;
}
*/
.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),
.countries--fourth :nth-child(4) {
align-self: center;
}

.countries--fifth {
align-items: flex-end;
justify-content: space-between;
flex-direction: column-reverse;
}

.countries--fifth :nth-child(4) {
order: 5;
}
.countries--fifth :nth-child(5) {
order: 4;
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: yellow;
font-weight: 700;
text-decoration: none;
}