CodeYourFuture · Rahaf89 · Oct 19, 2019 · Oct 19, 2019 · Oct 19, 2019 · Oct 19, 2019
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:00pm</span>
         </div>
       </div>
     </div>

diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
@@ -23,7 +23,11 @@
         <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"
+              >iCafe</a
+            >
+
+            >
           </p>
           <span class="message__time">7:35pm</span>
         </div>

diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
@@ -12,30 +12,34 @@
 
   <body>
     <div class="site-wrapper">
-      <div class="site-header">
+      <header class="site-header">
         <div class="site-header__title">Messages</div>
-      </div>
-      <div class="messages">
+      </header>
+
+      <main class="messages">
         <div 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>
+          <span class="message__time"
+            ><time datetime="2018-03-25 19:25"> 2018-03-25 at 19:25</time>.
+          </span>
         </div>
-        <div class="message">
+        <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>
+          <time class="message__time">2018-03-25 19:35</time>
+        </article>
+
         <div 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>
+      </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
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <link rel="stylesheet" href="style.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="convertUrls.js"></script>
   </body>
 </html>
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
@@ -3,3 +3,31 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--first .country--brazil {
+  order: 5;
+}
+
+.countries--second .country--uganda {
+  order: 10;
+}
+
+.countries--second .country--brazil {
+  order: 1;
+}
+
+.countries--third .country--brazil {
+  order: 5;
+}
+
+.countries--third .country--croatia {
+  order: 4;
+}
+
+.countries--third .country--ethiopia {
+  order: 3;
+}
+
+.countries--third .country--laos {
+  order: 2;
+}
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
@@ -2,4 +2,73 @@
   display: flex;
 }
 
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+
 /* Add your own CSS code below */
+
+.countries--second .country--brazil {
+  align-self: center;
+}
+
+.countries--second .country--croatia {
+  align-self: center;
+}
+
+.countries--second .country--ethiopia {
+  align-self: flex-end;
+}
+
+.countries--second .country--laos {
+  align-self: center;
+}
+
+.countries--second .country--uganda {
+  align-self: center;
+}
+
+.countries--third .country--brazil {
+  align-self: flex-start;
+}
+
+.countries--third .country--croatia {
+  align-self: flex-end;
+}
+
+.countries--third .country--ethiopia {
+  align-self: flex-end;
+}
+
+.countries--third .country--laos {
+  align-self: flex-end;
+}
+
+.countries--third .country--uganda {
+  align-self: flex-start;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  align-items: left;
+}
+
+.countries--fourth .country--brazil {
+  align-self: flex-start;
+}
+
+.countries--fourth .country--croatia {
+  align-self: flex-start;
+}
+
+.countries--fourth .country--uganda {
+  align-self: center;
+}
+
+.countries--fourth .country--laos {
+  align-self: flex-start;
+}
+
+.countries--fourth .country--ethiopia {
+  align-self: flex-start;
+}
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,76 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--first {
+  justify-content: right;
+  align-items: flex-end;
+}
+
+.countries--second {
+  justify-content: center;
+  align-items: flex-end;
+}
+
+.countries--third {
+  justify-content: right;
+  align-items: flex-start;
+}
+
+.countries--third .country--brazil {
+  align-self: flex-end;
+}
+
+.countries--fourth {
+  align-self: flex-start;
+  flex-direction: column;
+  justify-content: right;
+  align-items: flex-end;
+}
+
+.countries--fourth .country--brazil {
+  align-items: flex-end;
+  margin-top: 60px;
+}
+
+.countries--fourth .country--croatia {
+  align-items: flex-end;
+}
+
+.countries--fourth .country--ethiopia {
+  align-self: center;
+}
+
+.countries--fourth .country--laos {
+  align-self: center;
+}
+
+.countries--fourth .country--uganda {
+  align-self: flex-end;
+  justify-content: right;
+}
+
+.countries--fifth {
+  align-self: flex-end;
+  flex-direction: column;
+  justify-content: right;
+  align-items: flex-end;
+  justify-content: space-between;
+  flex-direction: column-reverse;
+}
+
+.countries--fifth .country--brazil {
+  align-self: flex-end;
+}
+.countries--fifth .country--uganda {
+  align-self: center;
+}
+
+.countries--fifth .country--laos {
+  align-self: flex-end;
+  align-items: flex-start;
+  order: 1;
+}
+
+.countries--fifth .country--croatia {
+}
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
@@ -1 +1,21 @@
 /* Write your media queries and flexbox CSS below */
+@media only screen and (min-width: 480px) {
+  .site-header__nav {
+    display: flex;
+    flex-direction: row;
+  }
+}
+
+@media (min-width: 700px) {
+  .site-header {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+}
+
+@media (min-width: 992px) {
+  .site-header {
+    justify-content: space-between;
+  }
+}
diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css
@@ -1,6 +1,7 @@
 /* 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 action="/readform" method="GET">
+          <input type="text" name="q" />
+        </form>
       </main>
     </div>
   </body>

diff --git a/week-3/20-labels/index.html b/week-3/20-labels/index.html
@@ -12,8 +12,8 @@
     <div class="site-wrapper">
       <main>
         <form method="GET" action="https://www.google.com/search">
-          <!-- Add a label here -->
-          <input type="text" name="q" />
+          <label for="search">Search on Google</label>
+          <input id="search" type="text" name="uid" />
         </form>
       </main>
     </div>

diff --git a/week-3/21-buttons/index.html b/week-3/21-buttons/index.html
@@ -14,7 +14,7 @@
         <form method="GET" action="https://www.google.com/search">
           <label for="search-input">Search on Google</label>
           <input type="text" name="q" id="search-input" />
-          <!-- Add a submit button here -->
+          <button type="submit">Search</button>
         </form>
       </main>
     </div>

diff --git a/week-3/22-checkout/index.html b/week-3/22-checkout/index.html
@@ -33,15 +33,6 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
             </tr>
           </table>
         </div>
-
-        <div class="checkout">
-          <h2 class="checkout__title">Checkout</h2>
-          <form method="GET" id="checkout-form" class="checkout__form">
-            <!-- Add the form fields here -->
-
-            <button type="submit">Complete Purchase</button>
-          </form>
-        </div>
       </main>
     </div>
   </body>

diff --git a/week-3/23-comments/index.html b/week-3/23-comments/index.html
@@ -31,7 +31,11 @@ <h1>Our t-shirts are amazing!</h1>
         <div class="comments">
           <p>Add your comments and let us know what you think!</p>
 
-          <!-- Your comment form goes here -->
+          <form method="GET">
+            <label>Add Your Message</label>
+            <textarea name="comment"></textarea>
+            <button>Send Comment</button>
+          </form>
         </div>
       </main>
     </div>

diff --git a/week-3/24-dietary/index.html b/week-3/24-dietary/index.html
@@ -19,7 +19,21 @@ <h1>CodeYourFuture Summit</h1>
         </p>
 
         <form>
-          <!-- Your multiple choice goes here -->
+          <fieldset>
+            <legend>Please select all of your dietary requirements</legend>
+            <input type="checkbox" id="food1" />
+            <label for="food1">Halal</label>
+            <input type="checkbox" id="food2" />
+            <label for="food2">Kosher</label>
+            <input type="checkbox" id="food3" />
+            <label for="food3">Vegetarian</label>
+            <input type="checkbox" id="food4" />
+            <label for="food4">Vegan</label>
+            <input type="checkbox" id="food5" />
+            <label for="food5">Gluten free</label>
+          </fieldset>
+          <br />
+
           <button type="submit">Submit</button>
         </form>
       </main>

diff --git a/week-3/25-shirt-size/index.html b/week-3/25-shirt-size/index.html
@@ -29,7 +29,14 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
                 </div>
               </td>
               <td>
-                Medium
+                <form>
+                  <label class="screenreader">Choose a size</label>
+                  <select>
+                    <option>Small</option>
+                    <option selected>Medium</option>
+                    <option>Large</option>
+                  </select>
+                </form>
               </td>
               <td>
                 1

diff --git a/week-3/25-shirt-size/styles.css b/week-3/25-shirt-size/styles.css
@@ -1 +1,7 @@
 /* Add your CSS below */
+
+.screenreader {
+  clip: rect(1px, 1px, 1px, 1px);
+  position: absolute !important;
+  left: -2000px;
+}
-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:00pm</span>
             </div>
           </div>
         </div>
@@ Expand Down @@