Merge pull request #162 from Sourabh-awasthy/source

removed hover on member and color scheme of whole site
istenith · Aug 23, 2023 · d6f9ed0 · d6f9ed0
2 parents 343685e + 19e66f6
commit d6f9ed0
Show file tree

Hide file tree

Showing 5 changed files with 8,769 additions and 8,802 deletions.
diff --git a/public/members.css b/public/members.css
@@ -14,54 +14,39 @@
 .profile-card {
   position: relative;
   width: 15rem;
-  height: 15rem;
   background: var(--link-color);
   padding: 20px;
-  border-radius: 50%;
   box-shadow: 0 0 22px #3336;
-  transition: 0.6s;
   margin: 0 25px;
-}
-
-.profile-card:hover {
   border-radius: 10px;
-  height: 400px;
+  height: 500px;
+  background-color: rgba(130, 87, 160, 0.596);
 }
 
+
+
 .profile-card .profile-img {
   position: relative;
   width: 100%;
-  height: 100%;
-  transition: 0.6s;
   z-index: 0;
 }
 
-.profile-card:hover .profile-img {
-  transform: translateY(-80px);
-}
+
 .profile-img img {
   aspect-ratio: 1/1;
   width: 100%;
   border-radius: 50%;
   box-shadow: 0 0 22px #3336;
-  transition: 0.6s;
   object-fit: contain;
   background: whitesmoke;
-}
-
-.profile-card:hover img {
   border-radius: 10px;
+
 }
 
 .profile-card .caption {
   text-align: center;
-  transform: translateY(-240px);
-  opacity: 0;
-  transition: 0.6s ease-in-out;
   color: white;
-}
-.profile-card:hover .caption {
-  opacity: 1;
+
 }
 
 .profile-card .caption h3 {
@@ -83,8 +68,8 @@
   font-size: 18px;
 }
 
-.profile-card:hover .team-social-links .s-icon {
-  color: aqua;
+.profile-card .team-social-links .s-icon {
+  color: indigo;
 }
 
 .section-buttons {

diff --git a/public/styles.css b/public/styles.css
@@ -4,7 +4,7 @@
   --font-inter: Inter;
 
   /* font sizes */
-  --font-size-11xl: 30px;
+  --font-size-11xl: 50px;
   --font-size-8xl: 27px;
   --font-size-41xl: 60px;
   --font-size-16xl: 35px;
@@ -31,7 +31,7 @@
   --body-darker-background: #bbb;
   --body_color: #fff;
   --navbar-background: #ececec;
-  --link-color: #55d7dc;
+  --link-color: rgb(199, 162, 224);;
   --color-text-primary: #dddddd;
   --color-text-secondary: #bfbfbf;
   --color-text-tertiary: #7e7e7e;

diff --git a/src/App.js b/src/App.js
@@ -1,52 +1,34 @@
-import React from "react";
-import underConstructionImage from './static/images/underconstruction.png';
+import {React,useState} from "react";
+// import underConstructionImage from './static/images/underconstruction.png';
 
-// import { HashRouter } from "react-router-dom";
-// import Navbar from "./components/navbar";
-// import Headroom from "react-headroom";
-// import AnimatedCursor from "./components/animatedCursor";
-// import AnimatedRoutes from "./components/AnimatedRoutes";
-// eslint-disable-next-line
-// import Preloader from "./components/Preloader";
+import { HashRouter } from "react-router-dom";
+import Navbar from "./components/navbar";
+import Headroom from "react-headroom";
+import AnimatedCursor from "./components/animatedCursor";
+import AnimatedRoutes from "./components/AnimatedRoutes";
 // eslint-disable-next-line
+import Preloader from "./components/Preloader";
 
 const App = () => {
-  // const initialTheme = localStorage.getItem("selectedTheme");
-  // console.log(`Found ${initialTheme} mode in local storage, setting theme that only.`);
-  // const [theme, setTheme] = useState(initialTheme);
-  // const setThemeOuter = (currentTheme)=>{
-  //   setTheme(currentTheme)
-  // }
+  const initialTheme = localStorage.getItem("selectedTheme");
+  console.log(`Found ${initialTheme} mode in local storage, setting theme that only.`);
+  const [theme, setTheme] = useState(initialTheme);
+  const setThemeOuter = (currentTheme)=>{
+    setTheme(currentTheme)
+  }
   return (
     // Uncomment the below lines to Have everything working!
-    // <>
-    //   <Preloader />
-    //   <AnimatedCursor />
-    //   <HashRouter>
-    //     <Headroom>
-    //       <Navbar />
-    //     </Headroom>
-    //     <AnimatedRoutes />
-    //   </HashRouter>
-    // </>
-    <div
-    style={{
-      display: 'flex',
-      justifyContent: 'center',
-      alignItems: 'center',
-      height: '100vh',
-      fontSize: '3rem',
-      flexDirection: 'column',
-      fontFamily: 'Anton, sans-serif',
-    }}
-  >
-    <img
-      src={underConstructionImage}
-      alt="Under Construction"
-      style={{ width: '200px', height: 'auto' }} // Adjust the size as needed
-    />
-    <p style={{ marginTop: '1rem', fontFamily: 'Anton, sans-serif' }}>Coming Soon!</p>
-  </div>
+    <>
+      <Preloader /> 
+      <AnimatedCursor />
+      <HashRouter>
+        <Headroom>
+          <Navbar />
+        </Headroom>
+        <AnimatedRoutes />
+      </HashRouter>
+    </>
+
   );
 };
 

diff --git a/src/pages/membersPage.jsx b/src/pages/membersPage.jsx
@@ -3,6 +3,7 @@ import { motion } from "framer-motion";
 import InstagramIcon from "@mui/icons-material/Instagram";
 import LinkedInIcon from "@mui/icons-material/LinkedIn";
 import profileData from "../data/memberData";
+import Footer from "../components/footer";
 
 const MembersPage = () => {
   const [selectedSection, setSelectedSection] = useState("finalYear");
@@ -16,7 +17,7 @@ const MembersPage = () => {
   );
 
   const cardVariants = {
-    initial: { opacity: 0, y: -100 },
+    initial: { opacity: 0, y: 0 },
     animate: { opacity: 1, y: 0 },
   };
 
@@ -114,7 +115,6 @@ const MembersPage = () => {
           </motion.div>
         ))}
       </div>
-      {/* <Footer /> */}
     </motion.div>
   );
 };