Merge pull request #206 from nelsonlan01/Project-14

Initial Upload Project 14 Page
nelsonlan01 · Jun 29, 2024 · b52002b · b52002b
2 parents 877d0cc + 06ee851
commit b52002b
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -70,6 +70,14 @@
 	background-image: url("pictures/main_page/main_project_x.png");
 	min-height: 100%;
 }
+.projpic-13 {
+	background-image: url("pictures/main_page/main_project_13.png");
+	min-height: 100%;
+}
+.projpic-14 {
+	background-image: url("pictures/main_page/main_project_14.png");
+	min-height: 100%;
+}
 .w3-wide {
 	letter-spacing: 10px;
 }
@@ -519,10 +527,7 @@ <h3 class="w3-center  w3-myfont">作品集目錄</h3>
     </a>
   </div>
 </div>
-<<<<<<< Updated upstream
-		
-=======
--->
+
 
 
 <div class="projpic-13 w3-display-container w3-opacity-min  w3-myfont"></div>
@@ -579,8 +584,6 @@ <h3 class="w3-center  w3-myfont">作品集目錄</h3>
   </div>
 </div>
 
-
->>>>>>> Stashed changes
 </div>
 </div>
 </div>

diff --git a/pictures/main_page/main_project_14.png b/pictures/main_page/main_project_14.png
diff --git a/pictures/portfolio_sub_page/project_14/GGJ2024_0.png b/pictures/portfolio_sub_page/project_14/GGJ2024_0.png
diff --git a/pictures/portfolio_sub_page/project_14/GGJ2024_1.png b/pictures/portfolio_sub_page/project_14/GGJ2024_1.png
diff --git a/pictures/portfolio_sub_page/project_14/GGJ2024_2.png b/pictures/portfolio_sub_page/project_14/GGJ2024_2.png
diff --git a/pictures/portfolio_sub_page/project_14_css_slide/GGJ2024_title - Copy.png b/pictures/portfolio_sub_page/project_14_css_slide/GGJ2024_title - Copy.png
diff --git a/pictures/portfolio_sub_page/project_14_css_slide/proj14_gameplay.png b/pictures/portfolio_sub_page/project_14_css_slide/proj14_gameplay.png
diff --git a/pictures/portfolio_sub_page/project_14_css_slide/proj14_intro.png b/pictures/portfolio_sub_page/project_14_css_slide/proj14_intro.png
diff --git a/pictures/portfolio_sub_page/project_14_css_slide/proj14_out.png b/pictures/portfolio_sub_page/project_14_css_slide/proj14_out.png
diff --git a/portfolio_project14.html b/portfolio_project14.html
@@ -96,10 +96,12 @@
   <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="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,8 +111,11 @@
 		<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="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>
@@ -228,7 +233,9 @@ <h3 class="w3-center  w3-myfont">【Inspiration of Project】</h3>
 		 </div>
 		 <h5 class="w3-center  w3-myfont"> ● Make me laugh </h5>
 		<h5 class="w3-center  w3-myfont"> ● ( Make me laugh : Global Game Jam 2024 Topic)</h5>
+
 		<!--<h5 class="w3-center  w3-myfont"> "" -- Nelson LAN (2024)</h5>-->
+
 <br>
 <br>   <hr>
 		<h3 class="w3-center w3-myfont">【Background Knowledge】 </h3>