Merge pull request #207 from nelsonlan01/hotfix20240629

Hotfix20240629
nelsonlan01 · Jun 29, 2024 · 877d0cc · 877d0cc
2 parents 147df37 + 0dc0108
commit 877d0cc
Show file tree

Hide file tree

Showing 9 changed files with 514 additions and 52 deletions.
diff --git a/index.html b/index.html
@@ -162,7 +162,7 @@
 	<h2 class="w3-center w3-myfont">Some of pages in this website is still under construction. There are soon more detail and pages on this website.</h2>
 	<h2 class="w3-center w3-myfont">本網站部分頁面仍在架設。稍後將製作更多頁面並上載。</h2>
 	<hr>
-	<h5 class="w3-center w3-myfont">最後更新日期：09/07/2019</h5>
+	<h5 class="w3-center w3-myfont">最後更新日期：28/06/2024</h5>
 	<hr>
 </div>
 
@@ -503,37 +503,68 @@ <h3 class="w3-center  w3-myfont">作品集目錄</h3>
 
 
 
-<!-- 6th Parallax Image with Portfolio Text -->
-<div class="projpic-6 w3-display-container w3-opacity-min  w3-myfont"></div>
+
+
+
+<!-- 7th Parallax Image with Portfolio Text 
+<div class="projpic-0 w3-display-container w3-opacity-min  w3-myfont"></div>
  
 <div class="w3-row w3-center w3-dark-grey w3-padding-16">
   <div class=" w3-section w3-myfont"> 
-	<span class="w3-xlarge">專案七 列車報站 平面設計<br> Project VII Train Broadcast Grapic Design
+	<span class="w3-xlarge">專案十一 質數 X RPG遊戲<br> Project XI Prime Education 'X' RPG
 		<br>
 	</span>
-	<br>
-	<a href="portfolio_project7.html" class="buttonstyle_two">前往專案七 頁面 Go to Project VII Page(s)
+	<br><!--
+	<a href="#" class="buttonstyle_two">前往專案十一 頁面 Go to Project XI Page(s)
     </a>
   </div>
 </div>
+<<<<<<< Updated upstream
+		
+=======
+-->
 
 
-<!-- 7th Parallax Image with Portfolio Text -->
-<div class="projpic-0 w3-display-container w3-opacity-min  w3-myfont"></div>
+<div class="projpic-13 w3-display-container w3-opacity-min  w3-myfont"></div>
 
 <div class="w3-row w3-center w3-dark-grey w3-padding-16">
   <div class=" w3-section w3-myfont"> 
-	<span class="w3-xlarge">專案十一 質數 X RPG遊戲<br> Project XI Prime Education 'X' RPG
-		<br>
+	<span class="w3-xlarge">專案十三 -- 需求的根源 GGJ 2023 <br> Project XIII -- The Roots of Our Needs
+	<br>
 	</span>
-	<br><!--
-	<a href="#" class="buttonstyle_two">前往專案十一 頁面 Go to Project XI Page(s)
-    </a>-->
+	<br>
+	<a href="portfolio_project13.html" class="buttonstyle_two">前往專案十三 頁面 Go to Project XIII  Page(s)
+    </a>
   </div>
 </div>
 
 
+<div class="projpic-14 w3-display-container w3-opacity-min  w3-myfont"></div>
+
+<div class="w3-row w3-center w3-dark-grey w3-padding-16">
+  <div class=" w3-section w3-myfont"> 
+	<span class="w3-xlarge">專案十四 -- Cat Make me laugh GGJ2024<br> Project XIV -- Cat Make me laugh
+	<br>
+	</span>
+	<br>
+	<a href="portfolio_project14.html" class="buttonstyle_two">前往專案十四 頁面 Go to Project XIV  Page(s)
+    </a>
+  </div>
+</div>
+
 
+<div class="projpic-6 w3-display-container w3-opacity-min  w3-myfont"></div>
+
+<div class="w3-row w3-center w3-dark-grey w3-padding-16">
+  <div class=" w3-section w3-myfont"> 
+	<span class="w3-xlarge">專案七 列車報站 平面設計<br> Project VII Train Broadcast Grapic Design
+		<br>
+	</span>
+	<br>
+	<a href="portfolio_project7.html" class="buttonstyle_two">前往專案七 頁面 Go to Project VII Page(s)
+    </a>
+  </div>
+</div>
 
 <div class="projpic-7 w3-display-container w3-opacity-min  w3-myfont"></div>
 
@@ -547,7 +578,9 @@ <h3 class="w3-center  w3-myfont">作品集目錄</h3>
     </a>-->
   </div>
 </div>
-
+
+
+>>>>>>> Stashed changes
 </div>
 </div>
 </div>

diff --git a/media_archive.html b/media_archive.html
@@ -89,10 +89,10 @@
   <div class="w3-bar" id="myNavbar">
   <a class="w3-bar-item w3-button w3-hover-black w3-hide-medium w3-hide-large w3-right" href="javascript:void(0);" onClick="toggleFunction()" title="Toggle Navigation Menu"> 
   <i class="fa fa-bars"></i> </a>
-  <a href="#" class="w3-bar-item w3-button">HOME</a>
-  <a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
-  <a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
-  <a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
+		<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
+		<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
+		<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
+		<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
   <div class="w3-dropdown-hover  w3-hide-small">
 	<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>     
 	<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -102,7 +102,8 @@
 		<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
 		<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
 		<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
-		<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
+		<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
+		<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
 	</div>
   </div>
   <a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

diff --git a/portfolio_project11.html b/portfolio_project11.html
@@ -96,10 +96,10 @@
   <div class="w3-bar" id="myNavbar">
   <a class="w3-bar-item w3-button w3-hover-black w3-hide-medium w3-hide-large w3-right" href="javascript:void(0);" onClick="toggleFunction()" title="Toggle Navigation Menu"> 
   <i class="fa fa-bars"></i> </a>
-  <a href="#" class="w3-bar-item w3-button">HOME</a>
-  <a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
-  <a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
-  <a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
+		<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
+		<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
+		<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
+		<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
   <div class="w3-dropdown-hover  w3-hide-small">
 	<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>     
 	<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -109,7 +109,8 @@
 		<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
 		<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
 		<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
-		<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
+		<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
+		<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
 	</div>
   </div>
   <a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

diff --git a/portfolio_project13.html b/portfolio_project13.html
@@ -96,10 +96,10 @@
   <div class="w3-bar" id="myNavbar">
   <a class="w3-bar-item w3-button w3-hover-black w3-hide-medium w3-hide-large w3-right" href="javascript:void(0);" onClick="toggleFunction()" title="Toggle Navigation Menu"> 
   <i class="fa fa-bars"></i> </a>
-  <a href="#" class="w3-bar-item w3-button">HOME</a>
-  <a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
-  <a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
-  <a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
+		<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
+		<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
+		<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
+		<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
   <div class="w3-dropdown-hover  w3-hide-small">
 	<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>     
 	<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -109,7 +109,8 @@
 		<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
 		<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
 		<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
-		<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
+		<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
+		<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
 	</div>
   </div>
   <a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>