From f43624e77163596173885a93b04e8094e8907125 Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Sun, 17 May 2020 15:28:35 +0100
Subject: [PATCH 01/13] added nav bar html + css
---
week2/2-website/css/style.css | 43 +++++++++++++++++++++++++++++++++--
week2/2-website/index.html | 26 +++++++++++++++++----
2 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css
index 5cb025ce..2b23ff7b 100644
--- a/week2/2-website/css/style.css
+++ b/week2/2-website/css/style.css
@@ -1,5 +1,4 @@
-
- /* We are using the 'Roboto' font from Google. This has already been added to your HTML header */
+/* We are using the 'Roboto' font from Google. This has already been added to your HTML header */
body {
font-family: 'Roboto', sans-serif;
@@ -16,4 +15,44 @@ body {
* - When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex'
*/
+nav {
+ display: flex;
+ color: gray;
+}
+
+nav ul {
+ text-decoration: none;
+ list-style: none;
+}
+
+nav ul li {
+ display: inline;
+ padding: 5px;
+ margin: 5px;
+}
+
+nav ul li:first-child {
+
+ font-weight: bold;
+}
+
+.navigation-img {
+ display: block;
+}
+
+.navigation-container {
+ background-color: white;
+ width: 100%;
+ text-align: center;
+ border-bottom: 1px solid black;
+}
+
+#karma-logo {
+ margin-left: 50px;
+ float: left;
+ height: auto;
+ width: auto;
+ max-height: 50px;
+ max-width: 50px;
+}
\ No newline at end of file
diff --git a/week2/2-website/index.html b/week2/2-website/index.html
index 876b59d6..aecba530 100644
--- a/week2/2-website/index.html
+++ b/week2/2-website/index.html
@@ -1,5 +1,6 @@
+
@@ -8,14 +9,31 @@
-
-
+
+
-
+
+
+
+
+
-
+
+
\ No newline at end of file
From 9de90b40bc1c6d7fa617f4a722234b91e6144d88 Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Mon, 18 May 2020 15:20:18 +0100
Subject: [PATCH 02/13] added intro section html + css
---
week2/2-website/css/style.css | 35 +++++++++++++++++++++++++++++++++++
week2/2-website/index.html | 5 +++++
2 files changed, 40 insertions(+)
diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css
index 2b23ff7b..4c766826 100644
--- a/week2/2-website/css/style.css
+++ b/week2/2-website/css/style.css
@@ -45,8 +45,43 @@ nav ul li:first-child {
width: 100%;
text-align: center;
border-bottom: 1px solid black;
+ position: fixed;
}
+#first-background {
+ width: 100%;
+ height: auto;
+}
+
+#introducingKarma {
+ background-image: url("/2-website/img/first-background.jpg");
+ max-width: 100%;
+ height: 780px;
+ background-repeat: no-repeat;
+ color: white;
+ padding-top: 50px;
+ text-align: center;
+ padding: 270px 0;
+ font-family: 'Roboto', sans-serif;
+}
+
+h1 {
+ font-size: 3em;
+ font-weight: lighter;
+}
+
+h2 {
+ font-weight: lighter;
+}
+
+#learnMore {
+ background-color: orangered;
+ color: white;
+ box-shadow: none;
+ border: 0px;
+ padding: 10px 20px 10px 20px;
+ border-radius: 5px;
+}
#karma-logo {
margin-left: 50px;
diff --git a/week2/2-website/index.html b/week2/2-website/index.html
index aecba530..a720bd3e 100644
--- a/week2/2-website/index.html
+++ b/week2/2-website/index.html
@@ -30,6 +30,11 @@
+
+ Introducing Karma
+ Bring WiFi with you, everywhere you go.
+
+
From d1459c61541bc635fd35dae608acccfb292f2a02 Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Tue, 19 May 2020 09:19:15 +0100
Subject: [PATCH 03/13] minor changes
---
week2/2-website/css/style.css | 11 ++++++++++-
week2/2-website/index.html | 12 ++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css
index 4c766826..47453c8b 100644
--- a/week2/2-website/css/style.css
+++ b/week2/2-website/css/style.css
@@ -36,6 +36,11 @@ nav ul li:first-child {
font-weight: bold;
}
+nav ul li a:hover {
+
+ color: black;
+}
+
.navigation-img {
display: block;
}
@@ -75,7 +80,7 @@ h2 {
}
#learnMore {
- background-color: orangered;
+ background-color: rgb(255, 81, 0);
color: white;
box-shadow: none;
border: 0px;
@@ -83,6 +88,10 @@ h2 {
border-radius: 5px;
}
+#learnMore:hover {
+ background-color: orangered;
+}
+
#karma-logo {
margin-left: 50px;
float: left;
diff --git a/week2/2-website/index.html b/week2/2-website/index.html
index a720bd3e..a0e0bfb9 100644
--- a/week2/2-website/index.html
+++ b/week2/2-website/index.html
@@ -20,12 +20,12 @@
- - Meet Karma
- - How it Works
- - Store
- - Blog
- - Help
- - Login
+ - Meet Karma
+ - How it Works
+ - Store
+ - Blog
+ - Help
+ - Login
From ac25625975a671f41037b13d30779d8f5a2d71bd Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Tue, 19 May 2020 10:49:36 +0100
Subject: [PATCH 04/13] added html and css for everyone needs karma section
---
week2/2-website/css/style.css | 12 +++++++++++-
week2/2-website/index.html | 9 +++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css
index 47453c8b..635b3801 100644
--- a/week2/2-website/css/style.css
+++ b/week2/2-website/css/style.css
@@ -61,7 +61,7 @@ nav ul li a:hover {
#introducingKarma {
background-image: url("/2-website/img/first-background.jpg");
max-width: 100%;
- height: 780px;
+ height: auto;
background-repeat: no-repeat;
color: white;
padding-top: 50px;
@@ -99,4 +99,14 @@ h2 {
width: auto;
max-height: 50px;
max-width: 50px;
+}
+
+#everyoneNeedsKarma {
+ margin-left: 420px;
+ display: flex;
+ width: 650px;
+ flex-direction: row;
+ align-items: stretch;
+ justify-content: space-between;
+ flex-wrap: wrap;
}
\ No newline at end of file
diff --git a/week2/2-website/index.html b/week2/2-website/index.html
index a0e0bfb9..e1875601 100644
--- a/week2/2-website/index.html
+++ b/week2/2-website/index.html
@@ -35,6 +35,15 @@ Introducing Karma
Bring WiFi with you, everywhere you go.
+
+ Everyone needs a little Karma.
+ 
+ 
+ 
+ Internet for all devices
+ Boost your productivity
+ Pay as you go
+
From 1ff0eb883cdfb68db80e412930c5b0a2fba0162d Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Tue, 19 May 2020 12:17:57 +0100
Subject: [PATCH 05/13] added footer html + css
---
week2/2-website/css/style.css | 31 +++++++++++++++++++++++++++++--
week2/2-website/index.html | 16 ++++++++++++++++
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css
index 635b3801..b222bb6f 100644
--- a/week2/2-website/css/style.css
+++ b/week2/2-website/css/style.css
@@ -36,7 +36,7 @@ nav ul li:first-child {
font-weight: bold;
}
-nav ul li a:hover {
+nav ul li:hover {
color: black;
}
@@ -102,11 +102,38 @@ h2 {
}
#everyoneNeedsKarma {
- margin-left: 420px;
+ margin-left: 380px;
display: flex;
width: 650px;
flex-direction: row;
align-items: stretch;
justify-content: space-between;
flex-wrap: wrap;
+}
+
+#iconContainer {
+ display: flex;
+ justify-content: center;
+}
+
+#iconContainer i {
+ margin: 5px;
+ padding-top: 5px;
+}
+
+.iconBorder {
+ margin: 5px;
+ align-items: center;
+ justify-content: center;
+ width: 40px;
+ height: 40px;
+ border-radius: 40px;
+ border: 1px solid lightgrey;
+}
+
+footer {
+ text-align: center;
+ font-size: 10px;
+ font-weight: bold;
+ font-family: 'Roboto', sans-serif;
}
\ No newline at end of file
diff --git a/week2/2-website/index.html b/week2/2-website/index.html
index e1875601..1e9dfd7b 100644
--- a/week2/2-website/index.html
+++ b/week2/2-website/index.html
@@ -44,6 +44,22 @@ Internet for all devices
Boost your productivity
Pay as you go
+
From 1f519e7fd3419df6da6d3b9802004a9d608af6e4 Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Tue, 19 May 2020 13:38:31 +0100
Subject: [PATCH 06/13] structured CSS page with comments
---
week2/2-website/css/style.css | 50 ++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css
index b222bb6f..02558489 100644
--- a/week2/2-website/css/style.css
+++ b/week2/2-website/css/style.css
@@ -15,6 +15,19 @@ body {
* - When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex'
*/
+/* General Styles */
+
+h1 {
+ font-size: 3em;
+ font-weight: lighter;
+}
+
+h2 {
+ font-weight: lighter;
+}
+
+/* Nav Bar */
+
nav {
display: flex;
color: gray;
@@ -41,10 +54,6 @@ nav ul li:hover {
color: black;
}
-.navigation-img {
- display: block;
-}
-
.navigation-container {
background-color: white;
width: 100%;
@@ -53,6 +62,17 @@ nav ul li:hover {
position: fixed;
}
+#karma-logo {
+ margin-left: 50px;
+ float: left;
+ height: auto;
+ width: auto;
+ max-height: 50px;
+ max-width: 50px;
+}
+
+/* Section 1 Style */
+
#first-background {
width: 100%;
height: auto;
@@ -70,14 +90,7 @@ nav ul li:hover {
font-family: 'Roboto', sans-serif;
}
-h1 {
- font-size: 3em;
- font-weight: lighter;
-}
-
-h2 {
- font-weight: lighter;
-}
+/* Section 2 Style */
#learnMore {
background-color: rgb(255, 81, 0);
@@ -92,17 +105,8 @@ h2 {
background-color: orangered;
}
-#karma-logo {
- margin-left: 50px;
- float: left;
- height: auto;
- width: auto;
- max-height: 50px;
- max-width: 50px;
-}
-
#everyoneNeedsKarma {
- margin-left: 380px;
+ margin-left: 30%;
display: flex;
width: 650px;
flex-direction: row;
@@ -111,6 +115,8 @@ h2 {
flex-wrap: wrap;
}
+/* Footer Style */
+
#iconContainer {
display: flex;
justify-content: center;
From 306a3704797fe2f4af0308b87d0d3dd34274e450 Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Thu, 21 May 2020 11:17:09 +0100
Subject: [PATCH 07/13] made some changes to CSS to demonstrate coding for blog
---
week2/2-website/css/style.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/week2/2-website/css/style.css b/week2/2-website/css/style.css
index 02558489..e1798faf 100644
--- a/week2/2-website/css/style.css
+++ b/week2/2-website/css/style.css
@@ -90,8 +90,6 @@ nav ul li:hover {
font-family: 'Roboto', sans-serif;
}
-/* Section 2 Style */
-
#learnMore {
background-color: rgb(255, 81, 0);
color: white;
@@ -105,6 +103,8 @@ nav ul li:hover {
background-color: orangered;
}
+/* Section 2 Style */
+
#everyoneNeedsKarma {
margin-left: 30%;
display: flex;
From de2d905aee6b7659722622e3c3f74df48bc3ef42 Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Sun, 7 Jun 2020 13:24:18 +0100
Subject: [PATCH 08/13] added test comment
---
week2/.vscode/settings.json | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 week2/.vscode/settings.json
diff --git a/week2/.vscode/settings.json b/week2/.vscode/settings.json
new file mode 100644
index 00000000..6f3a2913
--- /dev/null
+++ b/week2/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "liveServer.settings.port": 5501
+}
\ No newline at end of file
From 2123753c2573e99dc739f9b5e9337df74257e987 Mon Sep 17 00:00:00 2001
From: carterd888 <62474051+carterd888@users.noreply.github.com>
Date: Sun, 7 Jun 2020 13:39:07 +0100
Subject: [PATCH 09/13] added testing comment
---
week2/2-website/index.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/week2/2-website/index.html b/week2/2-website/index.html
index 1e9dfd7b..75878568 100644
--- a/week2/2-website/index.html
+++ b/week2/2-website/index.html
@@ -65,5 +65,6 @@ © Karma Mobility, Inc.
+