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
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="#">iCafe</a> iCafe 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
Ok! <br> <img src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" height="150" width="150" alt="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 datetime="25-5-2018T7: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="25-5-2018T7: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="25-5-2018T7: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
3 changes: 3 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,8 @@
<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 +35,6 @@
</div>
</div>
</div>
<script src="./js/convertUrls.js" ></script>
</body>
</html>
4 changes: 2 additions & 2 deletions week-1/4-links-scripts/readme.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Adding Links and Scripts

This site is missing the CSS styles. It's also missing JavaScript code that will convert the URLs ("http://") into links that can be clicked.
This site is missing the **CSS** styles. It's also missing JavaScript code that will convert the URLs ("http://") into links that can be clicked.

Your colleagues have already written the .css and .js files. Complete the following steps to get this site working:

1. Add a `<link>` element that includes the `missing-styles.css` file in this exercise's directory. This should be placed in the `<head>` element.
2. Add a `<script>` element that includes the `convertUrls.js` file in this exercise's directory. This should be placed right before the end of the `<body>` element.
2. Add a `<script>` element that includes the `convertUrls.js` file in githis exercise's directory. This should be placed right before the end of the `<body>` element.
3. When you are finished, use git to add, commit and push your changes.

_Hint: When you are done, the messages should have the colours and layout like other exercises, and you should be able to click on the URLs ("http://") to go to them._
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-image{
background-color: red;
}
article{
background-color: cadetblue;
}
.message--latest {
background-color: yellow;
}
2 changes: 1 addition & 1 deletion week-1/6-css-properties/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

There are many CSS properties you can use to change how your website looks. Add rules to the `styles.css` file to complete the steps below. _Do not edit the `index.html` file._

1. Make the links in the messages red and bold, and remove the underline.
1. Make the links in the messages red and bold, and remove the **underline**.
2. Increase the font size of the message times to `0.9rem`.
3. Put a blue border on the left side of the last message to show it is unread.
4. Make yesterday's message partially transparent to show it is old.
Expand Down
14 changes: 14 additions & 0 deletions week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
/* Add your CSS code below */
.message a {
color: red;
font-weight: bold;
font-size: 0.9rem;
}
.message--unread {
border-left: 10px solid blue;
}
.message__time--old{
color: rgba(211, 211, 211, 0.537);
}
.message {
line-height: 3;
}
5 changes: 5 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,8 @@
border-radius: 4px;
background: #fff;
}
.country{
margin-top :4px ;
/* border: 1px solid red; */
}

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-header p{
color: white;
margin-bottom: 0;
}

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

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


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

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

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

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

/* Add your own CSS code below */

.countries--first , .countries--second , .countries--third ,.countries--fourth {
display: flex;
}
.countries--first {
justify-content: flex-end;
}

.countries--second{

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

}
26 changes: 26 additions & 0 deletions week-2/14-order/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,.countries--second,.countries--third,.countries--fourth{
display: flex;
}
/* first */

.countries--first .country--brazil {
order: 1;
}

/* second */
.countries--second .country--brazil {
order: 4;
}
.countries--second .country--Croatia {
order: 1;
}
.countries--second .country--uganda{
order: 5;
}

/* third */

.countries--third{
flex-direction: row-reverse;
justify-content: start;
}
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 .country--ethiopia{
align-self:end;
}
/* second */
.countries--second {
align-items: center;
}
.countries--second .country--ethiopia {
align-self: end;
}

/* Third */

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

.countries--third .country--brazil ,.countries--third .country--uganda{
align-self: flex-start;
}

/* Fourth */

.countries--fourth{
flex-direction:column ;
align-items: flex-start;
}
.countries--fourth .country--uganda {
align-self: center;
}
61 changes: 61 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,64 @@
}

/* Add your own CSS code below */

/* First */
.countries--first{
align-items: flex-end;
justify-content: end;
}
/* Second */
.countries--second {
align-items: flex-end;
justify-content: center;
}

/* Third */

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

/* Fourth */
.countries--fourth {
flex-direction: column;
align-items: flex-end;
justify-content: center;

}

.countries--fourth .country--ethiopia ,.countries--fourth .country--laos{
align-self: center;
}


/* Fifth */

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


.countries--fifth .country--laos{
order: 1;
}
.countries--fifth .country--uganda{
align-self: center;
order: 2;
}

.countries--fifth .country--ethiopia{
order: 3;
}
.countries--fifth .country--croatia {
order: 4;
}
.countries--fifth .country--brazil{
order: 5;
}
17 changes: 17 additions & 0 deletions week-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
/* 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){
.site-header{
display: flex;
}
}
@media screen and (min-width:992px){
.site-header {
justify-content: space-between;
}
}
Loading