CodeYourFuture · havvarslan · Feb 2, 2019 · Feb 2, 2019 · Feb 2, 2019 · Feb 2, 2019
diff --git a/package-lock.json b/package-lock.json
diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
@@ -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>

diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
@@ -24,14 +24,14 @@
           <div class="message__author">Luke</div>
           <p class="message__content">
             Let's meet at the iCafe in Merchant City.
-            https://goo.gl/maps/aza4h9nUBhn
+            <a href=" https://goo.gl/maps/aza4h9nUBhn"> iCafe </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
+            <img src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" width="100px" />
           </p>
           <span class="message__time">7:38pm</span>
         </div>

diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
@@ -12,31 +12,32 @@
 
   <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="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">
+          <span class="message__time">Mar 25, 2018 <time datetime="20:00"></time>7:25pm</span>
+        </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
+            <a href=" https://goo.gl/maps/aza4h9nUBhn"> iCafe </a>
           </p>
           <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+        </article>
+        <article 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" width="150px" />
           </p>
           <span class="message__time">Mar 25, 2018 7:38pm</span>
-        </div>
-      </div>
+        </article>
+      </main>
       <div id="result" class="result"></div>
     </div>
     <script defer src="/js/3-result.js"></script>

diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
@@ -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>
@@ -20,20 +21,19 @@
         <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. https://goo.gl/maps/aza4h9nUBhn
           </p>
           <time class="message__time">7:35pm</time>
         </div>
         <div class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
-            No, I prefer the one on Sauchiehall Street.
-            https://goo.gl/maps/wKDoARcHDp42
+            No, I prefer the one on Sauchiehall Street. https://goo.gl/maps/wKDoARcHDp42
           </p>
           <time class="message__time">7:38pm</time>
         </div>
       </div>
     </div>
+    <script src="./js/convertUrls.js"></script>
   </body>
 </html>
diff --git a/week-1/5-css-selectors/index.html b/week-1/5-css-selectors/index.html
@@ -25,8 +25,7 @@
         <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
+            Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
           </p>
           <time class="message__time">7:35pm</time>
         </article>

diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,11 @@
-/* Add your CSS code below */
+#first-message {
+  background-color: red;
+}
+
+article {
+  background-color: cadetblue;
+}
+
+.message--latest {
+  background-color: yellow;
+}
diff --git a/week-1/6-css-properties/index.html b/week-1/6-css-properties/index.html
@@ -16,14 +16,12 @@
         <div class="site-header__title">Messages</div>
       </div>
       <div class="messages">
-        <div class="message">
+        <div class="message message--old">
           <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
-          >
+          <time class="message__time message__time--old">Yesterday, 7:25pm</time>
         </div>
         <div class="message">
           <div class="message__author">Luke</div>

diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
@@ -1 +1,20 @@
 /* Add your CSS code below */
+.link {
+  color: red;
+  font-weight: bold;
+  text-decoration: none;
+}
+.message__time {
+  font-size: 0.9rem;
+}
+
+.message--unread {
+  border-style: solid;
+  border-color: blue;
+}
+.message--old {
+  opacity: 0.5;
+}
+.message {
+  padding: 5px;
+}
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -6,4 +6,5 @@
   border-radius: 4px;
   margin: 0.5em;
   background: #fff;
+  border: 1px solid red;
 }
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,17 @@
 /* Try different box model properties below */
+p {
+  color: white;
+  margin-bottom: 10px;
+}
+
+.site-footer {
+  font-size: 12px;
+  text-align: center;
+}
+.message__content {
+  color: black;
+}
+
+.message--unread {
+  box-shadow: 4px 4px 0 #dba944;
+}
diff --git a/week-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: #4491db;
+  color: red;
   font-weight: 700;
   text-decoration: none;
 }
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
@@ -1 +1,11 @@
 /* Add your own CSS code below */
+@media screen and (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+@media screen and (min-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}
diff --git a/week-2/10-media-queries/index.html b/week-2/10-media-queries/index.html
@@ -6,7 +6,7 @@
     <title>10. Media Queries - HTML, CSS and Git Exercises</title>
     <link rel="stylesheet" href="/css/normalize.css" />
     <link rel="stylesheet" href="/css/week2-media-queries.css" />
-    <link rel="stylesheet" href="/week-2/9-media-queries/columns.css" />
+    <link rel="stylesheet" href="/week-2/10-media-queries/columns.css" />
   </head>
 
   <body>

diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
@@ -1 +1,6 @@
 /* Add your own CSS code below */
+
+.countries--first {
+  display: flex;
+  flex-direction: row-reverse;
+}
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
@@ -7,3 +7,18 @@
 }
 
 /* Add your own CSS code below */
+.countries--second {
+  display: flex;
+  flex-direction: flex-end;
+  justify-content: space-between;
+}
+.countries--first {
+  display: flex;
+  flex-direction: flex-end;
+  justify-content: flex-end;
+}
+.countries--third {
+  display: flex;
+  flex-direction: flex-end;
+  justify-content: flex-end;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
@@ -2,3 +2,24 @@
   display: flex;
 }
 /* Add your own CSS code below */
+.countries--first {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.countries--second {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: flex-end;
+}
+.countries--third {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.countries--fourth {
+  display: flex;
+  flex-direction: column-reverse;
+  align-items: center;
+}