Nancy rahhal

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"
   },

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>

part-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>

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 class="message__time" datetime="2018-03-25 19:25">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 class="message__time" datetime="2018-03-25 19:35">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 class="message__time" datetime="2018-03-25 19:38">Mar 25, 2018 7:38pm</time>
+        </article>
+      </main>
       <div id="result" class="result"></div>
     </div>
     <script defer src="/js/3-result.js"></script>

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="/part-1/4-links-scripts/css/missing-styles.css" />
   </head>
 
   <body>
@@ -33,5 +34,6 @@
         </div>
       </div>
     </div>
+    <script defer src="/part-1/4-links-scripts/js/convertUrls.js"></script>
   </body>
 </html>

part-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;
+}

part-1/6-css-properties/styles.css

@@ -1 +1,21 @@
 /* Add your CSS code below */
+a {
+  color: red;
+  text-decoration: none;
+  font-weight: bold;
+}
+
+.message__time {
+  font-size: 0.9rem;
+}
+
+.message.message--unread {
+  border-left-style: solid;
+  border-left-color: blue;
+}
+.message__time--old {
+  opacity: 0.5;
+}
+.message {
+  line-height: 3;
+}

part-1/7-css-box/styles.css

@@ -1,6 +1,18 @@
 /* Try different box model properties below */
 .pages__page {
-  border: 1px solid #4491db;
-  border-radius: 4px;
-  background: #fff;
+  border: 3px solid #4491db;
+  border-radius: 3px;
+  background: gray;
+}
+.country {
+  margin: 2px;
+}
+
+.pages__showing {
+  padding-top: 0;
+}
+
+.countries {
+  padding: 6px;
+  padding-right: 3px;
 }

part-1/8-advanced-selectors/styles.css

@@ -1 +1,13 @@
 /* Try different box model properties below */
+.site-header > p {
+  color: white;
+  margin-bottom: 0;
+}
+
+.site-footer p {
+  text-align: center;
+  font-size: 12px;
+}
+.message:last-child {
+  box-shadow: 4px 4px 0 #dba944;
+}

part-2/10-media-queries/columns.css

@@ -1 +1,12 @@
 /* Add your own CSS code below */
+@media (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+
+@media (min-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}

part-2/11-flexbox/flexbox.css

@@ -1 +1,10 @@
 /* Add your own CSS code below */
+.countries--first {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+.countries--third {
+  display: flex;
+  flex-direction: column-reverse;
+}

part-2/12-justify-content/flexbox.css

@@ -7,3 +7,17 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  justify-content: end;
+}
+.countries--second {
+  justify-content: space-between;
+}
+.countries--third {
+  flex-direction: column;
+  justify-content: flex-end;
+}
+.countries--fourth {
+  flex-direction: column-reverse;
+  justify-content: space-between;
+}

part-2/13-align-items/flexbox.css

@@ -2,3 +2,21 @@
   display: flex;
 }
 /* Add your own CSS code below */
+.countries--first {
+  align-items: center;
+  justify-content: center;
+}
+.countries--second {
+  align-items: flex-end;
+  justify-content: end;
+  flex-direction: row-reverse;
+}
+.countries--third {
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+.countries--fourth {
+  flex-direction: column-reverse;
+  align-items: center;
+}

part-2/14-order/flexbox.css

@@ -3,3 +3,18 @@
 }
 
 /* Add your own CSS code below */
+.countries--first .country--brazil {
+  order: 5;
+}
+
+.countries--second .country--brazil {
+  order: 4;
+}
+
+.countries--second .country--uganda {
+  order: 5;
+}
+.countries--third {
+  flex-direction: row-reverse;
+  justify-content: start;
+}

part-2/15-align-self/flexbox.css

@@ -3,3 +3,37 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+
+.countries--second {
+  align-items: center;
+}
+
+.countries--second .country--ethiopia {
+  align-self: flex-end;
+}
+
+.countries--third {
+  align-items: 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--fourth {
+  flex-direction: column;
+  align-items: start;
+}
+
+.countries--fourth .country--uganda {
+  align-self: center;
+}

part-2/16-more-flexbox/flexbox.css

@@ -3,3 +3,47 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  align-items: flex-end;
+  justify-content: end;
+}
+
+.countries--second {
+  align-items: flex-end;
+  flex-direction: row-reverse;
+  justify-content: center;
+}
+
+.countries--third {
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.countries--third .country--brazil {
+  align-self: flex-end;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-end;
+}
+
+.countries--fourth .country--ethiopia {
+  align-self: center;
+}
+.countries--fourth .country--laos {
+  align-self: center;
+}
+.countries--fifth {
+  flex-direction: column-reverse;
+  align-items: flex-end;
+  justify-content: space-between;
+}
+
+.countries--fifth .country--laos {
+  order: 1;
+}
+.countries--fifth .country--uganda {
+  align-self: center;
+}