coditech · JanaSaker · 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
@@ -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,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>in 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/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
@@ -11,33 +11,37 @@
   </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>
+          <span class="message__time"
+            ><time datetime="2018-03-25T19:35:00">Mar 25, 2018 7:35pm</time></span
+          >
+        </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>
+          <span class="message__time"
+            ><time datetime="2018-03-25T19:38:00">Mar 25, 2018 7:38pm</time></span
+          >
+        </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" type="text/css" href="css/missing-styles.css" />
   </head>
 
   <body>
@@ -33,5 +34,7 @@
         </div>
       </div>
     </div>
+    <h2>hello test</h2>
+    <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,18 @@
 /* Add your CSS code below */
+a {
+  font-weight: bold;
+  text-decoration: none;
+  color: red;
+}
+.message__time {
+  font-size: 0.9rem;
+}
+.message--unread {
+  border-left: 2px solid blue;
+}
+.message:first-child {
+  opacity: 0.5;
+}
+.message__content {
+  padding-bottom: 3cm;
+}
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -1,6 +1,12 @@
 /* Try different box model properties below */
 .pages__page {
-  border: 1px solid #4491db;
+  border: 1px solid #26a56a;
   border-radius: 4px;
-  background: #fff;
+  background: #c56c6c;
+}
+.country {
+  width: 410px;
+  padding: 10px;
+  border: 1px solid #4491db;
+  margin: 0px;
 }
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 */
+body > div > div > div + p {
+  color: white;
+  margin-bottom: 0px;
+}
+.site-footer > p {
+  text-align: center;
+  font-size: 12px;
+}
+.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,12 @@
 /* Add your own CSS code below */
+@media only screen and (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+
+@media only 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,15 @@
 /* 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,17 @@
 }
 
 /* Add your own CSS code below */
+.countries--second {
+  justify-content: space-evenly;
+}
+.countries--first {
+  justify-content: flex-end;
+}
+.countries--third {
+  flex-direction: column;
+  justify-content: flex-end;
+}
+.countries--fourth {
+  flex-direction: column-reverse;
+  justify-content: space-evenly;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
@@ -2,3 +2,17 @@
   display: flex;
 }
 /* Add your own CSS code below */
+.countries--first {
+  align-items: center;
+}
+.countries--second {
+  align-items: flex-end;
+}
+.countries--third {
+  align-items: flex-end;
+  flex-direction: column;
+}
+.countries--fourth {
+  align-items: center;
+  flex-direction: column-reverse;
+}
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
@@ -1,5 +1,40 @@
 .countries {
   display: flex;
 }
-
 /* Add your own CSS code below */
+.countries--first .country--brazil {
+  order: 5;
+}
+.countries--first .countries--second .country--croatia {
+  order: 1;
+}
+.countries--first.countries--second .country--ethiopia {
+  order: 2;
+}
+.countries--first .countries--second .country--laos {
+  order: 3;
+}
+.countries--first .country--uganda {
+  order: 4;
+}
+.countries--second .country--brazil {
+  order: 4;
+}
+.countries--second .country--uganda {
+  order: 5;
+}
+.countries--third .country--uganda {
+  order: 1;
+}
+.countries--third .country--laos {
+  order: 2;
+}
+.countries--third .country--ethiopia {
+  order: 3;
+}
+.countries--third .country--croatia {
+  order: 4;
+}
+.countries--third .country--brazil {
+  order: 5;
+}
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
@@ -3,3 +3,54 @@
 }
 
 /* Add your own CSS code below */
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+.countries--second .country--ethiopia {
+  align-self: flex-end;
+}
+.countries--second .country--brazil {
+  align-self: center;
+}
+.countries--second .country--croatia {
+  align-self: center;
+}
+.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;
+}
+.countries--fourth .country--brazil {
+  align-self: flex-start;
+}
+.countries--fourth .country--croatia {
+  align-self: flex-start;
+}
+.countries--fourth .country--ethiopia {
+  align-self: flex-start;
+}
+.countries--fourth .country--laos {
+  align-self: flex-start;
+}
+.countries--fourth .country--uganda {
+  align-self: center;
+}
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,40 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  align-items: flex-end;
+  justify-content: flex-end;
+}
+.countries--second {
+  align-items: flex-end;
+  flex-direction: row-reverse;
+}
+.countries--third {
+  align-items: flex-start;
+}
+.countries--third .country--brazil {
+  align-self: flex-end;
+}
+.countries--fourth {
+  flex-direction: column;
+  justify-content: center;
+  align-items: last baseline;
+}
+.countries--fourth .country--ethiopia {
+  align-self: center;
+}
+.countries--fourth .country--laos {
+  align-self: center;
+}
+.countries--fifth {
+  flex-direction: column-reverse;
+  justify-content: flex-end;
+  align-items: last baseline;
+  justify-content: space-between;
+}
+.countries--fifth .country--laos {
+  order: 1;
+}
+.countries--fifth .country--uganda {
+  align-self: center;
+}
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
@@ -1 +1,31 @@
 /* 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;
+    align-items: center;
+    justify-content: space-between;
+    flex-direction: row;
+  }
+}
+@media screen and (min-width: 992px) {
+  .site-header {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .site-header__nav {
+    display: flex;
+    justify-content: center;
+  }
+
+  .site-header__checkout {
+    margin-left: auto;
+  }
+}
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;
 }
-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 @@