Codi-B07 · Ibrahim1996-serhane · May 13, 2021 · May 14, 2021 · May 14, 2021 · May 14, 2021
diff --git a/css/message.css b/css/message.css
@@ -2,8 +2,8 @@
 .message {
   margin: 1rem 3rem 1rem 1rem;
   padding: 0.5rem;
-  font-size: 14px;
-  line-height: 1.8em;
+  font-size: 23px;
+  line-height: 2.8em;
   border-radius: 2px;
   background: #fff;
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.1);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,35 +5,35 @@
   "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",
+    "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"
   },

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
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>2. HTML Attributes - HTML, CSS and Git Exercises</title>
+    <title>2. HTML Attributes - HTML, CSS and Git Exercise</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" href="/css/normalize.css" />
     <link rel="stylesheet" href="/css/week1.css" />
@@ -23,14 +23,20 @@
         <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://goo.gl/maps/aza4h9nUBhn">https://goo.gl/maps/aza4h9nUBhn</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
+            <img
+              src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif"
+              alt="Ok! "
+              width="300"
+              height="300"
+            />
           </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,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/4-links-scripts/index.html b/part-1/4-links-scripts/index.html
@@ -4,8 +4,11 @@
     <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>
-
+  <script src="js/convertUrls.js">
+    alert("This alert box was called with onload event")
+  </script>
   <body>
     <div class="site-wrapper">
       <div class="site-header">

diff --git a/part-1/5-css-selectors/index.html b/part-1/5-css-selectors/index.html
@@ -23,11 +23,13 @@
           <time class="message__time">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
-          </p>
-          <time class="message__time">7:35pm</time>
+          <div class="second--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>
+            <time class="message__time">7:35pm</time>
+          </div>
         </article>
         <div class="message--latest">
           <div class="message__author">Won</div>

diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,10 @@
-/* Add your CSS code below */
+#first-message {
+  background-color: red;
+}
+.message--latest {
+  background-color: yellow;
+}
+
+.second--message {
+  background-color: cadetblue;
+}
diff --git a/part-1/6-css-properties/index.html b/part-1/6-css-properties/index.html
@@ -19,7 +19,7 @@
         <div class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
-            Where should we meet tomorrrow?
+            Where should we meet tomorrrow ?
           </p>
           <time class="message__time message__time--old">Yesterday, 7:25pm</time>
         </div>

diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css
@@ -1 +1,22 @@
 /* Add your CSS code below */
+.messages {
+  text-decoration: none;
+  color: red;
+  font-weight: bold;
+  font-size: 0.9rem;
+}
+a,
+a:hover,
+a:focus,
+a:active {
+  text-decoration: none;
+  color: inherit;
+}
+div.message.message--unread {
+  border-left-style: solid;
+  border-left-color: coral;
+}
+time.message__time.message__time--old {
+  background-color: red;
+  opacity: 0.2;
+}
diff --git a/part-1/7-css-box/index.html b/part-1/7-css-box/index.html
@@ -14,7 +14,7 @@
       <div class="site-header">
         <div class="site-header__title">Countries</div>
       </div>
-      <ul class="countries">
+      <ul class="countries ">
         <li class="country">Afghanistan</li>
         <li class="country">Albania</li>
         <li class="country">Algeria</li>

diff --git a/part-1/7-css-box/styles.css b/part-1/7-css-box/styles.css
@@ -1,6 +1,16 @@
 /* Try different box model properties below */
 .pages__page {
-  border: 1px solid #4491db;
-  border-radius: 4px;
+  border: 3px solid #4491db;
+  border-radius: 8px;
   background: #fff;
 }
+.country {
+  margin: 2px 0;
+  padding: 0.6rem;
+  background: #fff;
+}
+.countries {
+  margin: 4;
+  padding: 1rem;
+  list-style: none;
+}
diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css
@@ -1 +1,10 @@
 /* Try different box model properties below */
+.site-header p {
+  color: white;
+  margin-bottom: 0rem;
+}
+.site-footer p {
+  font-size: 12px;
+  text-align: center;
+  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,14 @@
 /* Add your own CSS code below */
+[class*="columns-"] {
+  width: 100%;
+}
+@media screen and (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+@media screen and (min-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}
diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css
@@ -1 +1,9 @@
 /* Add your own CSS code below */
+.countries--first {
+  flex-direction: row-reverse;
+  display: flex;
+}
+.countries--third {
+  flex-direction: column-reverse;
+  display: flex;
+}
diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css
@@ -7,3 +7,17 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  justify-content: right;
+}
+.countries--second {
+  justify-content: space-around;
+}
+.countries--tall.countries--third {
+  justify-content: inherit;
+  flex-direction: column-reverse;
+}
+.countries--tall.countries--fourth {
+  justify-content: space-around;
+  flex-direction: column-reverse;
+}
diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css
@@ -1,4 +1,26 @@
 .countries {
   display: flex;
 }
+
+.countries--second .country {
+  padding: 0.5em;
+}
+
 /* Add your own CSS code below */
+.countries--first {
+  align-items: center;
+}
+.countries--second {
+  align-items: flex-end;
+  justify-content: right;
+  flex-direction: row-reverse;
+  font-size: larger;
+}
+.countries--tall.countries--third {
+  flex-direction: column;
+  align-items: flex-end;
+}
+.countries--tall.countries--fourth {
+  flex-direction: column-reverse;
+  align-items: center;
+}
diff --git a/part-2/14-order/flexbox.css b/part-2/14-order/flexbox.css
@@ -2,4 +2,17 @@
   display: flex;
 }
 
-/* Add your own CSS code below */
+.countries--first .country--brazil {
+  order: 1;
+}
+
+.countries--second .country--brazil {
+  order: 1;
+}
+.countries--second .country--uganda {
+  order: 1;
+}
+.countries--third {
+  flex-direction: row-reverse;
+  justify-content: left;
+}
-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 @@