CodeYourFuture · saeed6617 · Feb 2, 2019 · Feb 13, 2019 · Feb 13, 2019 · Feb 13, 2019
diff --git a/group-project-revisions-faq b/group-project-revisions-faq
diff --git a/week-1/1-parent-child/index.html b/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/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
@@ -23,15 +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="ttps://goo.gl/maps/aza4h9nUBhnh"> 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" width="270" />
           </p>
           <span class="message__time">7:38pm</span>
         </div>

diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
@@ -11,34 +11,33 @@
   </head>
 
   <body>
-    <div class="site-wrapper">
+    <main role="main" class="site-wrapper">
       <div class="site-header">
-        <div class="site-header__title">Messages</div>
+        <header role="banner" class="site-header__title">Messages</header>
       </div>
       <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">
+        </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. https://goo.gl/maps/aza4h9nUBhn
           </p>
           <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+        </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>
+        </article>
       </div>
       <div id="result" class="result"></div>
-    </div>
+    </main>
     <script defer src="/js/3-result.js"></script>
   </body>
 </html>
diff --git a/week-1/4-links-scripts/index.html b/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" type="text/css" href="./css/missing-styles.css" />
   </head>
 
   <body>
@@ -20,20 +21,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. https://goo.gl/maps/aza4h9nUBhn
           </p>
           <time class="message__time">7:35pm</time>
         </div>
         <div 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. https://goo.gl/maps/wKDoARcHDp42
           </p>
           <time class="message__time">7:38pm</time>
         </div>
       </div>
     </div>
+    <script src="./js/convertUrls.js"></script>
   </body>
 </html>
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-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: yellow;
+}
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
@@ -7,3 +7,18 @@
   margin: 0.5em;
   background: #fff;
 }
+.pages {
+  margin-top: 15px;
+}
+
+.countries {
+  width: 433px;
+  height: 230px;
+  padding: 10px;
+  margin: 1px;
+}
+.country {
+  padding: 10px;
+  margin: 5px;
+  border: 2px solid blue;
+}
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,12 @@
 /* Try different box model properties below */
+.site-header p {
+  color: white;
+  margin-bottom: 1px;
+}
+.site-footer p {
+  font-size: 12px;
+  text-align: center;
+}
+.message--unread {
+  box-shadow: 4px 4px 0 #dba944;
+}
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
@@ -1 +1,11 @@
 /* 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/week-2/10-media-queries/index.html b/week-2/10-media-queries/index.html
@@ -6,7 +6,7 @@
     <title>10. Media Queries - HTML, CSS and Git Exercises</title>
     <link rel="stylesheet" href="/css/normalize.css" />
     <link rel="stylesheet" href="/css/week2-media-queries.css" />
-    <link rel="stylesheet" href="/week-2/9-media-queries/columns.css" />
+    <link rel="stylesheet" href="/week-2/10-media-queries/columns.css" />
   </head>
 
   <body>

diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
@@ -1 +1,9 @@
 /* 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/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
@@ -7,3 +7,23 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
+.countries--second {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+}
+.countries--third {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+.countries--fourth {
+  display: flex;
+  flex-direction: column-reverse;
+  justify-content: space-around;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
@@ -2,3 +2,23 @@
   display: flex;
 }
 /* Add your own CSS code below */
+.countries--first {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.countries--second {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: flex-end;
+}
+.countries--third {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.countries--fourth {
+  display: flex;
+  flex-direction: column-reverse;
+  align-items: center;
+}
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
@@ -3,3 +3,66 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  display: flex;
+}
+
+.countries--first .country--croatia {
+  order: 1;
+}
+.countries--first .country--ethiopia {
+  order: 2;
+}
+.countries--first .country--brazil {
+  order: 5;
+}
+.countries--first .country--laos {
+  order: 3;
+}
+.countries--first .country--uganda {
+  order: 4;
+}
+
+.countries--second {
+  display: flex;
+}
+
+.countries--second .country--croatia {
+  order: 1;
+}
+
+.countries--second .country--ethiopia {
+  order: 2;
+}
+
+.countries--second .country--brazil {
+  order: 4;
+}
+
+.countries--second .country--laos {
+  order: 3;
+}
+
+.countries--second .country--uganda {
+  order: 5;
+}
+
+.countries--third .country--croatia {
+  order: 0;
+}
+
+.countries--third .country--ethiopia {
+  order: -1;
+}
+
+.countries--third .country--brazil {
+  order: 1;
+}
+
+.countries--third .country--laos {
+  order: -2;
+}
+
+.countries--third .country--uganda {
+  order: -3;
+}
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
@@ -3,3 +3,34 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  display: flex;
+}
+.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-end;
+}
+.countries--third .country--brazil {
+  align-self: flex-start;
+}
+.countries--third .country--uganda {
+  align-self: flex-start;
+}
+.countries--fourth {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+.countries--fourth .country--uganda {
+  align-self: center;
+}
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,49 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  justify-content: flex-end;
+  align-items: flex-end;
+}
+.countries--second {
+  flex-direction: row-reverse;
+  justify-content: center;
+  align-items: flex-end;
+}
+.countries--third {
+  align-items: flex-end;
+}
+.countries--third .country--laos {
+  align-self: flex-start;
+}
+.countries--third .country--uganda {
+  align-self: flex-start;
+}
+.countries--third .country--ethiopia {
+  align-self: flex-start;
+}
+.countries--third .country--croatia {
+  align-self: flex-start;
+}
+.countries--fourth {
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
+}
+.countries--fourth .country--ethiopia {
+  align-self: center;
+}
+.countries--fourth .country--laos {
+  align-self: center;
+}
+.countries--fifth {
+  flex-direction: column-reverse;
+  justify-content: space-around;
+  align-items: flex-end;
+}
+.countries--fifth .country--laos {
+  order: 1;
+}
+.countries--fifth .country--uganda {
+  align-self: center;
+}
diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: #4491db;
+  color: orange;
   font-weight: 700;
   text-decoration: none;
 }
diff --git a/week-3/19-search/index.html b/week-3/19-search/index.html
@@ -11,7 +11,9 @@
   <body>
     <div class="site-wrapper">
       <main>
-        <p>Delete this line and add your form.</p>
+        <form method="get" action="https://www.google.com/search">
+          <input type="text" name="q" />
+        </form>
       </main>
     </div>
   </body>
-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 @@