From abfa4daf5ccd4efefb14ec5b29e528012a186028 Mon Sep 17 00:00:00 2001
From: whyhugo <hugo.tw.wang@gmail.com>
Date: Sun, 21 Apr 2024 02:30:51 +0800
Subject: [PATCH 1/4] fix: footer style & hide scroll bar overflow-x

---
 my-app/src/style/_footer.scss | 10 +++++-----
 my-app/src/style/style.scss   |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/my-app/src/style/_footer.scss b/my-app/src/style/_footer.scss
index d312f73..e1cd704 100644
--- 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);
   }
-}
\ No newline at end of file
+}
diff --git a/my-app/src/style/style.scss b/my-app/src/style/style.scss
index 107b6b6..ac4de40 100644
--- a/my-app/src/style/style.scss
+++ b/my-app/src/style/style.scss
@@ -22,13 +22,12 @@ body > #root,
 #root > .App {
   //height: 100%;
   width: 100%;
-  //overflow-x: hidden;
+  overflow-x: hidden;
   margin: 0;
   padding: 0;
 }
 
 #root > .App {
-  overflow-y: auto;
   background-image: url("../image/bg_nobg.png"), linear-gradient(to right, #352e72ff, #351a37ff);
   background-size: 100%;
   background-position: center;

From 88630273b930f3501d9da759e63ee4d0005c3f38 Mon Sep 17 00:00:00 2001
From: whyhugo <hugo.tw.wang@gmail.com>
Date: Sun, 21 Apr 2024 03:33:23 +0800
Subject: [PATCH 2/4] fix: small bug

---
 my-app/src/page/Home.js     | 5 ++---
 my-app/src/style/style.scss | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/my-app/src/page/Home.js b/my-app/src/page/Home.js
index a18d071..e32c6ee 100644
--- a/my-app/src/page/Home.js
+++ b/my-app/src/page/Home.js
@@ -12,7 +12,6 @@ import Traffic from "./Traffic";
 import Review from "./Review";
 
 const Home = () => {
-  
   const [descriptions, setDescriptions] = useState({
     image1: { visible: true, content: <About /> },
     image2: { visible: true, content: <Info /> },
@@ -32,7 +31,6 @@ const Home = () => {
   };
 
   return (
-    
     <div id="main" style={{ margin: "64px 0%" }}>
       <header style={{ textAlign: "center" }} id="header">
         <img src={banner} alt="banner" style={{ width: "100%" }} />
@@ -57,7 +55,8 @@ const Home = () => {
                         {index === 5 && <font id="review">歷屆回顧</font>}
                       </h2>
                       <hr />
-                      <div onClick={() => toggleDescription(`image${index}`)}>
+                      <div>
+                        {/*<div onClick={() => toggleDescription(`image${index}`)}>*/}
                         <img
                           src={
                             index === 1
diff --git a/my-app/src/style/style.scss b/my-app/src/style/style.scss
index ac4de40..bf80ad6 100644
--- a/my-app/src/style/style.scss
+++ b/my-app/src/style/style.scss
@@ -29,7 +29,7 @@ body > #root,
 
 #root > .App {
   background-image: url("../image/bg_nobg.png"), linear-gradient(to right, #352e72ff, #351a37ff);
-  background-size: 100%;
+  //background-size: 100%;
   background-position: center;
   background-repeat: repeat;
   //background-attachment: scroll;

From 87444c2722e652aae0c54488e0ebb77c1dc795a3 Mon Sep 17 00:00:00 2001
From: whyhugo <hugo.tw.wang@gmail.com>
Date: Sun, 21 Apr 2024 13:07:26 +0800
Subject: [PATCH 3/4] fix:~

---
 my-app/src/style/style.scss | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/my-app/src/style/style.scss b/my-app/src/style/style.scss
index bf80ad6..dfd6984 100644
--- a/my-app/src/style/style.scss
+++ b/my-app/src/style/style.scss
@@ -21,15 +21,16 @@ body,
 body > #root,
 #root > .App {
   //height: 100%;
-  width: 100%;
-  overflow-x: hidden;
+  //width: 100%;
+  //overflow-x: hidden;
   margin: 0;
   padding: 0;
 }
 
 #root > .App {
+  overflow-y: auto;
   background-image: url("../image/bg_nobg.png"), linear-gradient(to right, #352e72ff, #351a37ff);
-  //background-size: 100%;
+  background-size: 100%;
   background-position: center;
   background-repeat: repeat;
   //background-attachment: scroll;

From 22330ae9ad4db70bcb90f9a4661a9d724da82ee4 Mon Sep 17 00:00:00 2001
From: whyhugo <hugo.tw.wang@gmail.com>
Date: Sun, 21 Apr 2024 13:11:57 +0800
Subject: [PATCH 4/4] fix:~

---
 my-app/src/page/Home.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/my-app/src/page/Home.js b/my-app/src/page/Home.js
index 6528e37..0d2836f 100644
--- 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%" }}>