Merge pull request #50 from IEEEUCSC/2024

New logo updates and fixes
IEEEUCSC · Nov 9, 2024 · 1fa8406 · 1fa8406
2 parents a8b1225 + b5c677d
commit 1fa8406
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/src/assets/ieeeucsc.webp b/src/assets/ieeeucsc.webp
diff --git a/src/assets/ieeeucsc.png → src/assets/ieeeucsc_old.png b/src/assets/ieeeucsc.png → src/assets/ieeeucsc_old.png
diff --git a/src/assets/ieeeucsc_old.webp b/src/assets/ieeeucsc_old.webp
diff --git a/src/components/Common/Footer/index.js b/src/components/Common/Footer/index.js
@@ -13,7 +13,7 @@ function Footer() {
             src={logo}
             alt="IEEE-UCSC"
             className="img-foot"
-            style={{ width: "50%" }}
+            style={{ width: "60%" }}
           />
         </div>
         <ul className="list-inline">

diff --git a/src/components/Common/TopNavbar/index.js b/src/components/Common/TopNavbar/index.js
@@ -15,7 +15,7 @@ import {
   faUsers,
 } from "@fortawesome/free-solid-svg-icons";
 
-import logo from "../../../assets/ieeeucsc.webp";
+import ucscieee_logo from "../../../assets/ieeeucsc.webp";
 import ieee_logo from "../../../assets/logo-ieee.svg";
 import "./styles.css";
 
@@ -31,19 +31,19 @@ const NavbarLogos = () => {
         <Row xs={12} className="w-100 mx-0 my-1 my-lg-0">
           <Col xs={12}>
             <Navbar.Brand className="pt-1 pb-2 pt-lg-0 pb-lg-1 d-flex justify-content-between w-100">
-              <NavLink to="/">
+              <NavLink to="/" className="d-flex align-items-center">
                 <img
-                  src={logo}
+                  src={ucscieee_logo}
                   alt="IEEE Student Branch of UCSC Logo"
-                  height="70px"
-                  className="pt-2 pt-lg-1 pb-lg-0"
+                  height="50px"
+                  className="pt-2 pt-lg-0"
                 />
               </NavLink>
               <a href="https://ieee.org" rel="noreferrer" target="_blank">
                 <img
                   src={ieee_logo}
                   alt="IEEE Logo"
-                  height="70px"
+                  height="60px"
                   className="py-4 py-md-3 pe-2"
                 />
               </a>

diff --git a/src/data/team.json b/src/data/team.json
@@ -110,7 +110,7 @@
       "img": "scom/likitha.webp",
       "linkedin": "https://www.linkedin.com/in/likitha-chathubhashini-b852b0289",
       "facebook": "https://www.facebook.com/share/xXr5ciytWFxNqGJL/?mibextid=qi2Omg",
-      "instagram": "https://www.instagram.com/sathruwaniii?igsh=d2NldnpnazNzN3Zp&utm_source=qr",
+      "instagram": "https://www.instagram.com/li_ki__?igsh=djFpZDVqNGk4eGZx",
       "email": "likithachathu@gmail.com"
     },
     "program2": {
@@ -128,7 +128,7 @@
       "img": "scom/nethmi.webp",
       "linkedin": "https://www.linkedin.com/in/sathruwani-hapuarachchi-a85933235",
       "facebook": "https://www.facebook.com/profile.php?id=100085176430951&mibextid=LQQJ4d",
-      "instagram": "https://www.instagram.com/ranu__vi_____/",
+      "instagram": "https://www.instagram.com/sathruwaniii?igsh=d2NldnpnazNzN3Zp&utm_source=qr",
       "email": "sathruwanihapuarachchi7@gmail.com"
     },
     "content": {
@@ -140,21 +140,14 @@
       "instagram": "https://www.instagram.com/upeka_kumarage?igsh=MXQ1a3Z5bmJiYXJsYw==",
       "email": "chamudiupeka21@gmail.com"
     },
-    "web": {
-      "name": "Ashwinie Jayamanna",
-      "post": "Editorial Web Lead",
-      "img": "scom/ashwinie.webp",
-      "linkedin": "www.linkedin.com/in/ashwinie-jayamanna-08a635190",
-      "instagram": "https://www.instagram.com/ash_jayyy",
-      "email": "ashwiniejay@ieee.org"
-    },
     "design1": {
       "name": "Raveesha Samarasekera",
       "post": "Editorial Design Co-Lead",
       "img": "scom/raveesha.webp",
       "linkedin": "https://www.linkedin.com/in/raveesha-samarasekera-9141b4287",
-      "instagram": "https://www.facebook.com/profile.php?id=100084843331929&mibextid=ZbWKwL",
-      "email": "https://www.instagram.com/_raveesha.__?igsh=MW50dTAxdmRoeHRuZQ=="
+      "facebook": "https://www.facebook.com/profile.php?id=100084843331929&mibextid=ZbWKwL",
+      "instagram": "https://www.instagram.com/_raveesha.__?igsh=MW50dTAxdmRoeHRuZQ==",
+      "email": "raveeshagihani@gmail.com"
     },
     "design2": {
       "name": "Vishwani Vilochana",
@@ -165,6 +158,14 @@
       "instagram": "https://www.instagram.com/vilo__14?igsh=MWt3empwejE0NXp0Zw==",
       "email": "vishwani2002@gmail.com"
     },
+    "web": {
+      "name": "Ashwinie Jayamanna",
+      "post": "Editorial Web Lead",
+      "img": "scom/ashwinie.webp",
+      "linkedin": "www.linkedin.com/in/ashwinie-jayamanna-08a635190",
+      "instagram": "https://www.instagram.com/ash_jayyy",
+      "email": "ashwiniejay@ieee.org"
+    },
     "finance": {
       "name": "Sadewni Vihidula",
       "post": "Finance Lead",