Skip to content

Commit 151469a

Browse files
nelsonlan01nelsonlan01
committed
Hotfix 20240629
Consulting memo on 20240629 ------ - Noted #185 issues Fixing in this patch for multiple pages. Project 13 "the roots of needs" pages also linked up to index page
1 parent 147df37 commit 151469a

8 files changed

+90
-52
lines changed

‎index.html

+47-14
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<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>
163163
<h2 class="w3-center w3-myfont">本網站部分頁面仍在架設。稍後將製作更多頁面並上載。</h2>
164164
<hr>
165-
<h5 class="w3-center w3-myfont">最後更新日期：09/07/2019</h5>
165+
<h5 class="w3-center w3-myfont">最後更新日期：28/06/2024</h5>
166166
<hr>
167167
</div>
168168

@@ -503,37 +503,68 @@ <h3 class="w3-center w3-myfont">作品集目錄</h3>
503503

504504

505505

506-
<!-- 6th Parallax Image with Portfolio Text -->
507-
<div class="projpic-6 w3-display-container w3-opacity-min w3-myfont"></div>
506+
507+
508+
509+
<!-- 7th Parallax Image with Portfolio Text
510+
<div class="projpic-0 w3-display-container w3-opacity-min w3-myfont"></div>
508511
509512
<div class="w3-row w3-center w3-dark-grey w3-padding-16">
510513
<div class=" w3-section w3-myfont">
511-
<span class="w3-xlarge">專案七 列車報站 平面設計<br> Project VII Train Broadcast Grapic Design
514+
<span class="w3-xlarge">專案十一 質數 X RPG遊戲<br> Project XI Prime Education 'X' RPG
512515
<br>
513516
</span>
514-
<br>
515-
<a href="portfolio_project7.html" class="buttonstyle_two">前往專案七 頁面 Go to Project VII Page(s)
517+
<br><!--
518+
<a href="#" class="buttonstyle_two">前往專案十一 頁面 Go to Project XI Page(s)
516519
</a>
517520
</div>
518521
</div>
522+
<<<<<<< Updated upstream
523+
524+
=======
525+
-->
519526

520527

521-
<!-- 7th Parallax Image with Portfolio Text -->
522-
<div class="projpic-0 w3-display-container w3-opacity-min w3-myfont"></div>
528+
<div class="projpic-13 w3-display-container w3-opacity-min w3-myfont"></div>
523529

524530
<div class="w3-row w3-center w3-dark-grey w3-padding-16">
525531
<div class=" w3-section w3-myfont">
526-
<span class="w3-xlarge">專案十一 質數 X RPG遊戲<br> Project XI Prime Education 'X' RPG
527-
<br>
532+
<span class="w3-xlarge">專案十三 -- 需求的根源 GGJ 2023 <br> Project XIII -- The Roots of Our Needs
533+
<br>
528534
</span>
529-
<br><!--
530-
<a href="#" class="buttonstyle_two">前往專案十一 頁面 Go to Project XI Page(s)
531-
</a>-->
535+
<br>
536+
<a href="portfolio_project13.html" class="buttonstyle_two">前往專案十三 頁面 Go to Project XIII Page(s)
537+
</a>
532538
</div>
533539
</div>
534540

535541

542+
<div class="projpic-14 w3-display-container w3-opacity-min w3-myfont"></div>
543+
544+
<div class="w3-row w3-center w3-dark-grey w3-padding-16">
545+
<div class=" w3-section w3-myfont">
546+
<span class="w3-xlarge">專案十四 -- Cat Make me laugh GGJ2024<br> Project XIV -- Cat Make me laugh
547+
<br>
548+
</span>
549+
<br>
550+
<a href="portfolio_project14.html" class="buttonstyle_two">前往專案十四 頁面 Go to Project XIV Page(s)
551+
</a>
552+
</div>
553+
</div>
554+
536555

556+
<div class="projpic-6 w3-display-container w3-opacity-min w3-myfont"></div>
557+
558+
<div class="w3-row w3-center w3-dark-grey w3-padding-16">
559+
<div class=" w3-section w3-myfont">
560+
<span class="w3-xlarge">專案七 列車報站 平面設計<br> Project VII Train Broadcast Grapic Design
561+
<br>
562+
</span>
563+
<br>
564+
<a href="portfolio_project7.html" class="buttonstyle_two">前往專案七 頁面 Go to Project VII Page(s)
565+
</a>
566+
</div>
567+
</div>
537568

538569
<div class="projpic-7 w3-display-container w3-opacity-min w3-myfont"></div>
539570

@@ -547,7 +578,9 @@ <h3 class="w3-center w3-myfont">作品集目錄</h3>
547578
</a>-->
548579
</div>
549580
</div>
550-
581+
582+
583+
>>>>>>> Stashed changes
551584
</div>
552585
</div>
553586
</div>

‎media_archive.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@
8989
<div class="w3-bar" id="myNavbar">
9090
<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">
9191
<i class="fa fa-bars"></i> </a>
92-
<a href="#" class="w3-bar-item w3-button">HOME</a>
93-
<a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
94-
<a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
95-
<a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
92+
<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
93+
<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
94+
<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
95+
<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
9696
<div class="w3-dropdown-hover w3-hide-small">
9797
<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>
9898
<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -102,7 +102,8 @@
102102
<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
103103
<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
104104
<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
105-
<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
105+
<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
106+
<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
106107
</div>
107108
</div>
108109
<a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

‎portfolio_project11.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
<div class="w3-bar" id="myNavbar">
9797
<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">
9898
<i class="fa fa-bars"></i> </a>
99-
<a href="#" class="w3-bar-item w3-button">HOME</a>
100-
<a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
101-
<a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
102-
<a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
99+
<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
100+
<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
101+
<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
102+
<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
103103
<div class="w3-dropdown-hover w3-hide-small">
104104
<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>
105105
<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -109,7 +109,8 @@
109109
<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
110110
<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
111111
<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
112-
<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
112+
<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
113+
<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
113114
</div>
114115
</div>
115116
<a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

‎portfolio_project13.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
<div class="w3-bar" id="myNavbar">
9797
<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">
9898
<i class="fa fa-bars"></i> </a>
99-
<a href="#" class="w3-bar-item w3-button">HOME</a>
100-
<a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
101-
<a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
102-
<a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
99+
<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
100+
<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
101+
<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
102+
<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
103103
<div class="w3-dropdown-hover w3-hide-small">
104104
<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>
105105
<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -109,7 +109,8 @@
109109
<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
110110
<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
111111
<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
112-
<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
112+
<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
113+
<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
113114
</div>
114115
</div>
115116
<a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

‎portfolio_project2.html

+7-8
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565
<div class="w3-bar" id="myNavbar">
6666
<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">
6767
<i class="fa fa-bars"></i> </a>
68-
<a href="#" class="w3-bar-item w3-button">HOME</a>
69-
<a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
70-
<a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
71-
<a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
68+
<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
69+
<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
70+
<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
71+
<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
7272
<div class="w3-dropdown-hover w3-hide-small">
7373
<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>
7474
<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -78,7 +78,8 @@
7878
<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
7979
<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
8080
<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
81-
<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
81+
<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
82+
<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
8283
</div>
8384
</div>
8485
<a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>
@@ -109,9 +110,7 @@ <h3 class="w3-center w3-myfont">Project II : Final Year Project </h3>
109110
<h6 class="w3-center w3-myfont">注意：本專案規劃時以中文為主要語言，因此此頁暫只提供中文版本。 </h6>
110111
<h6 class="w3-center w3-myfont">Temporarily available in Chinese ONLY, since project was planned in Chinese as project core language. </h6>
111112
<br>
112-
<hr>
113-
insert 4 circle head here -.-
114-
<hr>
113+
115114
<h3 class="w3-center w3-myfont" id="proj4_intro">【提案部分】</h3>
116115
<h3 class="w3-center w3-myfont">Project Planning </h3>
117116
</div>

‎portfolio_project3.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
<div class="w3-bar" id="myNavbar">
6767
<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">
6868
<i class="fa fa-bars"></i> </a>
69-
<a href="#" class="w3-bar-item w3-button">HOME</a>
70-
<a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
71-
<a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
72-
<a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
69+
<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
70+
<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
71+
<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
72+
<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
7373
<div class="w3-dropdown-hover w3-hide-small">
7474
<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>
7575
<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -79,7 +79,8 @@
7979
<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
8080
<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
8181
<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
82-
<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
82+
<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
83+
<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
8384
</div>
8485
</div>
8586
<a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

‎portfolio_project4_6.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
<div class="w3-bar" id="myNavbar">
6262
<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">
6363
<i class="fa fa-bars"></i> </a>
64-
<a href="#" class="w3-bar-item w3-button">HOME</a>
65-
<a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
66-
<a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
67-
<a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
64+
<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
65+
<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
66+
<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
67+
<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
6868
<div class="w3-dropdown-hover w3-hide-small">
6969
<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>
7070
<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -74,7 +74,8 @@
7474
<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
7575
<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
7676
<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
77-
<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
77+
<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
78+
<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
7879
</div>
7980
</div>
8081
<a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

‎portfolio_project7.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
<div class="w3-bar" id="myNavbar">
6262
<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">
6363
<i class="fa fa-bars"></i> </a>
64-
<a href="#" class="w3-bar-item w3-button">HOME</a>
65-
<a href="#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
66-
<a href="#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
67-
<a href="#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
64+
<a href="index.html#" class="w3-bar-item w3-button">HOME</a>
65+
<a href="index.html#about" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i>ABOUT</a>
66+
<a href="index.html#contact" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-envelope"></i> CONTACT</a>
67+
<a href="index.html#duty" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-th"></i> DUTY</a>
6868
<div class="w3-dropdown-hover w3-hide-small">
6969
<button class=" w3-button" title="More">PORTFOLIO <i class="fa fa-caret-down"></i></button>
7070
<div class="w3-dropdown-content w3-bar-block w3-card-4">
@@ -74,7 +74,8 @@
7474
<a href="portfolio_project4_6.html" class="w3-bar-item w3-button"> Cities Skyline -- 3D 模組製作</th>
7575
<a href="portfolio_project7.html" class="w3-bar-item w3-button"> Minecraft -- 列車報站 平面設計 </th>
7676
<a href="portfolio_project11.html" class="w3-bar-item w3-button"> 質數 X RPG遊戲</th>
77-
<a href="#" class="w3-bar-item"> Hytale -- 伺服器營運 (未開始)</th>
77+
<a href="portfolio_project13.html" class="w3-bar-item"> GGJ 2023 -- The Roots of Our Needs</th>
78+
<a href="portfolio_project14.html" class="w3-bar-item"> GGJ 2024 -- Cat laughter</th>
7879
</div>
7980
</div>
8081
<a href="skill.html" class="w3-bar-item w3-button w3-hide-small"><i class="fa fa-user"></i> SKILL</a>

0 commit comments

Comments
 (0)