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

Orange links #10

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
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
84 changes: 0 additions & 84 deletions js/3-result.js

This file was deleted.

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.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
"husky": "^0.14.3",
"prettier": "^1.14.2",
"pretty-quick": "^1.6.0"
}
},
"dependencies": {}
}
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="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="//media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" />
</p>
<span class="message__time">7:38pm</span>
</div>
Expand Down
22 changes: 11 additions & 11 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@
</head>

<body>
<div class="site-wrapper">
<header class="site-wrapper">
<div class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
<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="2018-03-25 19: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="2018-03-25 19: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>
<time datetime="2018-03-25 19:38" class="message__time">Mar 25, 2018 7:38pm</time>
</article>
</div>
<div id="result" class="result"></div>
</div>
</header>
<script defer src="/js/3-result.js"></script>
</body>
</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="css/missing-styles.css" />
</head>

<body>
Expand Down Expand Up @@ -33,5 +34,6 @@
</div>
</div>
</div>
<script src="/week-1/4-links-scripts/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;
}

#second-message {
background-color: cadetblue;
}

#thirt-message {
background-color: yellow;
}
21 changes: 21 additions & 0 deletions 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 */
.link {
color: red;
font-weight: bold;
text-decoration: none;
}

time.message__time {
font-size: 0.9rem;
}

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

.messages :first-child {
opacity: 0.5;
}

.message {
padding: 30px;
}
9 changes: 9 additions & 0 deletions week-1/7-css-box/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
/* Try different box model properties below */

* {
border: 1px solid red;
}

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

.country {
padding: 15px;
}
Loading