From 370e7906af8ea996940729b8710fd4edb107f56c Mon Sep 17 00:00:00 2001 From: chandredewet Date: Tue, 21 Mar 2023 19:19:24 +0200 Subject: [PATCH 1/6] Redoing final Styling --- client/src/pages/Contact.css | 13 ++++++++----- client/src/pages/Contact.js | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/client/src/pages/Contact.css b/client/src/pages/Contact.css index 6b745b3..331b466 100644 --- a/client/src/pages/Contact.css +++ b/client/src/pages/Contact.css @@ -1,14 +1,16 @@ @import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;500;600;700;800&family=Plus+Jakarta+Sans:wght@500&family=Raleway:ital,wght@0,300;0,400;0,500;0,600;0,700;0,900;1,400&display=swap'); - +/* body { margin: 0 auto; max-width: 100%; box-sizing: border-box; color:#000000; -} +} */ + -main { +.contactPage { + margin: auto; font-family: 'Open Sans'; font-style: normal; font-weight: 400; @@ -19,9 +21,10 @@ main { } .contactintro { - position: relative; + /* position: relative; */ display: inline-block; text-align: center; + color:red; } h2 { @@ -90,7 +93,7 @@ h2 { } .contactform { - padding-left:250px; + margin: 0 auto; } .formitem{ diff --git a/client/src/pages/Contact.js b/client/src/pages/Contact.js index 6b41a7e..c829c50 100644 --- a/client/src/pages/Contact.js +++ b/client/src/pages/Contact.js @@ -76,7 +76,7 @@ const Contact = () => { }; return ( -
+
From 9e521173ee64a5e34d38f0c973bf744ef6aa21b5 Mon Sep 17 00:00:00 2001 From: chandredewet Date: Tue, 21 Mar 2023 19:42:54 +0200 Subject: [PATCH 2/6] Buttons edited and Navbar centered --- client/src/components/Navbar/Header.js | 4 ++-- client/src/components/Navbar/NavbarBlue.css | 24 ++++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/client/src/components/Navbar/Header.js b/client/src/components/Navbar/Header.js index bd844fe..44333da 100644 --- a/client/src/components/Navbar/Header.js +++ b/client/src/components/Navbar/Header.js @@ -60,10 +60,10 @@ function NavbarBlue() {
- + - +
diff --git a/client/src/components/Navbar/NavbarBlue.css b/client/src/components/Navbar/NavbarBlue.css index 564f068..e92f612 100644 --- a/client/src/components/Navbar/NavbarBlue.css +++ b/client/src/components/Navbar/NavbarBlue.css @@ -16,12 +16,10 @@ } .pageActive { - border: 1px solid #25dac5; + border: 2px solid #25dac5; height: 40px; - border-radius: 10px; - -webkit-box-shadow: inset 1px 2px 5px -1px rgba(37, 218, 197, 1); - -moz-box-shadow: inset 1px 2px 5px -1px rgba(37, 218, 197, 1); - box-shadow: inset 1px 2px 5px -1px rgba(37, 218, 197, 1); + border-radius: 4px; + } .pageActive a { color: #25dac5; @@ -47,6 +45,22 @@ header { align-items: center; } */ +#loginButton { + border: 2px #25dac5 solid ; + border-radius: 4px; + color: #eee; + } + +#signupButton { + color:#eee; + background-color: #25dac5; +} + +.navPosition { + align-self: center; + margin: auto; +} + nav a { margin: 0 1rem; color: var(--textColor); From 42a52f4fc095f9326ea1f888dbbf0afca6b9cb56 Mon Sep 17 00:00:00 2001 From: chandredewet Date: Wed, 22 Mar 2023 13:12:47 +0200 Subject: [PATCH 3/6] centred navbar and homepage --- client/src/components/Navbar/Header.js | 2 +- client/src/components/Navbar/NavbarBlue.css | 3 ++- client/src/pages/Home.css | 24 ++++++++++++++++----- client/src/pages/Home.js | 4 +--- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/client/src/components/Navbar/Header.js b/client/src/components/Navbar/Header.js index 44333da..c11cd44 100644 --- a/client/src/components/Navbar/Header.js +++ b/client/src/components/Navbar/Header.js @@ -16,7 +16,7 @@ function NavbarBlue() { return (

EduFocus

-
- - +
); diff --git a/client/src/pages/OurPeople.css b/client/src/pages/OurPeople.css index 8de9b3c..9a4e347 100644 --- a/client/src/pages/OurPeople.css +++ b/client/src/pages/OurPeople.css @@ -1,5 +1,18 @@ @import url("https://fonts.googleapis.com/css2?family=DM+Sans:400,700,500"); +@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;500;600;700;800&family=Plus+Jakarta+Sans:wght@500&family=Raleway:ital,wght@0,300;0,400;0,500;0,600;0,700;0,900;1,400&display=swap'); +.pageText { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + color:black; +} + +.personHeading{ + font-family: 'Raleway'; + font-style: normal; + color:#1E0F9E; +} .rectangle { position: absolute; @@ -36,10 +49,10 @@ top: 35.78%; left: 9.06%; line-height: 20px; - font-weight: 500; display: inline-block; mix-blend-mode: normal; } + .product-manager { position: absolute; top: 19.17%; diff --git a/client/src/pages/OurPeople.js b/client/src/pages/OurPeople.js index 8e0ee24..39cc926 100644 --- a/client/src/pages/OurPeople.js +++ b/client/src/pages/OurPeople.js @@ -15,14 +15,14 @@ const OurPeople = () => {
-
+
Dr Dee is our Founder and Managing Director with 30+ years of experience in teaching, financial management, and entrepreneurship.
Founder and Managing Director

-
Dr Dorothy E. Esau
+
Dr Dorothy E. Esau
{
-
+
Grace Bruintjies, our Chairperson, holds a prospective Ph.D. and is a co-researcher on the SU-cohort Community Engaged Teaching and Learning NRF project.
Chairperson -
Grace Bruintjies
+
Grace Bruintjies
{
-
+
{ "Cherith is a teacher with a Bachelor's in Education from the Western Cape Education Department. She is currently pursuing her B.Ed Honours degree in Language & Literacy at the University of the Western Cape and is committed to being a lifelong learner" }
Treasurer -
Cherith Wareley
+
Cherith Wareley
{
-
+
holds a BA (Human Ecology) degree from the University of the Western Cape, and Certificates in NPO Management and Business Management Coaching from the University of Stellenbosch Business School.
Secretary -
Faith Brown
+
Faith Brown
{
-
+
{ "Jade (Damonse) Glenn has an Honours in Educational Psychology and a Bachelor of Education degree in English and Life Orientation from UWC. " }
Volunteer -
Jade Damonse
+
Jade Damonse
{
-
+
He has over 20 years of sales and marketing experience in the corporate sector and recently completed a Master's degree in Entrepreneurial Studies at CPUT with a focus on Social @@ -116,7 +116,7 @@ const OurPeople = () => { Marketing and Public Relations expert -
Henry Esau
+
Henry Esau
Date: Wed, 22 Mar 2023 22:21:12 +0200 Subject: [PATCH 5/6] redoing edits --- client/src/components/Navbar/Header.js | 6 +- client/src/components/Navbar/NavbarBlue.css | 29 +- client/src/pages/Contact.css | 15 +- client/src/pages/Contact.js | 284 ++++++++++---------- client/src/pages/Home.css | 24 +- client/src/pages/Home.js | 4 +- client/src/pages/OurPeople.css | 15 +- client/src/pages/OurPeople.js | 24 +- client/src/pages/about.css | 7 - 9 files changed, 177 insertions(+), 231 deletions(-) diff --git a/client/src/components/Navbar/Header.js b/client/src/components/Navbar/Header.js index c11cd44..bd844fe 100644 --- a/client/src/components/Navbar/Header.js +++ b/client/src/components/Navbar/Header.js @@ -16,7 +16,7 @@ function NavbarBlue() { return (

EduFocus

-