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

Orange links #13

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
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
41 changes: 30 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions week-1/1-parent-child/index.html
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 3 additions & 2 deletions week-1/2-html-attributes/index.html
Original file line number Diff line number Diff line change
@@ -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 iCafe in Merchant City.
<a href="https://goo.gl/maps/aza4h9nUBhn">https://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 width="100%" src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" />
</p>
<span class="message__time">7:38pm</span>
</div>
26 changes: 12 additions & 14 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
@@ -12,30 +12,28 @@

<body>
<div class="site-wrapper">
<div class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
<header class="site-header" role="banner">Messages</header>
<main class="messages" role="main">
<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">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">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">Mar 25, 2018 7:38pm</time>
</article>
</main>
<div id="result" class="result"></div>
</div>
<script defer src="/js/3-result.js"></script>
2 changes: 2 additions & 0 deletions week-1/4-links-scripts/index.html
Original file line number Diff line number Diff line change
@@ -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" type="text/css" href="./css/missing-styles.css" />
</head>

<body>
@@ -33,5 +34,6 @@
</div>
</div>
</div>
<script 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;
}
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: solid 3px blue;
}
.message {
line-height: 1.7;
}
.message__time--old {
opacity: 0.5;
}
3 changes: 3 additions & 0 deletions week-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
@@ -4,3 +4,6 @@
border-radius: 4px;
background: #fff;
}
.country {
margin: 15px;
}
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;
margin-bottom: 0px;
}

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

.messages div:last-child {
box-shadow: 4px 4px 0 #dba944;
}
20 changes: 20 additions & 0 deletions week-2/17-nav-menu/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,21 @@
/* 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;
flex-direction: row;
}
}

@media screen and (min-width: 992px) {
.site-header {
display: flex;
flex-direction: row;
justify-content: space-around;
}
}
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;
}