Merge branch 'main' of https://github.com/crystalpop/cruzhacksyuh

transophia4 · Jan 21, 2024 · c0a3be3 · c0a3be3
2 parents 289f8fb + e544881
commit c0a3be3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -4,6 +4,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Koulen&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Mako&display=swap" rel="stylesheet">
     <link
     href="https://fonts.googleapis.com/css2?family=Kodchasan:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400;1,500;1,600;1,700&display=swap"
     rel="stylesheet">

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -21,13 +21,12 @@ h1 {
     margin-top: 4%;
 }
 .welcome-text {
-    font-family: 'Kodchasan';
-    margin-left: 10%;
-    margin-right: 10%;
-    font-weight: bold;
+    font-family: 'Mako';
+    margin-left: 20%;
+    margin-right: 20%;
     -webkit-text-fill-color: white;
     font-size: 200%;
-    filter: drop-shadow(0px 2px rgba(3, 3, 3, 0.207));
+    filter: drop-shadow(2px 2px rgba(0, 0, 0, 0.3));
 }
 
 .home-logo {

diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -21,8 +21,9 @@ function App() {
       </div>
     <p className='welcome-text'>Welcome! We are a team of UC undergraduates interested in 
       helping others find items that they have lost or found around 
-      the UCSC campus. Sign in below to start looking!
+      the UCSC campus.
     </p>
+    <p className='welcome-text'>Sign in below to start looking!</p>
     <div className='login-signup'>
     <button className='login-button' onClick={()=> navigate('./login')}>Login</button>
     <button className='signup-button' onClick={()=> navigate('./signup')}>Sign up</button>

diff --git a/frontend/src/pages/generate_cards.js b/frontend/src/pages/generate_cards.js
@@ -33,9 +33,6 @@ export default function GenCards({item_info}) {
           }}><Card style={{ width: '98%', fontFamily:'Koulen', 
           backgroundColor:'#E3E0E0', borderBlockColor:'white'}} 
           className='bg-image hover-zoom'
-          onClick = {function(e) {
-            handleClick();
-          }}
           >
 
           <Card.Body className='w-100'>