From fe5c45c9d56997132032930e24ca0f88cab626f6 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Fri, 24 Jan 2020 23:40:34 +0100
Subject: [PATCH 01/13] step1 height

calculating height feed
---
 level-1/step-1/step-1.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index 78865286..0199769f 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -8,8 +8,7 @@
 
 .content-left {
     width: 34%;
-    /* This height is a placeholder. You will need to make some adjustments to get this container to look like the design. */
-    height: 100px;
+    height: calc( 100vh - 200px );
     background: #565555;
 }
 

From 4c9b17a9e499e83438f2f7f37e1a4bed1709becb Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 25 Jan 2020 00:20:49 +0100
Subject: [PATCH 02/13] step 2 css

---
 level-1/step-2/step-2.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/level-1/step-2/step-2.css b/level-1/step-2/step-2.css
index 73095f05..9161b5a5 100644
--- a/level-1/step-2/step-2.css
+++ b/level-1/step-2/step-2.css
@@ -1,13 +1,13 @@
-/* Step-2 You can assign padding to all sides of a container by using the padding shorthand property. */
+
 
 .content-left {
+    padding: 20px;
  
 }
 
-/* Step 2 You can assign padding to all sides of a container by using the padding shorthand property. */
 
 .header {
-  
+    padding: 20px;
 }
 
 
@@ -15,6 +15,9 @@
 
 .profile-image-container {
     background: #96F0F2;
+    width: auto;
+    height: 30%;
+    margin-bottom: 20px;
 }
 
 /* Step-2 One option to get the container to fill the parent container is to use width: auto; */

From 7a0cf90725616517b3b087a206d545223acba388 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 25 Jan 2020 00:25:15 +0100
Subject: [PATCH 03/13] link css step 2

---
 level-1/step-2/step-2.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/level-1/step-2/step-2.css b/level-1/step-2/step-2.css
index 9161b5a5..91047003 100644
--- a/level-1/step-2/step-2.css
+++ b/level-1/step-2/step-2.css
@@ -24,6 +24,8 @@
 
 .profile-links-container {
     background: #12F3F7;
+    width: auto;
+    height: calc( 70% - 20px );
 }
 
 /* Step-2 You can either use float left to get this element to in the desired location. */

From c960d89a54825855d43238198bc192c0c725fd06 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 25 Jan 2020 00:27:57 +0100
Subject: [PATCH 04/13] css 2 excersise last

---
 level-1/step-2/step-2.css | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/level-1/step-2/step-2.css b/level-1/step-2/step-2.css
index 91047003..9d455717 100644
--- a/level-1/step-2/step-2.css
+++ b/level-1/step-2/step-2.css
@@ -11,7 +11,6 @@
 }
 
 
-/* Step-2 One option to get the container to fill the parent container is to use width: auto; */
 
 .profile-image-container {
     background: #96F0F2;
@@ -20,7 +19,7 @@
     margin-bottom: 20px;
 }
 
-/* Step-2 One option to get the container to fill the parent container is to use width: auto; */
+
 
 .profile-links-container {
     background: #12F3F7;
@@ -28,18 +27,22 @@
     height: calc( 70% - 20px );
 }
 
-/* Step-2 You can either use float left to get this element to in the desired location. */
+
 
 .logo-container {
     background: #4F4949;
+    height: 100%;
+    width: 300px;
+    float: left;
 }
 
-
-/* Step-2 You can either use float right to get this element to in the desired location. */
-
 .menu-container {
     background: #4F4949;
+    height: 100%;
+    width: 50px;
+    float: right;
 }
 
 
 
+

From e7254bda38865d5813ed45942a23541d3954e042 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 25 Jan 2020 01:04:37 +0100
Subject: [PATCH 05/13] css update

---
 level-1/step-1/step-1.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index 0199769f..76be2d13 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -22,7 +22,7 @@
     background: #B0B0B0;
 }
 
-/* Use float to get this container to the bottom of the screen  */
+
 
 .footer {
     width: 100%;

From 79a85890280038609453aa6e5ad421204386ada9 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 25 Jan 2020 01:06:28 +0100
Subject: [PATCH 06/13] content css

---
 level-1/step-1/step-1.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index 76be2d13..ca90cd02 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -4,7 +4,7 @@
     background: #D8D8D8;
 }
 
-/* Use float to get this container in its desired location. */
+
 
 .content-left {
     width: 34%;
@@ -13,13 +13,13 @@
 }
 
 
-/* Use float to get this container in its desired location. */
+
 
 .content-mid {
     width: 66%;
-    /* This height is a placeholder. You will need to make some adjustments to get this container to look like the design. */
-    height: 100px;
+    height: calc( 100vh - 200px );
     background: #B0B0B0;
+    float: right;
 }
 
 

From 6473bb218778616cf22744bb7235f7ae06ea3b56 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 1 Feb 2020 06:49:47 +0100
Subject: [PATCH 07/13] Exercise 1 html

---
 css-exercises             |  1 +
 level-1/index.html        |  8 --------
 level-1/step-1/step-1.css | 12 ++++++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 160000 css-exercises

diff --git a/css-exercises b/css-exercises
new file mode 160000
index 00000000..9e079a89
--- /dev/null
+++ b/css-exercises
@@ -0,0 +1 @@
+Subproject commit 9e079a892af38b183871068a00cc7c4335b10dbb
diff --git a/level-1/index.html b/level-1/index.html
index 4de4033c..17139282 100644
--- a/level-1/index.html
+++ b/level-1/index.html
@@ -22,20 +22,12 @@
 
         <header class="header">
 
-            <div class="logo-container"></div>
-
-            <div class="menu-container"></div>
-
         </header>
 
         <section class="main-section">
 
             <div class="content-left">
 
-                <div class="profile-image-container" ></div>
-
-                <div class="profile-links-container"></div>
-
             </div>
 
             <div class="content-mid">
diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index ca90cd02..8518b7f1 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -2,6 +2,7 @@
     width: 100%;
     height: 100px;
     background: #D8D8D8;
+    padding: 20px; 20px; 20px; 20px;
 }
 
 
@@ -10,6 +11,8 @@
     width: 34%;
     height: calc( 100vh - 200px );
     background: #565555;
+    float: left;
+    padding: 20px; 20px; 20px; 20px;
 }
 
 
@@ -28,4 +31,13 @@
     width: 100%;
     height: 100px;
     background: #3A3A3A;
+    position: absolute;
+    bottom: 0;
+    
+}
+.profile-image-container{
+    width: 34%;
+    height: calc( 100vh - 200px );;
+    margin-bottom: 0;
+
 }
\ No newline at end of file

From 9fdb02ae951ac8d16715a60a611fbbe4ba000704 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 1 Feb 2020 06:51:41 +0100
Subject: [PATCH 08/13] Header

---
 level-1/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/level-1/index.html b/level-1/index.html
index 17139282..b32f280f 100644
--- a/level-1/index.html
+++ b/level-1/index.html
@@ -21,6 +21,7 @@
     <main class="main-wrapper">
 
         <header class="header">
+          <h1>Header</h1>
 
         </header>
 

From aabcd78d73d57d3e7c0b9b7897beef39f52f2efb Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 1 Feb 2020 07:21:57 +0100
Subject: [PATCH 09/13] html index done

---
 level-1/index.html        | 11 ++++++++---
 level-1/step-1/step-1.css | 28 ++++++++++------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/level-1/index.html b/level-1/index.html
index b32f280f..40973fd9 100644
--- a/level-1/index.html
+++ b/level-1/index.html
@@ -21,13 +21,14 @@
     <main class="main-wrapper">
 
         <header class="header">
-          <h1>Header</h1>
+          <h1>HEADER</h1>
 
         </header>
 
         <section class="main-section">
 
             <div class="content-left">
+              <h1>CONTENT-LEFT</h1>
 
             </div>
 
@@ -35,7 +36,9 @@ <h1>Header</h1>
 
                 <section class="content-container">
 
-                    <header class="content-mid-header"></header>
+                    <header class="content-mid-header">
+                      <h1>CONTENT-MID</h1>
+                    </header>
 
                     <div class="content"></div>
 
@@ -45,7 +48,9 @@ <h1>Header</h1>
 
         </section>
 
-        <footer class="footer"> </footer>
+        <footer class="footer"> 
+          <h1>FOOTER</h1>
+        </footer>
 
     </main>
   </body>
diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index 8518b7f1..04df53a0 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -1,43 +1,35 @@
 .header {
+    font-family: Helvetica, sans-serif;
+    font-weight: 200;
     width: 100%;
     height: 100px;
     background: #D8D8D8;
-    padding: 20px; 20px; 20px; 20px;
+    text-align: center;
+   
 }
 
-
-
 .content-left {
     width: 34%;
     height: calc( 100vh - 200px );
     background: #565555;
     float: left;
-    padding: 20px; 20px; 20px; 20px;
+    
+    
 }
 
-
-
-
 .content-mid {
     width: 66%;
-    height: calc( 100vh - 200px );
-    background: #B0B0B0;
-    float: right;
+    text-align: center;
+    bottom: 0;
+    background-color: #D8D8D8;
 }
 
-
-
 .footer {
     width: 100%;
     height: 100px;
     background: #3A3A3A;
     position: absolute;
     bottom: 0;
+    text-align: center;
     
 }
-.profile-image-container{
-    width: 34%;
-    height: calc( 100vh - 200px );;
-    margin-bottom: 0;
-
-}
\ No newline at end of file

From 8930d0da127f6e901a0474ca63d333b40f5fb7df Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 1 Feb 2020 07:44:04 +0100
Subject: [PATCH 10/13] last

---
 level-1/index.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/level-1/index.html b/level-1/index.html
index 40973fd9..ecd6eac9 100644
--- a/level-1/index.html
+++ b/level-1/index.html
@@ -28,8 +28,7 @@ <h1>HEADER</h1>
         <section class="main-section">
 
             <div class="content-left">
-              <h1>CONTENT-LEFT</h1>
-
+              <h1 class="title">CONTENT-LEFT</h1>
             </div>
 
             <div class="content-mid">
@@ -37,7 +36,7 @@ <h1>CONTENT-LEFT</h1>
                 <section class="content-container">
 
                     <header class="content-mid-header">
-                      <h1>CONTENT-MID</h1>
+                      <h1 class="title">CONTENT-MID</h1>
                     </header>
 
                     <div class="content"></div>
@@ -49,7 +48,7 @@ <h1>CONTENT-MID</h1>
         </section>
 
         <footer class="footer"> 
-          <h1>FOOTER</h1>
+          <h1 class="title">FOOTER</h1>
         </footer>
 
     </main>

From a2e16f1d5f0deaac0048933fd199e34961ea918c Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 1 Feb 2020 09:19:38 +0100
Subject: [PATCH 11/13] css step 2

---
 level-1/index.html        | 27 +++++++++++++++------------
 level-1/step-2/step-2.css | 32 ++++++++++++--------------------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/level-1/index.html b/level-1/index.html
index ecd6eac9..e1e2e4fa 100644
--- a/level-1/index.html
+++ b/level-1/index.html
@@ -10,36 +10,41 @@
     <link rel="stylesheet" href="step-1/step-1.css">
 
     <!-- STEP 2 CSS FILE **** STEP 2 CSS FILE *** STEP 2 CSS FILE -->
-    <link rel="stylesheet" href="step-2/step-2.css"> 
+    <link rel="stylesheet" href="step-2/step-2.css">
 
     <!-- STEP 3 CSS FILE **** STEP 3 CSS FILE *** STEP 3 CSS FILE -->
-    <link rel="stylesheet" href="step-3/step-3.css"> 
+    <link rel="stylesheet" href="step-3/step-3.css">
 
   </head>
-  
+
   <body>
     <main class="main-wrapper">
 
         <header class="header">
-          <h1>HEADER</h1>
+
+            <div class="logo-container"></div>
+
+            <div class="menu-container"></div>
 
         </header>
 
         <section class="main-section">
 
             <div class="content-left">
-              <h1 class="title">CONTENT-LEFT</h1>
+
+                <div class="profile-image-container" ></div>
+
+                <div class="profile-links-container"></div>
+
             </div>
 
             <div class="content-mid">
 
                 <section class="content-container">
 
-                    <header class="content-mid-header">
-                      <h1 class="title">CONTENT-MID</h1>
-                    </header>
+                    <header class="content-mid-header"></header>
 
-                    <div class="content"></div>
+                    <div class="content">Incremental Development is a strategy for developing software. In this strategy you start with the simplest code you can possibly write to get things started. Often this is just empty files with the right names, in the right folders! Then in small steps you more code so that each little step works, builds on top of the last step, and is a little closer to the end goal.</div>
 
                 </section>
 
@@ -47,9 +52,7 @@ <h1 class="title">CONTENT-MID</h1>
 
         </section>
 
-        <footer class="footer"> 
-          <h1 class="title">FOOTER</h1>
-        </footer>
+        <footer class="footer"> </footer>
 
     </main>
   </body>
diff --git a/level-1/step-2/step-2.css b/level-1/step-2/step-2.css
index 9d455717..9e41e6bf 100644
--- a/level-1/step-2/step-2.css
+++ b/level-1/step-2/step-2.css
@@ -1,46 +1,38 @@
 
 
 .content-left {
-    padding: 20px;
+    padding:20px 20px 20px 20px;
  
 }
-
-
 .header {
-    padding: 20px;
+    padding:20px 20px 20px 20px;
 }
 
-
-
 .profile-image-container {
     background: #96F0F2;
-    width: auto;
-    height: 30%;
-    margin-bottom: 20px;
+    width:100%;
+    height:35%;
+    margin-bottom:10px;
 }
 
-
-
 .profile-links-container {
     background: #12F3F7;
-    width: auto;
+    width: 100%;
     height: calc( 70% - 20px );
 }
 
-
-
 .logo-container {
     background: #4F4949;
-    height: 100%;
-    width: 300px;
-    float: left;
+    height: 70px;
+    width: 85px;
+    float: right;
 }
 
 .menu-container {
     background: #4F4949;
-    height: 100%;
-    width: 50px;
-    float: right;
+    height: 350px;
+    width: 70px;
+    float: left;
 }
 
 

From 779b80937a169b32709c666c33ee4300e55ecdfd Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 1 Feb 2020 09:48:49 +0100
Subject: [PATCH 12/13] css step 3

---
 level-1/step-3/step-3.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/level-1/step-3/step-3.css b/level-1/step-3/step-3.css
index 5589c8b2..a27e4861 100755
--- a/level-1/step-3/step-3.css
+++ b/level-1/step-3/step-3.css
@@ -1,17 +1,25 @@
 /* Step-3 You can assign padding to all sides of a container by using the padding shorthand property. */
 
 .content-mid {
+  padding: 65px 65px 65px 65px;
  
 }
 
 .content-mid-header {
   background: #444;
+  width: 100%;
+  height: 70px;
 }
 
 .content-container {
-
+  width: 100%;
+  height: 80px;
 }
 
 .content {
   background: #D8D8D8;
+  padding:30px 30px 30px 30px;
+  width: 95%;
+  height: 300px;
+  text-align: center
 }

From c0153da3123a231552f6f171047c93b971d69ee3 Mon Sep 17 00:00:00 2001
From: Yared <yayeyaye6@gmail.com>
Date: Sat, 1 Feb 2020 10:32:13 +0100
Subject: [PATCH 13/13] stage 3 last

---
 level-1/index.html        |  4 +++-
 level-1/step-3/step-3.css | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/level-1/index.html b/level-1/index.html
index e1e2e4fa..7851cabd 100644
--- a/level-1/index.html
+++ b/level-1/index.html
@@ -44,7 +44,9 @@
 
                     <header class="content-mid-header"></header>
 
-                    <div class="content">Incremental Development is a strategy for developing software. In this strategy you start with the simplest code you can possibly write to get things started. Often this is just empty files with the right names, in the right folders! Then in small steps you more code so that each little step works, builds on top of the last step, and is a little closer to the end goal.</div>
+                    <div class="content">
+                      <p>Incremental Development is a strategy for developing software. In this strategy you start with the simplest code you can possibly write to get things started. Often this is just empty files with the right names, in the right folders! Then in small steps you more code so that each little step works, builds on top of the last step, and is a little closer to the end goal.</p>
+                    </div>
 
                 </section>
 
diff --git a/level-1/step-3/step-3.css b/level-1/step-3/step-3.css
index a27e4861..ac99610f 100755
--- a/level-1/step-3/step-3.css
+++ b/level-1/step-3/step-3.css
@@ -1,25 +1,26 @@
 /* Step-3 You can assign padding to all sides of a container by using the padding shorthand property. */
 
 .content-mid {
-  padding: 65px 65px 65px 65px;
+  padding: 65x;
  
 }
 
 .content-mid-header {
   background: #444;
-  width: 100%;
-  height: 70px;
+  width: auto;
+  height: 20%;
 }
 
 .content-container {
-  width: 100%;
-  height: 80px;
+  width: auto;
+  height: 100px;
 }
 
 .content {
   background: #D8D8D8;
-  padding:30px 30px 30px 30px;
-  width: 95%;
-  height: 300px;
-  text-align: center
+  padding:20px;
+  width: auto;
+  height: 80%;
+  text-align: center;
+  
 }