Codi-T03 · emilekanaan · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,8 +38,8 @@
     "serve": "live-server"
   },
   "devDependencies": {
-    "live-server": "^1.2.1",
     "husky": "^0.14.3",
+    "live-server": "^1.1.0",
     "prettier": "^1.14.2",
     "pretty-quick": "^1.6.0"
   }

diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css
diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css
diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css
diff --git a/part-2/10-media-queries/columns.css b/part-2/10-media-queries/columns.css
diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css
diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css
diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css
diff --git a/part-2/14-order/flexbox.css b/part-2/14-order/flexbox.css
diff --git a/part-2/15-align-self/flexbox.css b/part-2/15-align-self/flexbox.css
diff --git a/part-2/16-more-flexbox/flexbox.css b/part-2/16-more-flexbox/flexbox.css
diff --git a/part-2/17-nav-menu/styles.css b/part-2/17-nav-menu/styles.css
diff --git a/part-1/1-parent-child/index.html → week-1/1-parent-child/index.html b/part-1/1-parent-child/index.html → 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/part-1/1-parent-child/readme.md → week-1/1-parent-child/readme.md b/part-1/1-parent-child/readme.md → week-1/1-parent-child/readme.md
diff --git a/part-1/2-html-attributes/index.html → week-1/2-html-attributes/index.html b/part-1/2-html-attributes/index.html → 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/part-1/2-html-attributes/readme.md → week-1/2-html-attributes/readme.md b/part-1/2-html-attributes/readme.md → week-1/2-html-attributes/readme.md
diff --git a/part-1/3-semantic-html/index.html → week-1/3-semantic-html/index.html b/part-1/3-semantic-html/index.html → 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-03-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-03-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-03-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/part-1/3-semantic-html/readme.md → week-1/3-semantic-html/readme.md b/part-1/3-semantic-html/readme.md → week-1/3-semantic-html/readme.md
diff --git a/...-1/4-links-scripts/css/missing-styles.css → ...-1/4-links-scripts/css/missing-styles.css b/...-1/4-links-scripts/css/missing-styles.css → ...-1/4-links-scripts/css/missing-styles.css
diff --git a/part-1/4-links-scripts/index.html → week-1/4-links-scripts/index.html b/part-1/4-links-scripts/index.html → 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/part-1/4-links-scripts/js/convertUrls.js → week-1/4-links-scripts/js/convertUrls.js b/part-1/4-links-scripts/js/convertUrls.js → week-1/4-links-scripts/js/convertUrls.js
diff --git a/part-1/4-links-scripts/readme.md → week-1/4-links-scripts/readme.md b/part-1/4-links-scripts/readme.md → week-1/4-links-scripts/readme.md
diff --git a/part-1/5-css-selectors/index.html → week-1/5-css-selectors/index.html b/part-1/5-css-selectors/index.html → week-1/5-css-selectors/index.html
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
@@ -0,0 +1,12 @@
+/* Add your CSS code below */
+#first-message {
+  background-color: red;
+}
+
+article {
+  background-color: cadetblue;
+}
+
+.message--latest {
+  background-color: yellow;
+}
diff --git a/part-1/5-css-selectors/readme.md → week-1/5-css-selectors/readme.md b/part-1/5-css-selectors/readme.md → week-1/5-css-selectors/readme.md
diff --git a/part-1/6-css-properties/index.html → week-1/6-css-properties/index.html b/part-1/6-css-properties/index.html → week-1/6-css-properties/index.html
diff --git a/part-1/6-css-properties/readme.md → week-1/6-css-properties/readme.md b/part-1/6-css-properties/readme.md → week-1/6-css-properties/readme.md
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
@@ -0,0 +1,22 @@
+/* Add your CSS code below */
+a {
+  color: red;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+.message__time {
+  font-size: 0.9rem;
+}
+
+.message--unread {
+  border-left: 5px solid blue;
+}
+
+.message__time--old {
+  opacity: 0.5;
+}
+
+.message__content {
+  line-height: 2pc;
+}
diff --git a/part-1/7-css-box/index.html → week-1/7-css-box/index.html b/part-1/7-css-box/index.html → week-1/7-css-box/index.html
diff --git a/part-1/7-css-box/readme.md → week-1/7-css-box/readme.md b/part-1/7-css-box/readme.md → week-1/7-css-box/readme.md
diff --git a/part-1/7-css-box/styles.css → week-1/7-css-box/styles.css b/part-1/7-css-box/styles.css → week-1/7-css-box/styles.css
@@ -3,4 +3,13 @@
   border: 1px solid #4491db;
   border-radius: 4px;
   background: #fff;
+  width: 100%;
+  height: 100%;
+  margin: 5px;
+  padding: 2px 5px;
+}
+
+.pages__showing {
+  padding: 0 5px;
+  margin: 0 5px;
 }
diff --git a/part-1/8-advanced-selectors/index.html → week-1/8-advanced-selectors/index.html b/part-1/8-advanced-selectors/index.html → week-1/8-advanced-selectors/index.html
diff --git a/part-1/8-advanced-selectors/readme.md → week-1/8-advanced-selectors/readme.md b/part-1/8-advanced-selectors/readme.md → week-1/8-advanced-selectors/readme.md
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
@@ -0,0 +1,14 @@
+/* Try different box model properties below */
+.site-header p {
+  color: white;
+  margin-bottom: 0;
+}
+
+.site-footer p {
+  font-size: 12px;
+  text-align: center;
+}
+
+.message:last-child {
+  box-shadow: 4px 4px 0 #dba944;
+}
diff --git a/part-1/9-git-branch/index.html → week-1/9-git-branch/index.html b/part-1/9-git-branch/index.html → week-1/9-git-branch/index.html
diff --git a/part-1/9-git-branch/readme.md → week-1/9-git-branch/readme.md b/part-1/9-git-branch/readme.md → week-1/9-git-branch/readme.md
diff --git a/part-1/9-git-branch/styles.css → week-1/9-git-branch/styles.css b/part-1/9-git-branch/styles.css → week-1/9-git-branch/styles.css
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
@@ -0,0 +1,12 @@
+/* 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/part-2/10-media-queries/index.html → week-2/10-media-queries/index.html b/part-2/10-media-queries/index.html → week-2/10-media-queries/index.html
diff --git a/part-2/10-media-queries/readme.md → week-2/10-media-queries/readme.md b/part-2/10-media-queries/readme.md → week-2/10-media-queries/readme.md
diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
@@ -0,0 +1,10 @@
+/* Add your own CSS code below */
+.container {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+.countries--third .container {
+  display: flex;
+  flex-direction: column-reverse;
+}
diff --git a/part-2/11-flexbox/index.html → week-2/11-flexbox/index.html b/part-2/11-flexbox/index.html → week-2/11-flexbox/index.html
@@ -25,11 +25,13 @@ <h1 class="site-header__title">Exercises</h1>
         <div class="exercise">
           <h2 class="exercise__title">First</h2>
           <ul class="countries countries--first">
-            <li class="country">1. Brazil</li>
-            <li class="country">2. Croatia</li>
-            <li class="country">3. Ethiopia</li>
-            <li class="country">4. Laos</li>
-            <li class="country">5. Uganda</li>
+            <div class="container">
+              <li class="country">1. Brazil</li>
+              <li class="country">2. Croatia</li>
+              <li class="country">3. Ethiopia</li>
+              <li class="country">4. Laos</li>
+              <li class="country">5. Uganda</li>
+            </div>
           </ul>
         </div>
         <div class="solution">
@@ -57,11 +59,13 @@ <h3 class="solution__title">Solution</h3>
         <div class="exercise">
           <h2 class="exercise__title">Third</h2>
           <ul class="countries countries--third">
-            <li class="country">1. Brazil</li>
-            <li class="country">2. Croatia</li>
-            <li class="country">3. Ethiopia</li>
-            <li class="country">4. Laos</li>
-            <li class="country">5. Uganda</li>
+            <div class="container">
+              <li class="country">1. Brazil</li>
+              <li class="country">2. Croatia</li>
+              <li class="country">3. Ethiopia</li>
+              <li class="country">4. Laos</li>
+              <li class="country">5. Uganda</li>
+            </div>
           </ul>
         </div>
         <div class="solution">

diff --git a/part-2/11-flexbox/readme.md → week-2/11-flexbox/readme.md b/part-2/11-flexbox/readme.md → week-2/11-flexbox/readme.md
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
@@ -0,0 +1,26 @@
+.countries {
+  display: flex;
+}
+
+.countries--second .country {
+  padding: 0.5em;
+}
+
+/* Add your own CSS code below */
+.countries--first {
+  justify-content: end;
+}
+
+.countries--second {
+  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/part-2/12-justify-content/index.html → week-2/12-justify-content/index.html b/part-2/12-justify-content/index.html → week-2/12-justify-content/index.html
diff --git a/part-2/12-justify-content/readme.md → week-2/12-justify-content/readme.md b/part-2/12-justify-content/readme.md → week-2/12-justify-content/readme.md
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
@@ -0,0 +1,22 @@
+.countries {
+  display: flex;
+}
+/* Add your own CSS code below */
+.countries--first {
+  align-items: center;
+}
+
+.countries--second {
+  align-items: flex-end;
+  flex-direction: row-reverse;
+}
+
+.countries--third {
+  align-items: flex-end;
+  flex-direction: column;
+}
+
+.countries--fourth {
+  align-items: center;
+  flex-direction: column-reverse;
+}
diff --git a/part-2/13-align-items/index.html → week-2/13-align-items/index.html b/part-2/13-align-items/index.html → week-2/13-align-items/index.html
diff --git a/part-2/13-align-items/readme.md → week-2/13-align-items/readme.md b/part-2/13-align-items/readme.md → week-2/13-align-items/readme.md
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
@@ -0,0 +1,36 @@
+.countries {
+  display: flex;
+}
+
+/* Add your own CSS code below */
+.countries--first .country--brazil {
+  order: 5;
+}
+
+.countries--second .country--brazil {
+  order: 3;
+}
+
+.countries--second .country--uganda {
+  order: 5;
+}
+
+.countries--third .country--brazil {
+  order: 5;
+}
+
+.countries--third .country--croatia {
+  order: 4;
+}
+
+.countries--third .country--ethiopia {
+  order: 3;
+}
+
+.countries--third .country--laos {
+  order: 2;
+}
+
+.countries--third .country--uganda {
+  order: 1;
+}
diff --git a/part-2/14-order/index.html → week-2/14-order/index.html b/part-2/14-order/index.html → week-2/14-order/index.html
diff --git a/part-2/14-order/readme.md → week-2/14-order/readme.md b/part-2/14-order/readme.md → week-2/14-order/readme.md
-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 @@