coditech · zahraaAed · Aug 23, 2023 · Aug 23, 2023 · Aug 23, 2023 · Aug 23, 2023
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
@@ -25,7 +25,7 @@
         <div class="message">
           <div class="message__author">Habiba</div>
           <p class="message__content">
-            I can meet on Tuesday and Wednesday after 4.
+            I can meet on Tuesday and Wednesday after 7:15pm.
           </p>
         </div>
       </div>

diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
@@ -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> 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="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" />
           </p>
           <span class="message__time">7:38pm</span>
         </div>

diff --git a/week-1/2-html-attributes/readme.md b/week-1/2-html-attributes/readme.md
@@ -9,8 +9,8 @@ Complete the following steps in the `index.html` file:
 3. When you are finished, use git to add, commit and push your changes.
 
 ```shell
-git add .
-git commit -m "Completed 2-html-attributes exercise"
+git add .Completed 2-html-attributes exercise"
+git commit -m "
 git push
 ```
 

diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
@@ -11,33 +11,33 @@
   </head>
 
   <body>
-    <div class="site-wrapper">
-      <div class="site-header">
-        <div class="site-header__title">Messages</div>
-      </div>
-      <div class="messages">
-        <div class="message">
-          <div class="message__author">Won</div>
+    <article class="site-wrapper">
+      <header role="banner" class="site-header">
+        <article class="site-header__title">Messages</article>
+      </header>
+      <main role="main" class="messages">
+        <article class="message">
+          <article 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>
+        </article>
+        <article class="message">
+          <article 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>
+        <article class="message">
+          <article class="message__author">Won</article>
           <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>
-    </div>
+        </article>
+      </main>
+      <article id="result" class="result"></article>
+    </article>
     <script defer src="/js/3-result.js"></script>
   </body>
 </html>
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="css/missing-styles.css" />
   </head>
 
   <body>
@@ -33,5 +34,7 @@
         </div>
       </div>
     </div>
+    <script src="./js/convertUrls.jsg
+    "></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,10 @@
 /* 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,19 @@
 /* Add your CSS code below */
+a {
+  text-decoration: none;
+  font-weight: bold;
+  color: red;
+}
+.message__time {
+  font-size: 0.9rem;
+}
+.message.message--unread {
+  border-left: 3px solid blue;
+}
+.message__time--old {
+  opacity: 0.6;
+}
+
+.message {
+  line-height: 3;
+}
diff --git a/week-1/7-css-box/readme.md b/week-1/7-css-box/readme.md
@@ -7,6 +7,6 @@ In this exercise, you will modify the "box model" with the CSS properties `width
 
 When you have finished, the countries should look like the image below.
 
-![Screenshot of expected spacing of the countries](/images/7/countries.png).
+![Screenshot of expected spacing of the countries](/images/7/countries.png).in
 
 _Try this: Add `* { border: 1px solid red; }` to your CSS code. It will show you the box model of every element._
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -1,6 +1,13 @@
 /* Try different box model properties below */
 .pages__page {
-  border: 1px solid #4491db;
+  border: 1px solid red;
   border-radius: 4px;
   background: #fff;
+  display: inline-block;
+  margin: 10px;
+  padding: 4px;
+}
+
+.countries {
+  padding: 10px 4px;
 }
diff --git a/week-1/8-advanced-selectors/index.html b/week-1/8-advanced-selectors/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+g<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/week-1/8-advanced-selectors/readme.md b/week-1/8-advanced-selectors/readme.md
@@ -11,6 +11,7 @@ Follow the steps below to complete this exercise. _Do not modify the index.html
 
 When you complete this exercise it should look like the image below.
 
-![Screenshot of the solution](/images/8/solution.png).
+![Screenshot of the solution](
+.
 
 _Hint: All of the selectors you need are described [in this guide](https://learn.shayhowe.com/advanced-html-css/complex-selectors/)._
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,12 @@
 /* Try different box model properties below */
+:first-child {
+  color: white;
+  margin-bottom: 7px;
+}
+.message:last-child {
+  box-shadow: 4px 4px 0 #dba944;
+}
+.message__time .message__time--old {
+  font-size: 12px;
+  text-align: center;
+}
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
@@ -1 +0,0 @@
-/* Add your own CSS code below */

diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
@@ -1 +1,7 @@
 /* Add your own CSS code below */
+.countries {
+  display: flex;
+}
+.exercise {
+  flex-direction: row;
+}
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
@@ -7,3 +7,12 @@
 }
 
 /* Add your own CSS code below */
+.countries .countries--first {
+  justify-content: end;
+}
+.countries .countries--second {
+  justify-content: space-between;
+}
+.countries countries--tall countries--third {
+  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,20 @@
   display: flex;
 }
 /* Add your own CSS code below */
+.countries .countries--tall .countries--first {
+  flex-direction: row;
+  align-items: center;
+}
+.countries .countries--tall .countries--second {
+  flex-direction: row;
+  align-items: end;
+}
+.countries .countries--tall .countries--third {
+  flex-direction: column;
+  align-items: end;
+  justify-content: end;
+}
+.countries .countries--tall .countries--fourth {
+  flex-direction: column;
+  align-items: center;
+}
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
@@ -3,3 +3,38 @@
 }
 
 /* Add your own CSS code below */
+countries--first .country--brazil {
+  order: 5;
+}
+.countries--first .country--croatia {
+  order: 1;
+}
+.countries--first .country--ethiopia {
+  order: 2;
+}
+.countries--first .country--laos {
+  order: 3;
+}
+.countries--first .country--uganda {
+  order: 4;
+}
+
+.countries--second .country--brazil {
+  order: 4;
+}
+.countries--second .country--croatia {
+  order: 1;
+}
+.countries--second .country--ethiopia {
+  order: 2;
+}
+.countries--second .country--laos {
+  order: 3;
+}
+.countries--second .country--uganda {
+  order: 5;
+}
+.countries--third {
+  flex-direction: row-reverse;
+  justify-content: start;
+}
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
@@ -3,3 +3,30 @@
 }
 
 /* Add your own CSS code below */
+.country--first .country--ethiopia {
+  align-self: flex-end;
+}
+.country--second.country--ethiopia {
+  align-self: flex-end;
+  align-items: center;
+}
+.country--third .country--ethiopia {
+  align-self: flex-end;
+  align-items: center;
+}
+
+.country--third.country--croatia {
+  align-self: flex-end;
+  align-items: center;
+}
+.country--third.country--laos {
+  align-self: flex-end;
+  align-items: center;
+}
+.countries--fourth {
+  flex-direction: column;
+}
+.countries--fourth.country--uganda {
+  align-self: center;
+  align-items: center;
+}
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
@@ -1 +1,20 @@
 /* Write your media queries and flexbox CSS below */
+.site-header__nav {
+  @media screen and (min-width=480px) {
+    flex-direction: row;
+    display: inline-flexbox;
+    justify-content: center;
+  }
+}
+.site-wrapper {
+  @media screen and (min-width=700px) {
+    flex-direction: row;
+    display: inline-flexbox;
+  }
+}
+.site-header__checkout {
+  @media screen and (min-width=992px) {
+    align-items: flex-start;
+    justify-content: right;
+  }
+}
diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: #4491db;
+  color: orangered;
   font-weight: 700;
   text-decoration: none;
 }
diff --git a/week-3/19-search/index.html b/week-3/19-search/index.html
@@ -11,7 +11,9 @@
   <body>
     <div class="site-wrapper">
       <main>
-        <p>Delete this line and add your form.</p>
+        <form method="get" action="https://www.google.com/search">
+          <input type="text" name="q" />
+        </form>
       </main>
     </div>
   </body>