Codi-B07 · Anthony-Karam · May 13, 2021 · May 13, 2021 · May 13, 2021 · May 13, 2021
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,46 +1,46 @@
 {
-  "name": "html-css-git-exercises",
-  "version": "1.0.0",
-  "description": "HTML, CSS and Git exercises for Codi",
-  "author": "Codi",
-  "license": "ISC",
-  "scripts": {
-    "1": "live-server --open=week-1/1-parent-child",
-    "2": "live-server --open=week-1/2-html-attributes",
-    "3": "live-server --open=week-1/3-semantic-html",
-    "4": "live-server --open=week-1/4-links-scripts",
-    "5": "live-server --open=week-1/5-css-selectors",
-    "6": "live-server --open=week-1/6-css-properties",
-    "7": "live-server --open=week-1/7-css-box",
-    "8": "live-server --open=week-1/8-advanced-selectors",
-    "9": "live-server --open=week-1/9-git-branch",
-    "10": "live-server --open=week-2/10-media-queries",
-    "11": "live-server --open=week-2/11-flexbox",
-    "12": "live-server --open=week-2/12-justify-content",
-    "13": "live-server --open=week-2/13-align-items",
-    "14": "live-server --open=week-2/14-order",
-    "15": "live-server --open=week-2/15-align-self",
-    "16": "live-server --open=week-2/16-more-flexbox",
-    "17": "live-server --open=week-2/17-nav-menu",
-    "18": "live-server --open=week-2/18-git-merge",
-    "19": "live-server --open=week-3/19-search",
-    "20": "live-server --open=week-3/20-labels",
-    "21": "live-server --open=week-3/21-buttons",
-    "22": "live-server --open=week-3/22-checkout",
-    "23": "live-server --open=week-3/23-comments",
-    "24": "live-server --open=week-3/24-dietary",
-    "25": "live-server --open=week-3/25-shirt-size",
-    "26": "live-server --open=week-3/26-checkout-groups",
-    "27": "live-server --open=week-3/27-attributes",
-    "28": "live-server --open=week-3/28-git-conflict",
-    "29": "live-server --open=week-3/29-combined-skills",
-    "precommit": "pretty-quick --staged --verbose",
-    "serve": "live-server"
-  },
-  "devDependencies": {
-    "live-server": "^1.2.1",
-    "husky": "^0.14.3",
-    "prettier": "^1.14.2",
-    "pretty-quick": "^1.6.0"
-  }
-}
+    "name": "html-css-git-exercises",
+    "version": "1.0.0",
+    "description": "HTML, CSS and Git exercises for Codi",
+    "author": "Codi",
+    "license": "ISC",
+    "scripts": {
+        "1": "live-server --open=part-1/1-parent-child",
+        "2": "live-server --open=part-1/2-html-attributes",
+        "3": "live-server --open=part-1/3-semantic-html",
+        "4": "live-server --open=part-1/4-links-scripts",
+        "5": "live-server --open=part-1/5-css-selectors",
+        "6": "live-server --open=part-1/6-css-properties",
+        "7": "live-server --open=part-1/7-css-box",
+        "8": "live-server --open=part-1/8-advanced-selectors",
+        "9": "live-server --open=part-1/9-git-branch",
+        "10": "live-server --open=part-2/10-media-queries",
+        "11": "live-server --open=part-2/11-flexbox",
+        "12": "live-server --open=part-2/12-justify-content",
+        "13": "live-server --open=part-2/13-align-items",
+        "14": "live-server --open=part-2/14-order",
+        "15": "live-server --open=part-2/15-align-self",
+        "16": "live-server --open=part-2/16-more-flexbox",
+        "17": "live-server --open=part-2/17-nav-menu",
+        "18": "live-server --open=part-2/18-git-merge",
+        "19": "live-server --open=part-3/19-search",
+        "20": "live-server --open=part-3/20-labels",
+        "21": "live-server --open=part-3/21-buttons",
+        "22": "live-server --open=part-3/22-checkout",
+        "23": "live-server --open=part-3/23-comments",
+        "24": "live-server --open=part-3/24-dietary",
+        "25": "live-server --open=part-3/25-shirt-size",
+        "26": "live-server --open=part-3/26-checkout-groups",
+        "27": "live-server --open=part-3/27-attributes",
+        "28": "live-server --open=part-3/28-git-conflict",
+        "29": "live-server --open=part-3/29-combined-skills",
+        "precommit": "pretty-quick --staged --verbose",
+        "serve": "live-server"
+    },
+    "devDependencies": {
+        "live-server": "^1.2.1",
+        "husky": "^0.14.3",
+        "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
@@ -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/2-html-attributes/index.html b/part-1/2-html-attributes/index.html
@@ -23,14 +23,15 @@
         <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" alt="" />
           </p>
           <span class="message__time">7:38pm</span>
         </div>

diff --git a/part-1/3-semantic-html/index.html b/part-1/3-semantic-html/index.html
@@ -12,30 +12,40 @@
 
   <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">
+        <!-- <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">Mar 25, 2018 7:25pm</span> -->
+          <span class="message__time"><time datetime="2018-04-25T19:35">7:35pm</time></span>
+          <!-- </div> -->
+        </article>
+        <article class="message">
+          <!-- <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
           </p>
-          <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+          <span class="message__time"><time datetime="2018-04-25T19:35">7:35pm</time></span>
+          <!-- </div> -->
+        </article>
+        <article class="message">
+          <!-- <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>
+          <span class="message__time"><time datetime="2018-04-25T19:38">7:38pm</time></span>
+          <!-- <span class="message__time">Mar 25, 2018 7:38pm</span> -->
+          <!-- </div> -->
+        </article>
+        <!-- </div> -->
+      </main>
       <div id="result" class="result"></div>
     </div>
     <script defer src="/js/3-result.js"></script>

diff --git a/part-1/4-links-scripts/index.html b/part-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 type="text/javascript" src="./js/convertUrls.js"></script>
   </body>
 </html>
diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,11 @@
 /* Add your CSS code below */
+#first-message {
+  background: red;
+}
+
+.messages article {
+  background: cadetblue;
+}
+.message--latest {
+  background: yellow;
+}
diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css
@@ -1 +1,21 @@
 /* Add your CSS code below */
+
+.message__content {
+  font-weight: bold;
+  color: red;
+  font-size: 0.9rem;
+  line-height: 2.5;
+}
+
+.message__content a {
+  text-decoration: none;
+}
+
+.message--unread {
+  border-left: 5px solid blue;
+}
+
+.messages div:first-of-type {
+  opacity: 0.5;
+  /* background: brown; */
+}
diff --git a/part-1/7-css-box/styles.css b/part-1/7-css-box/styles.css
@@ -1,6 +1,11 @@
 /* Try different box model properties below */
+
 .pages__page {
   border: 1px solid #4491db;
-  border-radius: 4px;
-  background: #fff;
+  border-radius: 40px;
+  background: rgb(211, 211, 211);
+}
+
+.country {
+  margin: 1rem auto;
 }
diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css
@@ -1 +1,16 @@
 /* Try different box model properties below */
+
+.site-header__title + p {
+  color: white;
+  margin-bottom: 0px;
+}
+
+.site-footer p {
+  font-size: 12px;
+  text-align: center;
+  /* color: yellow; */
+}
+
+.messages div:last-child {
+  box-shadow: 4px 4px 0 #dba944;
+}
diff --git a/part-2/10-media-queries/columns.css b/part-2/10-media-queries/columns.css
@@ -1 +1,13 @@
 /* Add your own CSS code below */
+
+@media (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+
+@media (min-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}
diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css
@@ -1 +1,11 @@
 /* Add your own CSS code below */
+
+.countries--first {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+.countries--third {
+  display: flex;
+  flex-direction: column-reverse;
+}
diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css
@@ -7,3 +7,25 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--first {
+  justify-content: end;
+  margin-right: 120px;
+}
+
+.countries--second {
+  justify-content: space-evenly;
+  width: 80%;
+}
+
+.countries--third {
+  flex-direction: column;
+  justify-content: flex-end;
+  width: 75%;
+}
+
+.countries--fourth {
+  flex-direction: column-reverse;
+  justify-content: space-evenly;
+  width: 75%;
+}
diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css
@@ -1,4 +1,25 @@
 .countries {
   display: flex;
 }
+
 /* Add your own CSS code below */
+
+.countries--first {
+  align-items: center;
+  width: 78%;
+}
+
+.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;
+}
-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 @@