From 566ec5acbaa1bd0baf753c2b89f6c674a942280c Mon Sep 17 00:00:00 2001
From: Thomas Haile <59530856+thomashaile@users.noreply.github.com>
Date: Fri, 17 Jan 2020 21:27:38 +0100
Subject: [PATCH 01/26] Update step-1.css
---
level-1/step-1/step-1.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index 78865286..5104fec3 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -29,4 +29,5 @@
width: 100%;
height: 100px;
background: #3A3A3A;
-}
\ No newline at end of file
+ bottom: 0;
+}
From 0afc0b7fe8700414f6a5eb84331d0b248638031b Mon Sep 17 00:00:00 2001
From: Thomas Haile <59530856+thomashaile@users.noreply.github.com>
Date: Fri, 17 Jan 2020 21:31:30 +0100
Subject: [PATCH 02/26] Update step-1.css
---
level-1/step-1/step-1.css | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index 5104fec3..ebe64af8 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -11,6 +11,7 @@
/* This height is a placeholder. You will need to make some adjustments to get this container to look like the design. */
height: 100px;
background: #565555;
+ float: left;
}
@@ -19,8 +20,9 @@
.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: auto;
background: #B0B0B0;
+ float: right;
}
/* Use float to get this container to the bottom of the screen */
@@ -29,5 +31,6 @@
width: 100%;
height: 100px;
background: #3A3A3A;
+ position: absolute;
bottom: 0;
}
From a3d8b5704a6dc64690963cd504d6f9a9d34fbd8e Mon Sep 17 00:00:00 2001
From: Thomas Haile <59530856+thomashaile@users.noreply.github.com>
Date: Fri, 17 Jan 2020 21:32:35 +0100
Subject: [PATCH 03/26] Update step-1.css
---
level-1/step-1/step-1.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1.css
index ebe64af8..b9b3bdbc 100755
--- a/level-1/step-1/step-1.css
+++ b/level-1/step-1/step-1.css
@@ -9,7 +9,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: 150px;
background: #565555;
float: left;
}
@@ -20,7 +20,7 @@
.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: auto;
+ height: 150px;
background: #B0B0B0;
float: right;
}
From b844304001e3d568a7c7162de2f83c312ed2c296 Mon Sep 17 00:00:00 2001
From: Thomas Haile <59530856+thomashaile@users.noreply.github.com>
Date: Fri, 17 Jan 2020 21:47:14 +0100
Subject: [PATCH 04/26] Update step-2.css
---
level-1/step-2/step-2.css | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/level-1/step-2/step-2.css b/level-1/step-2/step-2.css
index 73095f05..184a47eb 100644
--- a/level-1/step-2/step-2.css
+++ b/level-1/step-2/step-2.css
@@ -1,12 +1,14 @@
/* 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,26 +17,37 @@
.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; */
.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. */
-
.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 614d4f40adcb777667d64de04ca284d314ee1668 Mon Sep 17 00:00:00 2001
From: Thomas Haile <59530856+thomashaile@users.noreply.github.com>
Date: Fri, 17 Jan 2020 21:52:59 +0100
Subject: [PATCH 05/26] Update step-3.css
---
level-1/step-3/step-3.css | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/level-1/step-3/step-3.css b/level-1/step-3/step-3.css
index 5589c8b2..30100041 100755
--- a/level-1/step-3/step-3.css
+++ b/level-1/step-3/step-3.css
@@ -1,17 +1,27 @@
/* Step-3 You can assign padding to all sides of a container by using the padding shorthand property. */
+
+
.content-mid {
-
+ padding: 80px;
}
.content-mid-header {
- background: #444;
+ background: #444;
+ width: auto;
+ height: 20%
}
.content-container {
-
+ width: auto;
+ height: 100%;
}
.content {
background: #D8D8D8;
+ width: auto;
+ height: 80%;
+ background: #D8D8D8;
+ padding: 20px;
+ text-align: center;
}
From b242793a862cab00a897ef5848223aaaf7cf8fb2 Mon Sep 17 00:00:00 2001
From: Thomas Haile <59530856+thomashaile@users.noreply.github.com>
Date: Fri, 17 Jan 2020 21:59:04 +0100
Subject: [PATCH 06/26] Update index.html
---
level-1/index.html | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/level-1/index.html b/level-1/index.html
index 4de4033c..8fe62d70 100644
--- a/level-1/index.html
+++ b/level-1/index.html
@@ -44,7 +44,9 @@