CodeYourFuture · ismihan34 · Mar 28, 2020 · Mar 28, 2020 · Apr 2, 2020 · Apr 2, 2020
diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
@@ -27,6 +27,9 @@
           <p class="message__content">
             I can meet on Tuesday and Wednesday after 4.
           </p>
+          <p class="message__content">
+            7.15pm
+          </p>
         </div>
       </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 iCafe in <a href="https://goo.gl/maps/aza4h9nUBhn">merchant city</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
+            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/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
@@ -12,30 +12,30 @@
 
   <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">
+          <time datetime="2018-04-25T19: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-04-25T19: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>
-      </div>
+          <time datetime="2018-04-25T19:38" class="message__time">Mar 25, 2018 7:38pm</time>
+        </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="css/missing-styles.css" />
   </head>
 
   <body>
@@ -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,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 {
+  color: red;
+  font-weight: bold;
+  text-decoration: none;
+}
+.message--time {
+  font-size: 0.9rem;
+}
+.message--unread > .message--content {
+  border-left-style: solid;
+  border-color: blue;
+}
+.message--old {
+  opacity: 0.5;
+}
+.message--content {
+  line-height: 3;
+}
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -4,3 +4,6 @@
   border-radius: 4px;
   background: #fff;
 }
+.country {
+  padding: 10px;
+}
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 */
+.site-header p {
+  color: white;
+  margin-bottom: -5px;
+}
+.site-footer p {
+  font-size: 12px;
+  text-align: center;
+}
+.message:last-child {
+  box-shadow: 4px 4px 0 #dba944;
+}
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,14 @@
 /* Add your own CSS code below */
+
+.countries--first {
+  display: flex;
+  flex-direction: row-reverse;
+}
+.countries--second {
+  display: flex;
+  flex-direction: column;
+}
+.countries--third {
+  display: flex;
+  flex-direction: column-reverse;
+}
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
@@ -7,3 +7,19 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  flex-direction: row;
+  justify-content: end;
+}
+.countries--second {
+  flex-direction: row;
+  justify-content: space-around;
+}
+.countries--third {
+  flex-direction: column;
+  justify-content: end;
+}
+.countries--fourth {
+  flex-direction: column-reverse;
+  justify-content: space-around;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
@@ -2,3 +2,19 @@
   display: flex;
 }
 /* Add your own CSS code below */
+.countries--first {
+  flex-direction: row;
+  align-items: center;
+}
+.countries--second {
+  flex-direction: row-reverse;
+  align-items: flex-end;
+}
+.countries--third {
+  flex-direction: column;
+  align-items: flex-end;
+}
+.countries--fourth {
+  flex-direction: column-reverse;
+  align-items: center;
+}
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
@@ -3,3 +3,25 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--first .country--brazil {
+  order: 5;
+}
+.countries--second .country--brazil {
+  order: 1;
+}
+.countries--second .country--uganda {
+  order: 2;
+}
+.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
@@ -3,3 +3,13 @@
 }
 
 /* Add your own CSS code below */
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+.countries--second {
+  flex-direction: row;
+  align-items: center;
+}
+.countries--second .country--ethiopia {
+  align-self: flex-end;
+}
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,36 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  align-items: flex-end;
+}
+.countries--second {
+  flex-direction: row-reverse;
+  align-items: flex-end;
+}
+.countries--third {
+  align-items: flex-start;
+}
+.countries--third .country--brazil {
+  align-self: flex-end;
+}
+.countries--fourth {
+  flex-direction: column;
+  align-items: center;
+}
+.countries--fourth .country--brazil,
+.countries--fourth .country--croatia,
+.countries--fourth .country--uganda {
+  align-self: flex-end;
+}
+.countries--fifth {
+  flex-direction: column-reverse;
+  align-items: flex-end;
+  justify-content: space-around;
+}
+.countries--fifth .country--uganda {
+  align-self: center;
+}
+.countries--fifth .country--laos {
+  order: 1;
+}
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 */
+@media screen and (min-width: 480px) {
+  .site-header__nav {
+    display: flex;
+    flex-direction: row;
+  }
+}
+@media screen and (min-width: 700px) {
+  .site-header {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+}
+@media screen and (min-width: 992px) {
+  .site-header {
+    justify-content: space-between;
+    align-items: center;
+  }
+}
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>

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

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
@@ -37,7 +37,14 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
         <div class="checkout">
           <h2 class="checkout__title">Checkout</h2>
           <form method="GET" id="checkout-form" class="checkout__form">
-            <!-- Add the form fields here -->
+            <label for="username">Name</label>
+            <input id="username" type="text" name="uid" />
+
+            <label for="email">Email</label>
+            <input id="email" type="text" name="email" />
+
+            <label for="customer-phone">Phone</label>
+            <input id="customer-phone" type="text" name="customer-phone" />
 
             <button type="submit">Complete Purchase</button>
           </form>

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 for="Comment">Add your Message</label>
+            <textarea name="Comment"></textarea>
+            <button type="submit">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,29 @@ <h1>CodeYourFuture Summit</h1>
         </p>
 
         <form>
-          <!-- Your multiple choice goes here -->
+          <fieldset>
+            <legend>Please select all of your dietary requirements</legend>
+            <label>
+              <input type="checkbox" name="dietary" id="halal" />
+              Halal
+            </label>
+            <label>
+              <input type="checkbox" name="dietary" id="kosher" />
+              kosher
+            </label>
+            <label>
+              <input type="checkbox" name="dietary" id="vegetarian" />
+              Vegetarian
+            </label>
+            <label>
+              <input type="checkbox" name="dietary" id="vegan" />
+              Vegan
+            </label>
+            <label>
+              <input type="checkbox" name="dietary" id="gluten-free" />
+              Gluten Free
+            </label>
+          </fieldset>
           <button type="submit">Submit</button>
         </form>
       </main>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,9 @@ @@
               <p class="message__content">
                 I can meet on Tuesday and Wednesday after 4.
               </p>
+              <p class="message__content">
+.15pm
+              </p>
             </div>
           </div>
         </div>
@@ Expand Down @@