coditech · AhmadALAhmad1 · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022 · Dec 2, 2022
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
@@ -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>

diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
@@ -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 <a href="https://goo.gl/maps/aza4h9nUBhn"> iCafe </a>in Merchant City.
+            <span class="message__time">7:35pm</span>
           </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" alt="image" />
           </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,33 @@
 
   <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">
+        </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">
+        </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>
-      <div id="result" class="result"></div>
+        </article>
+        <div id="result" class="result"></div>
+      </main>
     </div>
     <script defer src="/js/3-result.js"></script>
   </body>

diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <link rel="stylesheet" href="./css/missing-styles.css" />
     <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" />
@@ -33,5 +34,6 @@
         </div>
       </div>
     </div>
+    <script src="./js/convertUrls.js"></script>
   </body>
 </html>
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/styles.css b/week-1/6-css-properties/styles.css
@@ -1 +1,21 @@
 /* Add your CSS code below */
+a {
+  font-weight: bold;
+  color: red;
+  text-decoration: none;
+}
+.message__time {
+  font-size: 0.9rem;
+}
+.message--unread {
+  border-left: 2px solid;
+  border-color: blue;
+}
+
+.message__time--old {
+  opacity: 0.5;
+}
+
+.message__content {
+  line-height: 250%;
+}
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -4,3 +4,7 @@
   border-radius: 4px;
   background: #fff;
 }
+
+.country {
+  padding: 15spx;
+}
diff --git a/week-1/8-advanced-selectors/readme.md b/week-1/8-advanced-selectors/readme.md
@@ -7,7 +7,7 @@ Follow the steps below to complete this exercise. _Do not modify the index.html
 1. Use the [Child Selector](https://learn.shayhowe.com/advanced-html-css/complex-selectors/#child-selectors) to change the text that reads "All of your messages with Won are shown below." Make this text `white` without changing the colour of any other text.
 2. Reduce the space between the text in step 1 and the messages. Use the `margin-bottom` property to remove the bottom margin on the text.
 3. Use the Child Selector to change the text at the bottom that reads "Last message received Yesterday, 7:38pm.". Change the `font-size` to `12px` and use the `text-align` property to center the text.
-4. Use the [:last-child Selector](https://learn.shayhowe.com/advanced-html-css/complex-selectors/#pseudo-classes) to change the last message in the list. Add a `box-shadow` of `4px 4px 0 #dba944` so that it stands out.
+4. Use the [:last-child Selector](https://learn.shayhowe.com/advanced-html-css/complex-selectors/#pseudo-classes) to change the last message in the list. Add a `box-shadow`box-shadow`of`4px 4px 0 #dba944` so that it stands out.
 
 When you complete this exercise it should look like the image below.
 

diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,13 @@
 /* Try different box model properties below */
+.site-header p {
+  color: white;
+  margin-bottom: 1px;
+}
+
+.site-footer {
+  text-align: center;
+  font-size: 12px;
+}
+.message--unread:last-child {
+  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: green;
   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/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
@@ -1 +1,8 @@
 /* Add your own CSS code below */
+.panel {
+  display: flex;
+}
+.countries--first {
+  display: flex;
+  flex-direction: column-reverse;
+}
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
@@ -1,3 +1,4 @@
+/* Add your own CSS code below */
 .countries {
   display: flex;
 }
@@ -6,4 +7,25 @@
   padding: 0.5em;
 }
 
-/* Add your own CSS code below */
+.countries--first {
+  flex-direction: row;
+  justify-content: flex-end;
+  width: 60%;
+}
+
+.countries--second {
+  justify-content: space-around;
+  width: 60%;
+}
+
+.countries--third {
+  justify-content: flex-end;
+  flex-direction: column;
+  width: 60%;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  justify-content: space-evenly;
+  width: 60%;
+}
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 {
+  align-items: center;
+  flex-direction: row;
+  width: 60%;
+}
+
+.countries--second {
+  align-items: flex-end;
+  flex-direction: row-reverse;
+  width: 60%;
+}
+.countries--third {
+  align-items: flex-end;
+  flex-direction: column;
+  width: 60%;
+}
+.countries--fourth {
+  align-items: center;
+  flex-direction: column-reverse;
+  width: 60%;
+}
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
@@ -2,4 +2,24 @@
   display: flex;
 }
 
+.countries--first .country--brazil {
+  order: 4;
+}
+
+.countries--second .country--uganda {
+  order: 5;
+}
+.countries--third .country--brazil {
+  order: 4;
+}
+.countries--third .country--croatia {
+  order: 3;
+}
+.countries--third .country--ethiopia {
+  order: 2;
+}
+.countries--third .country--laos {
+  order: 1;
+}
+
 /* Add your own CSS code below */
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
@@ -1,5 +1,38 @@
 .countries {
   display: flex;
 }
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+
+.countries--second {
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+
+.countries--second .country--ethiopia {
+  align-self: flex-end;
+}
+.countries--third {
+  flex-direction: row;
+  justify-content: center;
+  align-items: flex-end;
+}
+.countries--third .country--uganda {
+  align-self: flex-start;
+}
+.countries--third .country--brazil {
+  align-self: flex-start;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-start;
+}
+.countries--fourth .country--uganda {
+  align-self: flex-end;
+}
 
 /* Add your own CSS code below */
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
@@ -2,4 +2,83 @@
   display: flex;
 }
 
+.countries--first {
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: flex-end;
+}
+
+.countries--second {
+  flex-direction: row;
+  justify-content: flex-end center;
+  align-items: flex-end;
+  width: 60%;
+}
+
+.countries--second .country--brazil {
+  order: 4;
+}
+
+.countries--second .country--croatia {
+  order: 3;
+}
+
+.countries--second .country--ethiopia {
+  order: 2;
+}
+.countries--second .country--laos {
+  order: 1;
+}
+
+.countries--third {
+  flex-direction: row;
+  justify-content: flex-end center;
+  align-items: flex-start;
+  width: 60%;
+}
+.countries--third .country--brazil {
+  align-self: flex-end;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-end;
+  width: 60%;
+}
+
+.countries--fourth .country--ethiopia {
+  align-self: flex-start;
+  align-self: center;
+}
+
+.countries--fourth .country--laos {
+  align-self: flex-start center;
+  align-self: center;
+}
+
+.countries--fifth {
+  flex-direction: column;
+  justify-content: space-evenly;
+  align-items: flex-end;
+  width: 60%;
+}
+
+.countries--fifth .country--brazil {
+  order: 4;
+}
+
+.countries--fifth .country--croatia {
+  order: 3;
+}
+
+.countries--fifth .country--ethiopia {
+  order: 2;
+}
+
+.countries--fifth .country--uganda {
+  align-self: flex-start;
+  align-self: center;
+}
+
 /* Add your own CSS code below */
-Original file 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 @@