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
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
10 changes: 8 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,20 @@
<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="gif " />
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
34 changes: 20 additions & 14 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,36 @@

<body>
<div class="site-wrapper">
<div class="site-header">
<header role="banner">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
</header>
<main role="main">
<article class="article">
<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">
<span class="message__time"
><time datetime="Mar 25, 2018 7:35pm">Mar 25, 2018 7:25pm</time></span
>
</article>
<article class="article">
<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">
<span class="message__time"
><time datetime="Mar 25, 2018 7:35pm">Mar 25, 2018 7:35pm</time></span
>
</article>
<article class="article">
<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="" />
</p>
<span class="message__time">Mar 25, 2018 7:38pm</span>
</div>
</div>
<span class="message__time"
><time datetime="Mar 25, 2018 7:35pm">Mar 25, 2018 7:38pm</time></span
>
</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>
6 changes: 3 additions & 3 deletions week-1/5-css-selectors/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div id="first-message">
<div id="first-message" class="item1">
<div class="message__author">Won</div>
<p class="message__content">Where should we meet later?</p>
<time class="message__time">7:25pm</time>
</div>
<article>
<article class="item2">
<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>
<time class="message__time">7:35pm</time>
</article>
<div class="message--latest">
<div class="message--latest item3">
<div class="message__author">Won</div>
<p class="message__content">
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
Expand Down
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 */
.item1 {
background-color: red;
}
.item2 {
background-color: cadetblue;
}
.item3 {
background-color: yellow;
}
8 changes: 4 additions & 4 deletions week-1/6-css-properties/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
<div class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
<div class="messages ">
<div class="message item line ">
<div class="message__author">Won</div>
<p class="message__content">
Where should we meet tomorrrow?
</p>
<time class="message__time message__time--old">Yesterday, 7:25pm</time>
</div>
<div class="message">
<div class="message line ">
<div class="message__author">Luke</div>
<p class="message__content">
Let's meet at the iCafe in Merchant City.
Expand All @@ -33,7 +33,7 @@
</p>
<time class="message__time">7:35pm</time>
</div>
<div class="message message--unread">
<div class="message message--unread line gpu ">
<div class="message__author">Won</div>
<p class="message__content">
Ok!
Expand Down
20 changes: 20 additions & 0 deletions week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
/* Add your CSS code below */
a {
color: red;
font-weight: bold;
text-decoration: none;
}
.message__time {
font-size: 0.9rem;
}
.item {
opacity: 0.5;
}
.line {
line-height: 50px;
}
.gpu {
border-left: 100px;
border-left-width: 50%;
border-left-color: blue;
border-left: solid blue;
}
9 changes: 9 additions & 0 deletions week-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,13 @@
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;
margin: 1px;
padding: 1px;
width: 1px;
}
.countries {
margin: 1opx;
padding: 10px;
width: 95%;
height: 95%;
}
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:nth-child(2) {
color: white;
margin-bottom: 0;
}

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

.message:last-child {
box-shadow: 4px 4px 0 #dba944;
}
10 changes: 10 additions & 0 deletions 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 only screen and (min-width: 768px) {
.countries {
columns: 2;
}
}
@media only 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 */
.countries--first {
display: flex;
flex-direction: row-reverse;
}
.countries--second {
display: flex;
flex-direction: column;
}
.countries--third {
display: flex;
flex-direction: column-reverse;
}
18 changes: 18 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,21 @@
}

/* Add your own CSS code below */
.countries--first {
display: flex;
justify-content: flex-end;
}
.countries--second {
display: flex;
justify-content: space-between;
}
.countries--third {
display: flex;
flex-direction: column;
justify-content: flex-end;
}
.countries--fourth {
display: flex;
flex-direction: column-reverse;
justify-content: space-between;
}
20 changes: 20 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,23 @@
display: flex;
}
/* Add your own CSS code below */
.countries--first {
flex-direction: row;
align-content: center;
align-items: center;
}
.countries--second {
flex-direction: row-reverse;
align-content: center;
align-items: flex-end;
}
.countries--third {
flex-direction: column;
align-items: center;
align-items: flex-end;
}
.countries--fourth {
flex-direction: column-reverse;
align-items: center;
align-content: center;
}
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 .country--brazil {
order: 5;
}
.countries--second .country--brazil {
order: 3;
}
.countries--second .country--uganda {
order: 5;
}
.countries--third .country--brazil {
order: 5;
}
.countries--third .country--croatia {
order: 4;
}
.countries--third .country--ethiopia {
order: 3;
}
.countries--third .country--laos {
order: 2;
}
.countries--third .country--uganda {
order: 1;
}
26 changes: 26 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,29 @@
}

/* 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 {
flex-direction: row;
align-items: flex-end;
}
.countries--third .country--brazil,
.countries--third .country--uganda {
align-self: flex-start;
}
.countries--fourth {
flex-direction: column;
align-items: flex-start;
}
.countries--fourth .country--uganda {
align-self: center;
}
37 changes: 37 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,40 @@
}

/* Add your own CSS code below */
.countries--first {
align-items: flex-end;
justify-content: end;
}
.countries--second {
flex-direction: row-reverse;
align-items: flex-end;
justify-content: center;
}
.countries--third {
align-items: flex-start;
justify-content: center;
}
.countries--third .country--brazil {
align-self: flex-end;
}
.countries--fourth {
flex-direction: column;
align-items: flex-end;
justify-content: center;
}
.countries--fourth .country--ethiopia,
.countries--fourth .country--laos {
align-self: center;
}
.countries--fifth {
flex-direction: column-reverse;
align-items: flex-end;
justify-content: space-around;
}
.countries--fifth .country--uganda {
align-self: center;
order: 4;
}
.countries--fifth .country--laos {
order: 5;
}
Loading