Codi-T03 · Fatenkh7 · 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/1-parent-child/index.html b/part-1/1-parent-child/index.html
diff --git a/part-1/1-parent-child/readme.md b/part-1/1-parent-child/readme.md
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/7-css-box/styles.css b/part-1/7-css-box/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/week-1/1-parent-child b/week-1/1-parent-child
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,19 @@
         <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://google/maps/aza4h9nUBhn">iCafe</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"
+              alt="See You Soon!"
+            />
           </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
@@ -11,31 +11,43 @@
   </head>
 
   <body>
+  <header role="banner">
     <div class="site-wrapper">
       <div class="site-header">
         <div class="site-header__title">Messages</div>
       </div>
+    </header>
+    <main role="main">
       <div class="messages">
-        <div class="message">
+        <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">
+          <span class="message__time">
+            <time datetime="2018-03-25">Mar 25, 2018</time> 
+            <time datetime="19:25">7:25pm</time></span>
+        </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
+            Let's meet at the iCafe in Merchant City.
+            <a href="https://google/maps/aza4h9nUBhn" target="_blank">iCafe</a>
           </p>
-          <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+          <span class="message__time">
+            <time datetime="2018-03-25">Mar 25, 2018 </time>
+            <time datetime="19:35">7:35pm</time></span>
+        </article>
+        <article 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" alt="See You Soon!">
           </p>
-          <span class="message__time">Mar 25, 2018 7:38pm</span>
-        </div>
+          <span class="message__time">
+            <time datetime="2018-03-25">Mar 25, 2018 </time>
+            <time datetime="19:38">7::38pm</time></span>
+        </article>
       </div>
+    </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
@@ -2,8 +2,7 @@
 body,
 html {
   background: #25262f;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu",
-    "Cantarell", "Helvetica Neue", sans-serif;
+  font-family:"apple-system, BlinkMacSystemFont, egoe UI, Roboto, Oxygen-Sans, Ubuntu, Cantarell, Helvetica Neue, sans-serif";
   font-size: 16px;
   line-height: 1.5em;
 }

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,34 +4,41 @@
     <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="missing-styles.css">
   </head>
 
   <body>
+    <header role="banner">
     <div class="site-wrapper">
       <div class="site-header">
         <div class="site-header__title">Messages</div>
       </div>
+    </header>
+    <main role="main">
       <div class="messages">
-        <div class="message">
+        <article class="message">
           <div class="message__author">Won</div>
           <p class="message__content">Where should we meet later?</p>
-          <time class="message__time">7:25pm</time>
-        </div>
-        <div class="message">
+          <time class="message__time" datetime="19:25">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
+            Let's meet at the iCafe in Merchant City. 
+            <a href="https://google/maps/aza4h9nUBhn.com">iCafe</a>
           </p>
           <time class="message__time">7:35pm</time>
-        </div>
-        <div class="message">
+        </article>
+        <article class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
-            No, I prefer the one on Sauchiehall Street. https://goo.gl/maps/wKDoARcHDp42
+            No, I prefer the one on Sauchiehall Street. 
+            <a href="https://google/maps/wKDoARcHDp42.com">Sauchiehall</a>
           </p>
-          <time class="message__time">7:38pm</time>
-        </div>
+          <time class="message__time" datetime="19:38">7:38pm</time>
+        </article>
       </div>
-    </div>
+    </main>
+    <script src="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
@@ -20,21 +20,26 @@
         <div id="first-message">
           <div class="message__author">Won</div>
           <p class="message__content">Where should we meet later?</p>
-          <time class="message__time">7:25pm</time>
+          <time class="message__time" datetime="19:25">7:25pm</time>
         </div>
         <article>
           <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>
-          <time class="message__time">7:35pm</time>
+          <time class="message__time" datetime="19:35">7:35pm</time>
         </article>
         <div class="message--latest">
           <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"
+              alt="See You Soon!"
+            />
           </p>
-          <time class="message__time">7:38pm</time>
+          <time class="message__time" datetime="19:38">7:38pm</time>
         </div>
       </div>
     </div>

diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
@@ -0,0 +1,11 @@
+/* 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,19 @@
+/* Add your CSS code below */
+
+a {
+  font-weight: bold;
+  color: red;
+  text-decoration: none;
+}
+.message__time {
+  font-size: 0.9rem;
+}
+.message--unread {
+  border-left: 5px solid blue;
+}
+.message:first-child {
+  opacity: 0.5;
+}
+.message {
+  line-height: 50px;
+}
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/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -0,0 +1,24 @@
+/* Try different box model properties below */
+.pages__page {
+  border: 1px solid black;
+  border-radius: 0px;
+  background: #fff;
+  margin-top: 7px;
+  margin: 9px;
+  padding: 9px;
+  padding-top: 0px;
+  padding-bottom: 1px;
+}
+.countries {
+  padding: 2px;
+  width: 100%;
+  height: 100%;
+}
+.countries .country {
+  margin: 5px;
+  padding: 20px;
+  border: 1px solid red;
+}
+.site-wrapper {
+  padding: 20px;
+}
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,13 @@
+/* Try different box model properties below */
+.site-header p:nth-child(2) {
+  color: white;
+  justify-content: space-between;
+  margin-bottom: 0px;
+}
+.site-footer {
+  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,11 @@
+/* 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/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,16 @@
+/* Add your own CSS code below */
+.countries {
+  display: flex;
+}
+
+.countries--first {
+  flex-direction: row-reverse;
+}
+
+.countries--second {
+  flex-direction: column;
+}
+
+.countries--third {
+  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
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