Merge branch 'main' of https://github.com/CSIE-Camp/Camp_website_2024

CSIE-Camp · Apr 21, 2024 · 82b8a98 · 82b8a98
2 parents 3cd4e2a + 22330ae
commit 82b8a98
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/my-app/src/page/Home.js b/my-app/src/page/Home.js
@@ -20,6 +20,8 @@ const Home = () => {
     image5: { visible: true, content: <Review /> },
   });
 
+  {
+    /*
   const toggleDescription = (imageId) => {
     setDescriptions((prevState) => ({
       ...prevState,
@@ -29,6 +31,8 @@ const Home = () => {
       },
     }));
   };
+*/
+  }
 
   return (
     <div id="main" style={{ margin: "64px 0%" }}>
@@ -55,8 +59,8 @@ const Home = () => {
                         {index === 5 && <font id="review">歷屆回顧</font>}
                       </h2>
                       <hr />
-                      <div onClick={() => toggleDescription(`image${index}`)}>
-                        {/* <img
+                      {/*<div onClick={() => toggleDescription(`image${index}`)}>
+                         <img
                           src={
                             index === 1
                               ? camp_introduction_img
@@ -71,8 +75,8 @@ const Home = () => {
                           className={`image${index}`}
                           alt=""
                           style={{ width: "4em", height: "4em" }}
-                        /> */}
-                      </div>
+                        /> 
+                      </div>*/}
                       <p
                         className={`text-below${index}`}
                         style={{ textAlign: index % 2 === 0 ? "right" : "left" }}

diff --git a/my-app/src/style/_footer.scss b/my-app/src/style/_footer.scss
@@ -24,9 +24,10 @@ footer {
   // align-items: center;
   padding: 10px 32px;
   background: $light_orange;
-  border: 15px solid $brown;
-  border-radius: 8px;
+  border: 12px solid $brown;
+  border-radius: 22px;
   margin: 5px;
+  margin-bottom: 14px;
   filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25));
   animation-name: contact_animation;
   animation-duration: 5s;
@@ -76,7 +77,7 @@ footer {
   .social_media_icon {
     width: 32px;
     height: 32px;
-    margin: 4px;
+    margin: 16px 10px;
   }
 
   .facebook_icon:hover {
@@ -96,7 +97,6 @@ footer {
 
 // }
 @media screen and (width: 980px) and (min-height: 1700px) {
-
   // .contact {
   //     // width: 300px;
   // }
@@ -124,4 +124,4 @@ footer {
     background-color: $light_orange;
     transform: translateY(-2px);
   }
-}
+}
diff --git a/my-app/src/style/style.scss b/my-app/src/style/style.scss
@@ -21,7 +21,7 @@ body,
 body > #root,
 #root > .App {
   //height: 100%;
-  width: 100%;
+  //width: 100%;
   //overflow-x: hidden;
   margin: 0;
   padding: 0;