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
2 changes: 1 addition & 1 deletion week-1/1-parent-child/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<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">7:15pm</span>
</div>
<div class="message">
<div class="message__author">Habiba</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 iCafe in Merchant City. <a href="ttps://goo.gl/maps/aza4h9nUBhn"></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
30 changes: 15 additions & 15 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@

<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">
<div class="message__author">Won</div>
</header>
<main role="main" class="messages">
<article class="message">
<div class="message__author">Won</article>
<p class="message__content">Where should we meet later?</p>
<span class="message__time">Mar 25, 2018 7:25pm</span>
</div>
<div class="message">
<div class="message__author">Luke</div>
</main>
<article class="message">
<div class="message__author">Luke</article>
<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">
<div class="message__author">Won</div>
<article class="message">
<div class="message__author">Won</article>
<p class="message__content">
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
Ok! message__time https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
</p>
<span class="message__time">Mar 25, 2018 7:38pm</span>
<article> class="message__time">Mar 25, 2018 7:38pm </article>
</div>
</div>
<div id="result" class="result"></div>
<div main role="main" id="result" class="result"></div>
</div>
<script defer src="/js/3-result.js"></script>
<script header role="banner" defer src="/js/3-result.js"></script>
</body>
</html>
</html>
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="missing-styles.css" />
</head>

<body>
Expand Down Expand Up @@ -33,5 +34,6 @@
</div>
</div>
</div>
<script>"convertUrls.js"</script>
</body>
</html>
10 changes: 10 additions & 0 deletions week-1/5-css-selectors/message-backgrounds.css
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
/* Add your CSS code below */
#first-message{
background-color: red;
}

article{
background-color: cadetblue;
}
.message--latest{
background-color: yellow;
}
23 changes: 22 additions & 1 deletion week-1/6-css-properties/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
/* Add your CSS code below */
/* add your CSS code below */
.link{
color: red;
font-weight: bold;
text-decoration: none;
}

.message__time{
font-size: 0.9rem;
}

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

.message:first-child {
opacity: 50%;
}

.message__content {
line-height: 2;
}
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 @@ -3,4 +3,11 @@
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;
padding: 6px;
}

.country {
padding: 20px;
width: 300px;
height: 30px;
}
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;
}
2 changes: 1 addition & 1 deletion week-1/9-git-branch/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: green;
font-weight: 700;
text-decoration: none;
}
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 (min-width:768px){
.countires{
columns: 2;
}
}

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

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

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

/* Add your own CSS code below */

.countries--first{
justify-content: end;

}

.countries--second{
justify-content: space-around;


}

.countries--second .country{
padding: 0.5em;
font-size: 1em;

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

}

.countries--fourth{
display: flex;
flex-direction: column-reverse;
justify-content: space-between;

}
18 changes: 18 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,21 @@
display: flex;
}
/* Add your own CSS code below */
.countries--first{
align-items: center;
}
.countries--second{
align-items: flex-end;
flex-direction: row-reverse;
}

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

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

/* Add your own CSS code below */
.countries--first {
align-items: center;
}

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

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

.countries--fourth {
flex-direction: column-reverse;
align-items: center;
}
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 .country--ethiopia {
align-self: flex-end;
}

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

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

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

.countries--third li:first-child,
li:last-child {
align-self: baseline;
}

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

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

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

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

.countries--third {
align-items: baseline;
justify-content: center;
}

.countries--third li:first-child {
align-self: flex-end;
}

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

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

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

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

.countries--fifth .country--uganda {
order: 4;
align-self: center;
}

.countries--fifth .country--laos {
order: 5;
align-self: flex-end;
}
23 changes: 23 additions & 0 deletions week-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,24 @@
/* 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;
align-items: center;
}
.site-header__nav {
display: flex;
flex-direction: row;
}
}

@media screen and (min-width: 992px) {
.site-header {
justify-content: space-around;
}
}
Loading