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

Orange links #83

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7e537ed
completed 1-parent child exercise
SammyOdu4 Mar 28, 2020
1c84604
completed 2-parent child exercise
SammyOdu4 Mar 28, 2020
a338e61
add week1/step1
SammyOdu4 Mar 31, 2020
15288a1
week1/step5
SammyOdu4 Mar 31, 2020
4762937
week1/step5
SammyOdu4 Mar 31, 2020
f37d0a4
week1/step5
SammyOdu4 Mar 31, 2020
c67936a
week1/step5
SammyOdu4 Mar 31, 2020
1925569
week1/step5 update
SammyOdu4 Mar 31, 2020
d63ede7
week1/step6 update
SammyOdu4 Mar 31, 2020
f716001
add week1/step6
SammyOdu4 Mar 31, 2020
4539700
add week1/step6 update
SammyOdu4 Mar 31, 2020
c78eaa0
wee1/step7
SammyOdu4 Mar 31, 2020
278988e
week1/step8
SammyOdu4 Mar 31, 2020
93eb562
update wee1/1
SammyOdu4 Apr 6, 2020
a73233f
update week1/4
SammyOdu4 Apr 6, 2020
93fc56b
update week1/6
SammyOdu4 Apr 6, 2020
d002488
update week1/8
SammyOdu4 Apr 6, 2020
0749faf
update week2/10
SammyOdu4 Apr 6, 2020
e39e326
update week2/11
SammyOdu4 Apr 6, 2020
47bded9
update week2/12
SammyOdu4 Apr 6, 2020
26a11ee
update week2/12
SammyOdu4 Apr 6, 2020
6e84231
update week2/13
SammyOdu4 Apr 6, 2020
376edcd
update week2/14
SammyOdu4 Apr 6, 2020
d8e5ccf
update week2/15
SammyOdu4 Apr 6, 2020
c65b41d
update week2/17
SammyOdu4 Apr 6, 2020
61824b1
update week2/17
SammyOdu4 Apr 6, 2020
84ed543
update week2/16
SammyOdu4 Apr 6, 2020
a971b20
update week2/18
SammyOdu4 Apr 6, 2020
9c20bb7
update week2/18
SammyOdu4 Apr 6, 2020
6a93de6
week2/18 update
SammyOdu4 Apr 6, 2020
075144e
week2/14
SammyOdu4 Apr 6, 2020
b9b352d
week2/18
SammyOdu4 Apr 6, 2020
d6ef7a4
week2/18
SammyOdu4 Apr 6, 2020
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 html-css-project
Submodule html-css-project added at 704a89
3 changes: 2 additions & 1 deletion week-1/1-parent-child/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
<p class="message__content">
Who is available to meet this week to work on our group project?
</p>
<span class="message__time">6:48pm</span>
<span class="message__time">6:45pm</span>
</div>
<div class="message">
<div class="message__author">Habiba</div>
<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 week-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
<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 class="message__time" datetime="2018-03-25 19:25:00.000">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:00.000">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:00.000">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 src="js/convertUrls.js"></script>
</body>
</html>
11 changes: 11 additions & 0 deletions week-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
/* Add your CSS code below */
#first-message {
background-color: red;
}

article {
background-color: cadetblue;
}

.message--latest {
background-color: yellow;
}
2 changes: 1 addition & 1 deletion week-1/6-css-properties/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="message message--old">
<div class="message__author">Won</div>
<p class="message__content">
Where should we meet tomorrrow?
Where should we meet tomorrow?
</p>
<time class="message__time">Yesterday, 7:25pm</time>
</div>
Expand Down
19 changes: 19 additions & 0 deletions week-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 {
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;
}
8 changes: 8 additions & 0 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 */
.country {
padding: 15px;
}

.pages__page {
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;
}

* {
border: 1px solid rgb(255, 208, 0);
}
15 changes: 15 additions & 0 deletions week-1/8-advanced-selectors/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
/* Try different box model properties below */
.site-wrapper {
margin-bottom: 20px;
}
.site-header {
color: yellow;
}

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

.message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
11 changes: 11 additions & 0 deletions week-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 (min-width: 768px) {
.countries {
columns: 2;
}
}

@media screen and (min-width: 1200px) {
.countries {
columns: 3;
}
}
12 changes: 12 additions & 0 deletions week-2/11-flexbox/flexbox.css
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
/* Add your own CSS code below */
.container--first {
display: flex;
flex-direction: row-reverse;
}
.countries--second {
display: flex;
flex-direction: column;
}
.countries--third {
display: flex;
flex-direction: column-reverse;
}
19 changes: 19 additions & 0 deletions week-2/12-justify-content/flexbox.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
.countries {
display: flex;
flex-direction: column;
justify-content: space-between;
}

.countries--second .country {
padding: 0.5em;
}

/* Add your own CSS code below */

.countries--first {
flex-direction: row;
justify-content: end;
}
.countries--second {
flex-direction: row;
justify-content: space-around;
}
.countries--third {
flex-direction: column;
justify-content: end;
}
.countries--fourth {
flex-direction: column-reverse;
justify-content: space-around;
}
2 changes: 1 addition & 1 deletion week-2/12-justify-content/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
With flexbox, the `justify-content` property can be used to control how extra space is used. In this exercise, you'll apply a different `justify-content` property to each list. Follow the steps below to complete this exercise.

1. Look at the First list of countries. Then look at the solution displayed to the side. Find the differences between the two lists.
2. Use `justify-content` and `flex-direction` to make the list of countries on the left look like the ones on the right.
2. Use `justify-content` and `flex-direction` to make the list of countries on the left look like the ones on the right.r

_Hint: You can review how `justify-content` works in [this guide](https://css-tricks.com/snippets/css/a-guide-to-flexbox)._

Expand Down
16 changes: 16 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,19 @@
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: stretch;
flex-direction: column-reverse;
}
24 changes: 24 additions & 0 deletions week-2/14-order/flexbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,27 @@
}

/* 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;
}
20 changes: 20 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,23 @@
}

/* Add your own CSS code below */
.country--brazil {
align-self: stretch;
align-items: flex-start;
}
.country--croatia {
align-self: flex-start;
align-items: flex-end;
}
.country--ethiopia {
align-self: flex-end;
align-items: center;
}
.country--laos {
align-self: center;
align-items: stretch;
}
.country--uganda {
align-self: baseline;
align-items: start;
}
43 changes: 43 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,46 @@
}

/* 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 .country--ethiopia {
align-self: center;
}
.countries--fourth .country--laos {
align-self: center;
}

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

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

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

@media screen and (min-width: 992px) {
.site-header {
display: flex;
align-items: row;
justify-content: center;
}
.site-header :last-child {
justify-self: right;
}
.site-header :first-child {
justify-self: left;
}
}
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;
}