From c76ac2f93f7a4c62977ce394ed2ff28e6681d292 Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <1675654+AtHeartEngineer@users.noreply.github.com>
Date: Wed, 8 Jun 2022 20:31:00 +0000
Subject: [PATCH 1/5] updated border radius and colors

---
 src/components/ProjectCard.css | 4 ++--
 src/index.css                  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/ProjectCard.css b/src/components/ProjectCard.css
index 7027651..cc3e483 100644
--- a/src/components/ProjectCard.css
+++ b/src/components/ProjectCard.css
@@ -2,12 +2,12 @@
   display: flex;
   justify-content: space-between;
   flex-direction: column;
-  border-radius: 0.2rem;
+  border-radius: var(--border-radius);
   box-shadow: var(--box-shadow);
 }
 
 .card-img-top {
-  border-radius: 0.2rem;
+  border-radius: var(--border-radius);
   object-fit: cover;
   max-height: 150px;
 }
diff --git a/src/index.css b/src/index.css
index 242dac6..bb3a7e5 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,6 +1,6 @@
 :root {
   --light-purple: rgb(195, 181, 250);
-  --purple: hsl(252, 45%, 65%);
+  --purple: #cfc4fb;
   --green: #a6e275;
   --aqua: #53d3e0;
   --light-aqua: #cbf2f6;
@@ -22,6 +22,7 @@
   --background: #f3f0fe;
   --text-color: #151616;
   --border-color: var(--text-color);
+  --border-radius: 4px;
   --link-bold: #854ad1;
 }
 

From dafa5816feecbfc1b241d30135b0cc6916de9a60 Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <1675654+AtHeartEngineer@users.noreply.github.com>
Date: Wed, 8 Jun 2022 20:31:11 +0000
Subject: [PATCH 2/5] Added discord callout component

---
 src/HomePage.tsx           |  2 ++
 src/components/Discord.css | 15 +++++++++++++++
 src/components/Discord.tsx | 19 +++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 src/components/Discord.css
 create mode 100644 src/components/Discord.tsx

diff --git a/src/HomePage.tsx b/src/HomePage.tsx
index 78fce15..2b872b1 100644
--- a/src/HomePage.tsx
+++ b/src/HomePage.tsx
@@ -1,6 +1,7 @@
 import Navbar from './components/Navbar';
 import Hero from './components/Hero';
 import Projects from './components/Projects';
+import Discord from './components/Discord';
 import Team from './components/Team';
 import Footer from './components/Footer';
 import './HomePage.css';
@@ -11,6 +12,7 @@ function HomePage() {
       <Navbar />
       <Hero />
       <Projects />
+      <Discord />
       <Team />
       <Footer />
     </div>
diff --git a/src/components/Discord.css b/src/components/Discord.css
new file mode 100644
index 0000000..746a737
--- /dev/null
+++ b/src/components/Discord.css
@@ -0,0 +1,15 @@
+#call_to_action {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 3em 0 2em;
+  padding: 3.5em;
+  border: 2px solid black;
+  border-left: none;
+  border-right: none;
+  background-color: var(--purple);
+}
+
+#call_to_action h2 {
+  font-weight: 900;
+}
diff --git a/src/components/Discord.tsx b/src/components/Discord.tsx
new file mode 100644
index 0000000..aa031e3
--- /dev/null
+++ b/src/components/Discord.tsx
@@ -0,0 +1,19 @@
+
+import discord from '../images/discord_round.svg';
+import './Discord.css'
+
+// Discord call to action
+function Discord() {
+  return (
+    <div id="call_to_action">
+      <h2>
+        Join our conversation on Discord!
+      </h2>
+      <a href="https://discord.gg/g5YTV7HHbh" target="_blank" rel="noopener noreferrer">
+        <img src={discord} alt="" />
+      </a>
+    </div>
+  )
+}
+
+export default Discord;

From caa41ae5192741d3dff363411b6da302652d1aa0 Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <1675654+AtHeartEngineer@users.noreply.github.com>
Date: Wed, 8 Jun 2022 20:46:23 +0000
Subject: [PATCH 3/5] Updated member section with better spacing, links, and
 borders

---
 src/components/Projects.css       |  2 +-
 src/components/Team.css           | 11 ++++++--
 src/components/TeamMemberCard.css | 46 ++++++++++++++++++-------------
 src/components/TeamMemberCard.tsx |  8 +++---
 src/images/github.svg             |  5 ++--
 5 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/components/Projects.css b/src/components/Projects.css
index d30fd8b..e5b76d5 100644
--- a/src/components/Projects.css
+++ b/src/components/Projects.css
@@ -8,7 +8,7 @@
   line-height: 1.2;
 }
 
-.Cards {
+#Projects .Cards {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(325px, 1fr));
   gap: 2.5rem;
diff --git a/src/components/Team.css b/src/components/Team.css
index 92e42f3..1ce22db 100644
--- a/src/components/Team.css
+++ b/src/components/Team.css
@@ -1,9 +1,16 @@
 #Team {
-  padding-inline: 5rem;
+  padding-inline: 5em;
+}
+
+#Team .Cards {
+  margin-top: 2.75em;
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 2.5rem;
 }
 
 @media screen and (max-width: 800px) {
   #Team {
-    padding-inline: 1rem;
+    padding-inline: 1em;
   }
 }
diff --git a/src/components/TeamMemberCard.css b/src/components/TeamMemberCard.css
index 88f268b..40d3071 100644
--- a/src/components/TeamMemberCard.css
+++ b/src/components/TeamMemberCard.css
@@ -1,24 +1,32 @@
-.members-card{
-    display: flex;
-    justify-content: space-between;
-    flex-direction: column;
-    padding:0;
+.members-card {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
 }
-.members-card-body{
 
+.members-card-title {
+  font-weight: 600;
+  font-size: 1.8rem;
+  line-height: 1.2rem;
+  padding-bottom: 1.5rem;
 }
-.members-card-title{
-font-weight: 600;
-font-size: 1.8rem;
-line-height: 1.02rem;
-padding-bottom:1rem;
+.card-text {
+  font-size: 1.2rem;
+  line-height: 1.2rem;
+  padding-bottom: 1.5rem;
 }
-.card-text{
-    font-size:1.2rem;
-    line-height: 1.2rem;
-    padding:1rem 0;
+.members-card-footer {
+  border-top: 2px solid var(--gray);
+}
+
+.members-card-footer a {
+  display: flex;
+  justify-content: space-between;
+  padding-block: 0.5em;
+  font-weight: 600;
+  font-size: 0.9rem;
+}
+
+.members-card-footer > *:not(:first-child) {
+  border-top: 2px solid var(--gray);
 }
-.members-card-footer{
-    border-top: 2px solid var(--gray);
-    padding:1rem 0;
-}
\ No newline at end of file
diff --git a/src/components/TeamMemberCard.tsx b/src/components/TeamMemberCard.tsx
index e3a8518..fd7e980 100644
--- a/src/components/TeamMemberCard.tsx
+++ b/src/components/TeamMemberCard.tsx
@@ -1,7 +1,7 @@
 import globe from "../images/globe.svg";
 import github from "../images/github.svg";
-import discord from "../images/discord.svg";
-import twitter from "../images/twitter.svg";
+import discord from "../images/discord_round.svg";
+import twitter from "../images/twitter_round.svg";
 import telegram from "../images/telegram.svg";
 import "./TeamMemberCard.css";
 import ColorHash from "color-hash";
@@ -24,7 +24,7 @@ interface Links {
   telegram?: string;
 }
 
-function renderLink(url: string, source: string, icon: string, button: boolean = false, text: boolean = false): any {
+function renderLink(url: string, source: string, icon: string, button: boolean = false, text: boolean = true): any {
   let RgExp = new RegExp('^(?:[a-z]+:)?//', 'i');
   if (!RgExp.test(url)) {
     url = '//' + url;
@@ -33,8 +33,8 @@ function renderLink(url: string, source: string, icon: string, button: boolean =
     return (
       <div className="link" key={url}>
         <a href={url} target="_blank" rel="noopener noreferrer">
-          <img className="icon" src={icon} alt={source} />
           {text ? <div className="link-title">{source}</div> : null}
+          <img className="icon" src={icon} alt={source} />
         </a>
       </div>
     );
diff --git a/src/images/github.svg b/src/images/github.svg
index 717a5ca..0c2f8e2 100644
--- a/src/images/github.svg
+++ b/src/images/github.svg
@@ -1,3 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 0.296997C5.37 0.296997 0 5.67 0 12.297C0 17.6 3.438 22.097 8.205 23.682C8.805 23.795 9.025 23.424 9.025 23.105C9.025 22.82 9.015 22.065 9.01 21.065C5.672 21.789 4.968 19.455 4.968 19.455C4.422 18.07 3.633 17.7 3.633 17.7C2.546 16.956 3.717 16.971 3.717 16.971C4.922 17.055 5.555 18.207 5.555 18.207C6.625 20.042 8.364 19.512 9.05 19.205C9.158 18.429 9.467 17.9 9.81 17.6C7.145 17.3 4.344 16.268 4.344 11.67C4.344 10.36 4.809 9.29 5.579 8.45C5.444 8.147 5.039 6.927 5.684 5.274C5.684 5.274 6.689 4.952 8.984 6.504C9.944 6.237 10.964 6.105 11.984 6.099C13.004 6.105 14.024 6.237 14.984 6.504C17.264 4.952 18.269 5.274 18.269 5.274C18.914 6.927 18.509 8.147 18.389 8.45C19.154 9.29 19.619 10.36 19.619 11.67C19.619 16.28 16.814 17.295 14.144 17.59C14.564 17.95 14.954 18.686 14.954 19.81C14.954 21.416 14.939 22.706 14.939 23.096C14.939 23.411 15.149 23.786 15.764 23.666C20.565 22.092 24 17.592 24 12.297C24 5.67 18.627 0.296997 12 0.296997" fill="#373A3E"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none"
+  xmlns="http://www.w3.org/2000/svg">
+  <path d="M12 0.296997C5.37 0.296997 0 5.67 0 12.297C0 17.6 3.438 22.097 8.205 23.682C8.805 23.795 9.025 23.424 9.025 23.105C9.025 22.82 9.015 22.065 9.01 21.065C5.672 21.789 4.968 19.455 4.968 19.455C4.422 18.07 3.633 17.7 3.633 17.7C2.546 16.956 3.717 16.971 3.717 16.971C4.922 17.055 5.555 18.207 5.555 18.207C6.625 20.042 8.364 19.512 9.05 19.205C9.158 18.429 9.467 17.9 9.81 17.6C7.145 17.3 4.344 16.268 4.344 11.67C4.344 10.36 4.809 9.29 5.579 8.45C5.444 8.147 5.039 6.927 5.684 5.274C5.684 5.274 6.689 4.952 8.984 6.504C9.944 6.237 10.964 6.105 11.984 6.099C13.004 6.105 14.024 6.237 14.984 6.504C17.264 4.952 18.269 5.274 18.269 5.274C18.914 6.927 18.509 8.147 18.389 8.45C19.154 9.29 19.619 10.36 19.619 11.67C19.619 16.28 16.814 17.295 14.144 17.59C14.564 17.95 14.954 18.686 14.954 19.81C14.954 21.416 14.939 22.706 14.939 23.096C14.939 23.411 15.149 23.786 15.764 23.666C20.565 22.092 24 17.592 24 12.297C24 5.67 18.627 0.296997 12 0.296997" fill="#151616"/>
 </svg>

From c3c2b3b0554afc09c8c2a52e16f446bc272c9590 Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <1675654+AtHeartEngineer@users.noreply.github.com>
Date: Wed, 8 Jun 2022 21:08:44 +0000
Subject: [PATCH 4/5] Updated footer with new design

---
 src/components/Footer.css | 69 +++++++++++++++++++++++++++++++++++++--
 src/components/Footer.tsx | 33 ++++++++++++-------
 2 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/src/components/Footer.css b/src/components/Footer.css
index 6e43832..bcc5deb 100644
--- a/src/components/Footer.css
+++ b/src/components/Footer.css
@@ -1,8 +1,71 @@
-.footer {
+#footer {
   display: flex;
   justify-content: space-between;
   gap: 1rem;
-  border-top: 3px solid var(--gray);
-  margin: 3em 0;
+  border-top: 2px solid var(--gray);
+  margin: 3em 5em;
   padding: 1.5em 1em;
 }
+
+#copyright {
+  display: flex;
+  flex-direction: row;
+  justify-content: start;
+  gap: 1em;
+}
+
+#copyright img {
+  max-width: 50px;
+}
+
+#footer-text {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-evenly;
+  align-items: start;
+  padding: 0.5em 0;
+}
+
+#footer-text > * {
+  margin: 0;
+}
+
+#footer-title {
+  font-weight: 700;
+}
+
+#footer-links {
+  display: flex;
+  flex-direction: row;
+  gap: 2em;
+}
+
+#footer-links > * {
+  display: flex;
+  flex-direction: row;
+  gap: 0.75em;
+  font-weight: 500;
+  align-items: center;
+}
+
+#footer-links img {
+  max-width: 40px;
+}
+
+@media screen and (max-width: 800px) {
+  #footer {
+    margin: 1em 3em;
+    padding: 1em;
+  }
+
+  #copyright img {
+    display: none;
+  }
+
+  #footer-links {
+    flex-direction: column;
+  }
+  #footer-links img {
+    max-width: 20px;
+  }
+}
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 16a2d44..53e1ba9 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -1,6 +1,7 @@
 import "./Footer.css";
-import discord from "../images/discord.svg";
-import twitter from "../images/twitter.svg";
+import logo from '../images/pse-logo.svg';
+import discord from "../images/discord_round.svg";
+import twitter from "../images/twitter_round.svg";
 
 function copyright() {
   let websiteCreationYear = 2022;
@@ -14,18 +15,26 @@ function copyright() {
 
 export default function Footer() {
   return (
-    <div className="footer">
-      <p id="copyright">The Privacy and Scaling Exploration Team © {copyright()}</p>
-      <p >
-        <a href="https://twitter.com/PrivacyScaling" className="ms-3">
-          <img src={twitter} alt="" className="icon" />
-          <span>Twitter</span>
-        </a>
+    <div id="footer">
+      <div id="copyright">
+        <img src={logo} alt="Pse Logo" />
+        <div id="footer-text">
+          <p id="footer-title">Privacy and Scaling Exploration Team © {copyright()}</p>
+          <p>A multidisciplinary team supported by the Ethereum Foundation.</p>
+        </div>
+      </div>
+      <div id="footer-links">
         <a href="https://discord.gg/g5YTV7HHbh" className="ms-3">
-          <img src={discord} alt="" className="icon" />
-          <span>Discord</span>
+          <span>Chat with us</span>
+          <img src={discord} alt="Discord Icon" />
+
         </a>
-      </p>
+        <a href="https://twitter.com/PrivacyScaling" className="ms-3">
+          <span>Follow Updates</span>
+          <img src={twitter} alt="Twitter Icon" />
+
+        </a>
+      </div>
     </div>
   );
 }

From e702abc4afa2be9111c4c85855fd7bddb6cd8e46 Mon Sep 17 00:00:00 2001
From: AtHeartEngineer <1675654+AtHeartEngineer@users.noreply.github.com>
Date: Wed, 8 Jun 2022 21:10:20 +0000
Subject: [PATCH 5/5] CLR website link updated

---
 src/data/Projects.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/data/Projects.json b/src/data/Projects.json
index 4f6b031..2cde4c8 100644
--- a/src/data/Projects.json
+++ b/src/data/Projects.json
@@ -29,7 +29,6 @@
   },
   {
     "name": "zkEVM",
-    
     "description": "A zk-rollup that can generate zk proofs for general EVM verification. This allows us to build a fully EVM-compatible zk-Rollup, which any existing Ethereum application can easily migrate to.",
     "links": [
       {
@@ -108,7 +107,7 @@
     "description": "Infrastructure to make it easy for any community to run their own CLR round with clr.fund.",
     "links": [
       {
-        "website": "https://clrfund-xdai.on.fleek.co/#/"
+        "website": "https://clr.fund/#/"
       },
       {
         "github": "https://clrfund.gitbook.io/deployer/"