From 6583347318f5eea79f72c52cea15412edabc27a8 Mon Sep 17 00:00:00 2001
From: zenebu <zenebuge@gmail.com>
Date: Sat, 2 Feb 2019 12:46:40 +0000
Subject: [PATCH 01/23] finished the first task

---
 week-1/1-parent-child/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
index 458a4cb21..dd4f809f5 100644
--- a/week-1/1-parent-child/index.html
+++ b/week-1/1-parent-child/index.html
@@ -20,7 +20,7 @@
           <p class="message__content">
             Who is available to meet this week to work on our group project?
           </p>
-          <span class="message__time">6:48pm</span>
+          <span class="message__time">7:15pm</span>
         </div>
         <div class="message">
           <div class="message__author">Habiba</div>

From ba1e06f37a9a43cc0535271e05688163a5857c51 Mon Sep 17 00:00:00 2001
From: zenebu <zenebuge@gmail.com>
Date: Sat, 2 Feb 2019 16:09:43 +0000
Subject: [PATCH 02/23] implemented exrcise 1and 4

---
 week-1/1-parent-child/index.html  | 20 +++++++++++---------
 week-1/4-links-scripts/index.html | 10 ++++++----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
index dd4f809f5..c97da6bc7 100644
--- a/week-1/1-parent-child/index.html
+++ b/week-1/1-parent-child/index.html
@@ -10,25 +10,27 @@
   </head>
 
   <body>
-    <div class="site-wrapper">
-      <div class="site-header">
+    <header role="banner"></header>
+    <main role="main">
+      <header role="banner">
         <div class="site-header__title">Messages</div>
-      </div>
+      </header>
+
       <div class="messages">
-        <div class="message">
+        <article>
           <div class="message__author">Anthony</div>
           <p class="message__content">
             Who is available to meet this week to work on our group project?
           </p>
-          <span class="message__time">7:15pm</span>
-        </div>
-        <div class="message">
+          <time datetime="19:15"></time>
+        </article>
+        <article>
           <div class="message__author">Habiba</div>
           <p class="message__content">
             I can meet on Tuesday and Wednesday after 4.
           </p>
-        </div>
+        </article>
       </div>
-    </div>
+    </main>
   </body>
 </html>
diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
index b8f17e311..0722ec1df 100644
--- 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" href="./css/missing-styles.css" />
   </head>
 
   <body>
@@ -20,20 +21,21 @@
         <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">
+    
+
   </body>
 </html>

From 6a85db952bbc47c03471cb3e3267313fd8a24031 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Wed, 6 Feb 2019 16:00:04 +0000
Subject: [PATCH 03/23] Fix some formatting errors

---
 week-1/4-links-scripts/index.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
index 0722ec1df..e5882bea6 100644
--- a/week-1/4-links-scripts/index.html
+++ b/week-1/4-links-scripts/index.html
@@ -34,8 +34,6 @@
         </div>
       </div>
     </div>
-    <script src="./js/convertUrls.js">
-    
-
+    <script src="./js/convertUrls.js"></script>
   </body>
 </html>

From 5ae2215dddb54fdfb629c65c6ca0488b26959e7b Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 15:57:18 +0000
Subject: [PATCH 04/23] media screen

---
 npm-debug.log                       | 23 +++++++++++++++++++++++
 week-2/10-media-queries/columns.css | 11 +++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 npm-debug.log

diff --git a/npm-debug.log b/npm-debug.log
new file mode 100644
index 000000000..177ef4256
--- /dev/null
+++ b/npm-debug.log
@@ -0,0 +1,23 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'run', 'week', '1/4' ]
+2 info using npm@3.5.2
+3 info using node@v8.10.0
+4 verbose stack Error: missing script: week
+4 verbose stack     at run (/usr/share/npm/lib/run-script.js:147:19)
+4 verbose stack     at /usr/share/npm/lib/run-script.js:57:5
+4 verbose stack     at /usr/share/npm/node_modules/read-package-json/read-json.js:345:5
+4 verbose stack     at checkBinReferences_ (/usr/share/npm/node_modules/read-package-json/read-json.js:309:45)
+4 verbose stack     at final (/usr/share/npm/node_modules/read-package-json/read-json.js:343:3)
+4 verbose stack     at then (/usr/share/npm/node_modules/read-package-json/read-json.js:113:5)
+4 verbose stack     at /usr/share/npm/node_modules/read-package-json/read-json.js:300:12
+4 verbose stack     at /usr/share/npm/node_modules/graceful-fs/graceful-fs.js:76:16
+4 verbose stack     at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:511:3)
+5 verbose cwd /home/coder/html-css-git-exercises
+6 error Linux 4.15.0-45-generic
+7 error argv "/usr/bin/node" "/usr/bin/npm" "run" "week" "1/4"
+8 error node v8.10.0
+9 error npm  v3.5.2
+10 error missing script: week
+11 error If you need help, you may report this error at:
+11 error     <https://github.com/npm/npm/issues>
+12 verbose exit [ 1, true ]
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
index 43e80d23c..ab45821df 100644
--- a/week-2/10-media-queries/columns.css
+++ b/week-2/10-media-queries/columns.css
@@ -1 +1,12 @@
 /* Add your own CSS code below */
+@media screen and (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+
+@media screen and (min-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}

From aeb08e5be93b48fe6242667cb43b95799755ae15 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 17:41:25 +0000
Subject: [PATCH 05/23] modified content

---
 week-2/12-justify-content/flexbox.css | 10 ++++++++++
 week-2/13-align-items/flexbox.css     | 20 ++++++++++++++++++++
 week-2/14-order/flexbox.css           | 22 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
index 3c4c7ff18..a6e9cfa45 100644
--- a/week-2/12-justify-content/flexbox.css
+++ b/week-2/12-justify-content/flexbox.css
@@ -7,3 +7,13 @@
 }
 
 /* Add your own CSS code below */
+.countries--second {
+  display: flex;
+  flex-direction: flex-end;
+  justify-content: space-between;
+}
+.countries--first {
+  display: flex;
+  flex-direction: flex-end;
+  justify-content: flex-end;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
index 3675a0df3..46b3fbe3b 100644
--- 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--third {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.countries--first {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.countries--second {
+  display: flex;
+  flex-direction: row-reverse;
+  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
index ed621b793..8c791e2c3 100644
--- a/week-2/14-order/flexbox.css
+++ b/week-2/14-order/flexbox.css
@@ -3,3 +3,25 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--first .country--brazil {
+  order: 1;
+}
+
+.countries--second .country--croatia {
+  order: 1;
+}
+.countries--second .country--ethiopia {
+  order: -1;
+}
+.countries--second .country--laos {
+  order: -1;
+}
+.countries--second .country--brazil {
+  order: -1;
+}
+.countries--countries--third {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: flex-end;
+}

From b93b81c5ed7ae61cba5341f702631847d6e90fb3 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 17:43:46 +0000
Subject: [PATCH 06/23] modified align items

---
 week-2/13-align-items/flexbox.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
index 46b3fbe3b..b3f2605be 100644
--- a/week-2/13-align-items/flexbox.css
+++ b/week-2/13-align-items/flexbox.css
@@ -2,6 +2,7 @@
   display: flex;
 }
 /* Add your own CSS code below */
+
 .countries--third {
   display: flex;
   flex-direction: column;

From 419e79de055e658f92557d81a2fc6e2589e7fb7f Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 17:50:10 +0000
Subject: [PATCH 07/23] modified align self

---
 week-2/15-align-self/flexbox.css | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
index ed621b793..b511f57a8 100644
--- a/week-2/15-align-self/flexbox.css
+++ b/week-2/15-align-self/flexbox.css
@@ -3,3 +3,26 @@
 }
 
 /* Add your own CSS code below */
+countries--first {
+  display: flex;
+}
+
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+.countries--second {
+  display: flex;
+  align-items: center;
+}
+.country--croatia {
+  align-self: flex-end;
+}
+.country--laos {
+  align-self: flex-end;
+}
+.country--brazil {
+  align-self: flex-start;
+}
+.country--uganda {
+  align-self: flex-start;
+}

From cd6a3859d78dd90b578ed4a6b2eb9010bfaae851 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 17:52:01 +0000
Subject: [PATCH 08/23] flexbox properties

---
 week-2/16-more-flexbox/flexbox.css | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
index ed621b793..82ee0d9f1 100644
--- a/week-2/16-more-flexbox/flexbox.css
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,34 @@
 }
 
 /* Add your own CSS code below */
+.countries--first {
+  flex-direction: row;
+  align-items: flex-end;
+  justify-content: flex-end;
+}
+.countries--second {
+  flex-direction: row;
+  align-items: flex-end;
+  justify-content: center;
+}
+.countries--third {
+  flex-direction: row;
+  align-items: flex-start;
+}
+.countries--third .country--brazil {
+  flex-direction: column;
+  align-items: flex-end;
+}
+.countries--fourth {
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
+}
+.countries--fourth .country--ethiopis,
+.countries--fourth .country--laos {
+  align-self: center;
+}
+.countries--fifth {
+  flex-direction: column-reverse;
+  align-items: flex-end;
+}

From 83569eb87e1552e85fd2a6caba6e9f7de9522cd3 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 17:58:14 +0000
Subject: [PATCH 09/23] navigation menu modified

---
 week-2/17-nav-menu/styles.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
index 7f12598d1..c308d26e7 100644
--- a/week-2/17-nav-menu/styles.css
+++ b/week-2/17-nav-menu/styles.css
@@ -5,14 +5,12 @@
     align-items: center;
   }
 }
-
 @media (min-width: 700px) {
   .site-header {
     display: flex;
     align-items: center;
   }
 }
-
 @media (min-width: 992px) {
   .site-header {
     display: flex;

From 650cc2a1876855c3597777ec961782997828449e Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 18:05:37 +0000
Subject: [PATCH 10/23] using html form

---
 week-3/19-search/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/week-3/19-search/index.html b/week-3/19-search/index.html
index d94ec98dd..f8f521a4a 100644
--- 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 action="https://www.google.com/search" method="Git">
+          <input type="submit" value="Google search" />
+        </form>
       </main>
     </div>
   </body>

From 9ae63b70515a4b8b4b18d59ca4e12a729bceb052 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 18:21:53 +0000
Subject: [PATCH 11/23] button modified

---
 week-3/21-buttons/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/week-3/21-buttons/index.html b/week-3/21-buttons/index.html
index ff87846df..ec45838ef 100644
--- a/week-3/21-buttons/index.html
+++ b/week-3/21-buttons/index.html
@@ -14,7 +14,8 @@
         <form method="GET" action="https://www.google.com/search">
           <label for="search-input">Search on Google</label>
           <input type="text" name="q" id="search-input" />
-          <!-- Add a submit button here -->
+          <input type="text" name="q" id="search-input" />
+          <button>search</button>
         </form>
       </main>
     </div>

From e297a1487071fc8f46acafaf90d4f58a62207e85 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 18:38:12 +0000
Subject: [PATCH 12/23] checkout modified

---
 week-3/22-checkout/index.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/week-3/22-checkout/index.html b/week-3/22-checkout/index.html
index b652002a3..655328191 100644
--- a/week-3/22-checkout/index.html
+++ b/week-3/22-checkout/index.html
@@ -39,9 +39,14 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h2>
   		<div class="checkout">
   			<h2 class="checkout__title">Checkout</h2>
         <form method="GET" id="checkout-form" class="checkout__form">
-
-          <!-- Add the form fields here -->
-
+					<label> for="customer-name">customer-name</label>
+					<input id="customer-name" type="text" name="customer-name">
+
+					<label for="email">customer-email</label>
+					<input id="email" type="email" name="customer-email">
+					
+					<label for="tel">customer-phone</label> 
+					<input id="cusomer-phone" type="tel" name="cusomer-phone">
           <button type="submit">Complete Purchase</button>
         </form>
   		</div>

From 5d24c8731425d2a0ba5b16e5fe92e301c2a316ea Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 18:56:07 +0000
Subject: [PATCH 13/23] checkout modified

---
 week-3/22-checkout/index.html | 98 +++++++++++++++++------------------
 1 file changed, 47 insertions(+), 51 deletions(-)

diff --git a/week-3/22-checkout/index.html b/week-3/22-checkout/index.html
index 655328191..ba2de227b 100644
--- a/week-3/22-checkout/index.html
+++ b/week-3/22-checkout/index.html
@@ -1,58 +1,54 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>22 - Checkout Form - HTML, CSS and Git Exercises</title>
+    <link rel="stylesheet" href="/css/normalize.css" />
+    <link rel="stylesheet" href="/css/week3-forms.css" />
+  </head>
 
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>22 - Checkout Form - HTML, CSS and Git Exercises</title>
-  <link rel="stylesheet" href="/css/normalize.css">
-  <link rel="stylesheet" href="/css/week3-forms.css">
-</head>
+  <body>
+    <div class="site-wrapper">
+      <main>
+        <div class="shopping-basket">
+          <h1 class="shopping-basket__title">Your Shopping Basket</h1>
+          <table class="shopping-basket__items">
+            <tr>
+              <th>Product</th>
+              <th>Size</th>
+              <th>Units</th>
+              <th>Price</th>
+            </tr>
+            <tr>
+              <td>
+                <div class="shopping-basket__product">
+                  <img src="/images/22/shirts.jpg" alt="CodeYourFuture t-shirts in black" />
+                  <p>CodeYourFuture t-shirt, black</p>
+                </div>
+              </td>
+              <td>Medium</td>
+              <td>1</td>
+              <td>£10.00</td>
+            </tr>
+          </table>
+        </div>
 
-<body>
-  <div class="site-wrapper">
-    <main>
+        <div class="checkout">
+          <h2 class="checkout__title">Checkout</h2>
+          <form method="GET" id="checkout-form" class="checkout__form">
+            <label> for="customer-name">customer-name</label>
+            <input id="customer-name" type="text" name="customer-name" />
 
-  		<div class="shopping-basket">
-  			<h1 class="shopping-basket__title">Your Shopping Basket</h2>
-  			<table class="shopping-basket__items">
-  				<tr>
-  					<th>Product</th>
-  					<th>Size</th>
-  					<th>Units</th>
-  					<th>Price</th>
-  				</tr>
-  				<tr>
-  					<td>
-              <div class="shopping-basket__product">
-    						<img src="/images/22/shirts.jpg" alt="CodeYourFuture t-shirts in black"/>
-                <p>CodeYourFuture t-shirt, black</p>
-              </div>
-  					</td>
-  					<td>Medium</td>
-  					<td>1</td>
-  					<td>£10.00</td>
-  				</tr>
-  			</table>
-  		</div>
-
-  		<div class="checkout">
-  			<h2 class="checkout__title">Checkout</h2>
-        <form method="GET" id="checkout-form" class="checkout__form">
-					<label> for="customer-name">customer-name</label>
-					<input id="customer-name" type="text" name="customer-name">
-
-					<label for="email">customer-email</label>
-					<input id="email" type="email" name="customer-email">
-					
-					<label for="tel">customer-phone</label> 
-					<input id="cusomer-phone" type="tel" name="cusomer-phone">
-          <button type="submit">Complete Purchase</button>
-        </form>
-  		</div>
-
-    </main>
-  </div>
-</body>
+            <label for="email">customer-email</label>
+            <input id="email" type="email" name="customer-email" />
 
+            <label for="tel">customer-phone</label>
+            <input id="cusomer-phone" type="tel" name="cusomer-phone" />
+            <button type="submit">Complete Purchase</button>
+          </form>
+        </div>
+      </main>
+    </div>
+  </body>
 </html>

From 791413a0c9e809762fcbfdda993aab004a059fab Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 18:58:18 +0000
Subject: [PATCH 14/23] comment textarea

---
 week-3/23-comments/index.html | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/week-3/23-comments/index.html b/week-3/23-comments/index.html
index eea184d12..ff5ddc3cf 100644
--- a/week-3/23-comments/index.html
+++ b/week-3/23-comments/index.html
@@ -14,30 +14,26 @@
         <article>
           <h1>Our t-shirts are amazing!</h1>
           <p>
-            Lorem ipsum dolor sit amet, aliquam laoreet quaestio in eum, ea
-            tation dignissim vix. Ei nec audire vocibus corrumpit. Ut quo
-            facilisis adipiscing, malis sensibus abhorreant vel ei. Hinc
-            appareat dissentias pri at, impedit propriae ea eos. Modus feugait
-            te duo, sit noluisse salutatus maiestatis ea. Iisque volumus duo ex,
-            deleniti aliquando quo ne.
+            Lorem ipsum dolor sit amet, aliquam laoreet quaestio in eum, ea tation dignissim vix. Ei
+            nec audire vocibus corrumpit. Ut quo facilisis adipiscing, malis sensibus abhorreant vel
+            ei. Hinc appareat dissentias pri at, impedit propriae ea eos. Modus feugait te duo, sit
+            noluisse salutatus maiestatis ea. Iisque volumus duo ex, deleniti aliquando quo ne.
           </p>
           <p>
-            Eos nibh maiorum voluptatibus ea, an labitur phaedrum sed, vis justo
-            option intellegat ad. Vel ut ferri dolores. Ad hinc moderatius
-            scriptorem vim, utamur electram ad est, sed no dicit homero
-            dissentias. Usu qualisque concludaturque id, prodesset
-            concludaturque eu usu, ea est regione platonem. Et rebum
-            theophrastus per, dicta aliquam adipisci pri cu, ne quem justo mea.
+            Eos nibh maiorum voluptatibus ea, an labitur phaedrum sed, vis justo option intellegat
+            ad. Vel ut ferri dolores. Ad hinc moderatius scriptorem vim, utamur electram ad est, sed
+            no dicit homero dissentias. Usu qualisque concludaturque id, prodesset concludaturque eu
+            usu, ea est regione platonem. Et rebum theophrastus per, dicta aliquam adipisci pri cu,
+            ne quem justo mea.
           </p>
         </article>
 
         <div class="comments">
           <p>Add your comments and let us know what you think!</p>
 
-          <!-- Your comment form goes here -->
-          <form>
+          <form method="GET">
             <label>Add Your Message</label>
-            <textarea></textarea>
+            <textarea name="comment"></textarea>
             <button>Send Comment</button>
           </form>
         </div>

From 62a9dd9ec2655b79c7f61e72c51b65434672f0eb Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 19:02:01 +0000
Subject: [PATCH 15/23] checkbox modified

---
 week-3/24-dietary/index.html | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/week-3/24-dietary/index.html b/week-3/24-dietary/index.html
index e05cf8ade..37ff1c4d6 100644
--- a/week-3/24-dietary/index.html
+++ b/week-3/24-dietary/index.html
@@ -14,12 +14,34 @@
         <h1>CodeYourFuture Summit</h1>
 
         <p>
-          Let us know if you have any dietary requirements so that we can
-          provide you with the best, yummy food.
+          Let us know if you have any dietary requirements so that we can provide you with the best,
+          yummy food.
         </p>
 
         <form>
-          <!-- Your multiple choice goes here -->
+          <fieldset>
+            <legend>dietry requirments</legend>
+            <label>
+              <input type="checkbox" name="yumy food" value="ha" />
+              Halal
+            </label>
+            <label>
+              <input type="checkbox" name="yummy food" value="ko" />
+              Kosher
+            </label>
+            <label>
+              <input type="checkbox" name="yummy food" value="ve" />
+              Vegeterian
+            </label>
+            <label>
+              <input type="checkbox" name="yummy food" value="ve" />
+              Vegan
+            </label>
+            <label>
+              <input type="checkbox" name="yummy food" value="gl" />
+              Gluten Free
+            </label>
+          </fieldset>
           <button type="submit">Submit</button>
         </form>
       </main>

From b06e3fb533f0fe583cd76cd8e2e5c31a0224b634 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 19:06:51 +0000
Subject: [PATCH 16/23] selected attribute

---
 week-3/25-shirt-size/index.html | 103 +++++++++++++++-----------------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/week-3/25-shirt-size/index.html b/week-3/25-shirt-size/index.html
index bc71c6f48..4c7f31f90 100644
--- a/week-3/25-shirt-size/index.html
+++ b/week-3/25-shirt-size/index.html
@@ -1,58 +1,53 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>25 - T-Shirt Size - HTML, CSS and Git Exercises</title>
+    <link rel="stylesheet" href="/css/normalize.css" />
+    <link rel="stylesheet" href="/css/week3-forms.css" />
+    <link rel="stylesheet" href="styles.css" />
+  </head>
 
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>25 - T-Shirt Size - HTML, CSS and Git Exercises</title>
-  <link rel="stylesheet" href="/css/normalize.css">
-  <link rel="stylesheet" href="/css/week3-forms.css">
-  <link rel="stylesheet" href="styles.css">
-</head>
-
-<body>
-  <div class="site-wrapper">
-    <main>
-
-  		<div class="shopping-basket">
-  			<h1 class="shopping-basket__title">Your Shopping Basket</h2>
-  			<table class="shopping-basket__items">
-  				<tr>
-  					<th>Product</th>
-  					<th>Size</th>
-  					<th>Units</th>
-  					<th>Price</th>
-  				</tr>
-  				<tr>
-  					<td>
-              <div class="shopping-basket__product">
-    						<img src="/images/22/shirts.jpg" alt="CodeYourFuture t-shirts in black"/>
-                <p>CodeYourFuture t-shirt, black</p>
-              </div>
-  					</td>
-  					<td>
-              <!-- Medium -->
-              <form>
-                <label class="screenreader">Choose a size</label>
-                <select>
-                  <option>Small</option>
-                  <option selected>Medium</option>
-                  <option>Large</option>
-                </select>
-              </form>
-            </td>
-  					<td>
-              1
-            </td>
-  					<td>
-              £10.00
-            </td>
-  				</tr>
-  			</table>
-  		</div>
-
-    </main>
-  </div>
-</body>
-
+  <body>
+    <div class="site-wrapper">
+      <main>
+        <div class="shopping-basket">
+          <h1 class="shopping-basket__title">Your Shopping Basket</h1>
+          <table class="shopping-basket__items">
+            <tr>
+              <th>Product</th>
+              <th>Size</th>
+              <th>Units</th>
+              <th>Price</th>
+            </tr>
+            <tr>
+              <td>
+                <div class="shopping-basket__product">
+                  <img src="/images/22/shirts.jpg" alt="CodeYourFuture t-shirts in black" />
+                  <p>CodeYourFuture t-shirt, black</p>
+                </div>
+              </td>
+              <td>
+                <form>
+                  <label class="screenreader">Choose a size</label>
+                  <select>
+                    <option>Small</option>
+                    <option selected>Medium</option>
+                    <option>Large</option>
+                  </select>
+                </form>
+              </td>
+              <td>
+                1
+              </td>
+              <td>
+                £10.00
+              </td>
+            </tr>
+          </table>
+        </div>
+      </main>
+    </div>
+  </body>
 </html>

From 3c3f1b976bc0b9574ac827c3117e06573073d4c0 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 19:28:37 +0000
Subject: [PATCH 17/23] billing address modified

---
 week-3/26-checkout-groups/index.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/week-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html
index 132fcac28..f9eaa9311 100644
--- a/week-3/26-checkout-groups/index.html
+++ b/week-3/26-checkout-groups/index.html
@@ -39,8 +39,21 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h2>
   		<div class="checkout">
   			<h2 class="checkout__title">Checkout</h2>
         <form method="GET" id="checkout-form" class="checkout__form">
+					<fieldset>
+						<legend>"Billing Address"</legend>
 
-          <!-- Add the form fields here -->
+						<label for="Address-line-1">Address-line-1</label>
+						<input type="text" name="address-line-1" id="address-line-2" />
+
+						<label for="Address-line-2">Address-line-2</label>
+						<input type="text" name="address-line-2" id="address-line-2" />
+
+						<label for="Postcode">Postcode</label>
+						<input type="text" name="Postcode" id="Postcode" />
+
+						<label for="City">City</label>
+						<input type="text" name="city" id="city" />
+	</fieldset>
 
           <button type="submit">Complete Purchase</button>
         </form>

From 10615492d5f197ca3193587aa30a09eb1bb5f780 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 19:56:51 +0000
Subject: [PATCH 18/23] Some changes

---
 week-2/16-more-flexbox/flexbox.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
index 82ee0d9f1..e82c9736f 100644
--- a/week-2/16-more-flexbox/flexbox.css
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -33,4 +33,11 @@
 .countries--fifth {
   flex-direction: column-reverse;
   align-items: flex-end;
+  justify-content: space-between;
+}
+.countries--fifth .country--uganda {
+  align-self: center;
+}
+.countries--fifth .country--laos {
+  order: 1;
 }

From 50823272bb58223b3c086ba08f565ecb140ba197 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 20:00:04 +0000
Subject: [PATCH 19/23] message background colour

---
 week-1/5-css-selectors/message-backgrounds.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index ffe483325..baeb1fd37 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,12 @@
 /* Add your CSS code below */
+article {
+  background-color: cadetblue;
+}
+
+.message--latest {
+  background-color: yellow;
+}
+
+#first-message {
+  background-color: red;
+}

From fd1a6cd500cb5919498b6cc0dcfc43ce25de7aaa Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 20:05:59 +0000
Subject: [PATCH 20/23] styles css

---
 week-1/6-css-properties/styles.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
index ffe483325..191e06a94 100644
--- a/week-1/6-css-properties/styles.css
+++ b/week-1/6-css-properties/styles.css
@@ -1 +1,17 @@
 /* Add your CSS code below */
+.link-link--gif,
+.link-link--map {
+  color: red;
+  font-weight: bold;
+  text-decoration: none;
+}
+.message_time {
+  font-size: 0.9rem;
+}
+.message_content {
+  opacity: 1;
+  line-height: 36px;
+}
+.message_unread {
+  border-left: 5px dashed blue;
+}

From 9e75cea0294f7aacd701818faf66084e3d5c97c7 Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Sat, 23 Feb 2019 20:29:40 +0000
Subject: [PATCH 21/23] fornatting some error

---
 week-3/22-checkout/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/week-3/22-checkout/index.html b/week-3/22-checkout/index.html
index ba2de227b..4e8b8de19 100644
--- a/week-3/22-checkout/index.html
+++ b/week-3/22-checkout/index.html
@@ -37,7 +37,7 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
         <div class="checkout">
           <h2 class="checkout__title">Checkout</h2>
           <form method="GET" id="checkout-form" class="checkout__form">
-            <label> for="customer-name">customer-name</label>
+            <label> customer-name</label>
             <input id="customer-name" type="text" name="customer-name" />
 
             <label for="email">customer-email</label>

From 57ae0a512856f47bedb6257ffa2d9158c215e58a Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Thu, 28 Feb 2019 05:02:53 +0000
Subject: [PATCH 22/23] checkout modified

---
 week-3/26-checkout-groups/index.html | 123 +++++++++++++--------------
 1 file changed, 60 insertions(+), 63 deletions(-)

diff --git a/week-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html
index f9eaa9311..5e5b5c164 100644
--- a/week-3/26-checkout-groups/index.html
+++ b/week-3/26-checkout-groups/index.html
@@ -1,66 +1,63 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>26 - Checkout Groups - HTML, CSS and Git Exercises</title>
-  <link rel="stylesheet" href="/css/normalize.css">
-  <link rel="stylesheet" href="/css/week3-forms.css">
-</head>
-
-<body>
-  <div class="site-wrapper">
-    <main>
-
-  		<div class="shopping-basket">
-  			<h1 class="shopping-basket__title">Your Shopping Basket</h2>
-  			<table class="shopping-basket__items">
-  				<tr>
-  					<th>Product</th>
-  					<th>Size</th>
-  					<th>Units</th>
-  					<th>Price</th>
-  				</tr>
-  				<tr>
-  					<td>
-              <div class="shopping-basket__product">
-    						<img src="/images/20-shirts.jpg" alt="CodeYourFuture t-shirts in black"/>
-                <p>CodeYourFuture t-shirt, black</p>
-              </div>
-  					</td>
-  					<td>Medium</td>
-  					<td>1</td>
-  					<td>£10.00</td>
-  				</tr>
-  			</table>
-  		</div>
-
-  		<div class="checkout">
-  			<h2 class="checkout__title">Checkout</h2>
-        <form method="GET" id="checkout-form" class="checkout__form">
-					<fieldset>
-						<legend>"Billing Address"</legend>
-
-						<label for="Address-line-1">Address-line-1</label>
-						<input type="text" name="address-line-1" id="address-line-2" />
-
-						<label for="Address-line-2">Address-line-2</label>
-						<input type="text" name="address-line-2" id="address-line-2" />
-
-						<label for="Postcode">Postcode</label>
-						<input type="text" name="Postcode" id="Postcode" />
-
-						<label for="City">City</label>
-						<input type="text" name="city" id="city" />
-	</fieldset>
-
-          <button type="submit">Complete Purchase</button>
-        </form>
-  		</div>
-
-    </main>
-  </div>
-</body>
-
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>26 - Checkout Groups - HTML, CSS and Git Exercises</title>
+    <link rel="stylesheet" href="/css/normalize.css" />
+    <link rel="stylesheet" href="/css/week3-forms.css" />
+  </head>
+
+  <body>
+    <div class="site-wrapper">
+      <main>
+        <div class="shopping-basket">
+          <h1 class="shopping-basket__title">Your Shopping Basket</h1>
+          >
+          <table class="shopping-basket__items">
+            <tr>
+              <th>Product</th>
+              <th>Size</th>
+              <th>Units</th>
+              <th>Price</th>
+            </tr>
+            <tr>
+              <td>
+                <div class="shopping-basket__product">
+                  <img src="/images/20-shirts.jpg" alt="CodeYourFuture t-shirts in black" />
+                  <p>CodeYourFuture t-shirt, black</p>
+                </div>
+              </td>
+              <td>Medium</td>
+              <td>1</td>
+              <td>£10.00</td>
+            </tr>
+          </table>
+        </div>
+
+        <div class="checkout">
+          <h2 class="checkout__title">Checkout</h2>
+          <form method="GET" id="checkout-form" class="checkout__form">
+            <fieldset>
+              <legend>"Billing Address"</legend>
+
+              <label for="Address-line-1">Address-line-1</label>
+              <input type="text" name="address-line-1" id="address-line-2" />
+
+              <label for="Address-line-2">Address-line-2</label>
+              <input type="text" name="address-line-2" id="address-line-2" />
+
+              <label for="Postcode">Postcode</label>
+              <input type="text" name="Postcode" id="Postcode" />
+
+              <label for="City">City</label>
+              <input type="text" name="city" id="city" />
+            </fieldset>
+
+            <button type="submit">Complete Purchase</button>
+          </form>
+        </div>
+      </main>
+    </div>
+  </body>
 </html>

From 89de2481f81e4e4ee5f625bfc0e33bd9629abbbe Mon Sep 17 00:00:00 2001
From: Zenebu <zenebuge@gmail.com>
Date: Thu, 28 Feb 2019 05:17:11 +0000
Subject: [PATCH 23/23] links colour changes

---
 week-3/28-git-conflict/styles.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/week-3/28-git-conflict/styles.css b/week-3/28-git-conflict/styles.css
index af46a4f77..995c267e9 100644
--- a/week-3/28-git-conflict/styles.css
+++ b/week-3/28-git-conflict/styles.css
@@ -4,3 +4,8 @@
   font-weight: 700;
   text-decoration: none;
 }
+.link {
+  color: #ff00ea;
+  font-weight: 700;
+  text-decoration: none;
+}
