Merge pull request #4 from EZLJ/main

Daily Update
CQSSEDU · May 23, 2024 · e8a4ef9 · e8a4ef9
2 parents 9a50b50 + 5f5b2ee
commit e8a4ef9
Show file tree

Hide file tree

Showing 53 changed files with 119 additions and 82 deletions.
diff --git a/about.html b/about.html
@@ -6,8 +6,8 @@
 -->
 <html>
 	<head>
-		<title>Generic Page - Massively by HTML5 UP</title>
-		<meta charset="utf-8" />
+		<title>Canada Qingdao Secondary School</title>
+		<link rel="shortcut icon" href="/images/bg.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 		<link rel="stylesheet" href="assets/css/main.css" />
 		<noscript><link rel="stylesheet" href="assets/css/noscript.css" /></noscript>
@@ -26,16 +26,16 @@
 				<nav id="nav">
 					<ul class="links">
 						<li><a href="index.html">Home 主页</a></li>
-						<li><a href="#mainB">News 学校新闻</a></li>
+						<li><a href="index.html#mainB">News 学校新闻</a></li>
 						<li><a href="teachers.html">Teachers 教师</a></li>
 						<li><a href="enrollment.html">Enrollment 入学</a></li>
 						<li><a href="schoolevent.html">Event 活动</a></li>
 						<li class="active"><a href="about.html">About 关于</a></li>
 						<br>
 					</ul>
 					<ul class="icons">
-						<li><a href="studentcouncil" class="">Student Council</a></li>
-
+						<img src="/images/SC/logo.png" alt="">
+						<a href="studentcouncil" class="">Student Council</a>
 					</ul>
 				</nav>
 
@@ -81,8 +81,9 @@ <h3><br />Email <br />电子邮件</h3>
 				</footer>
 			<!-- Copyright -->
 				<div id="copyright">
-					<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /></ul>
-					<ul><li><a href="/credits.html">This site is managed by students, Click here to see the credits</a></li></ul>
+					<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /><br /></ul>
+					<ul><li><a href="/credits.html">Created by Eric Zhang and Levi Ji<br/></a></li></ul>
+					<ul><li><a href="/studentcouncil/contact.html">Maintained by the Ministry of Media</a></li></ul>
 					<ul><li><div class="col-4" ></div><span class="image fit" ><a href="https://zcstudio.online"><img src="images/ZCS/ZCSC401.png" alt="" /></a></span></div></li></ul>
 				</div>
 

diff --git a/articles/talentshow2024.html b/articles/talentshow2024.html
@@ -6,8 +6,8 @@
 -->
 <html>
 	<head>
-		<title>Generic Page - Massively by HTML5 UP</title>
-		<meta charset="utf-8" />
+		<title>Canada Qingdao Secondary School</title>
+		<link rel="shortcut icon" href="/images/bg.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 		<link rel="stylesheet" href="/assets/css/main.css" />
 		<noscript><link rel="stylesheet" href="/assets/css/noscript.css" /></noscript>
@@ -26,15 +26,16 @@
 				<nav id="nav">
 					<ul class="links">
 						<li><a href="/index.html">Home 主页</a></li>
-						<li class="active"><a href="#mainB">News 学校新闻</a></li>
+						<li class="active"><a href="index.html#mainB">News 学校新闻</a></li>
 						<li><a href="/teachers.html">Teachers 教师</a></li>
 						<li><a href="/enrollment.html">Enrollment 入学</a></li>
 						<li><a href="/schoolevent.html">Event 活动</a></li>
 						<li><a href="/about.html">About 关于</a></li>
 						<br>
 					</ul>
 					<ul class="icons">
-						<li><a href="/studentcouncil" class="">Student Council</a></li>
+						<img src="/images/SC/logo.png" alt="">
+						<a href="studentcouncil" class="">Student Council</a>
 					</ul>
 				</nav>
 

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -3653,9 +3653,9 @@ input, select, textarea {
 		background: rgba(255, 255, 255, 0.175);
 		height: 4rem;
 		line-height: 4rem;
-		margin: -4rem auto 0 auto;
+		margin: -4rem auto  auto;
 		overflow: hidden;
-		padding: 0 2rem 0 0;
+		padding: 0 1rem 0 0;
 		position: relative;
 		width: calc(100% - 4rem);
 		max-width: 72rem;
@@ -3728,7 +3728,7 @@ input, select, textarea {
 			flex-shrink: 1;
 			font-family: "Source Sans Pro", Helvetica, sans-serif;
 			font-weight: 900;
-			letter-spacing: 0.065em;
+			letter-spacing: 0.045em;
 			list-style: none;
 			margin-bottom: 0;
 			padding-left: 0;
@@ -3781,13 +3781,15 @@ input, select, textarea {
 			-webkit-flex-shrink: 0;
 			-ms-flex-shrink: 0;
 			flex-shrink: 0;
-			font-family: "Source Sans Pro", Helvetica, sans-serif;
+			font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
 			font-weight: 100;
-			letter-spacing: 0.065em;
+			letter-spacing: 0.045em;
 			list-style: none;
 			margin-bottom: 0;
 			padding-left: 0;
 			text-transform: uppercase;
+			font-size: 0.9rem;
+
 		}
 
 		@media screen and (max-width: 980px) {

diff --git a/enrollment.html b/enrollment.html
@@ -6,7 +6,8 @@
 -->
 <html>
 	<head>
-		<title>Generic Page - Massively by HTML5 UP</title>
+		<title>Canada Qingdao Secondary School</title>
+		<link rel="shortcut icon" href="/images/bg.png" />
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 		<link rel="stylesheet" href="assets/css/main.css" />
@@ -26,28 +27,27 @@
 				<nav id="nav">
 					<ul class="links">
 						<li><a href="index.html">Home 主页</a></li>
-						<li><a href="#mainB">News 学校新闻</a></li>
+						<li><a href="index.html#mainB">News 学校新闻</a></li>
 						<li><a href="teachers.html">Teachers 教师</a></li>
 						<li class="active"><a href="enrollment.html">Enrollment 入学</a></li>
 						<li><a href="schoolevent.html">Event 活动</a></li>
 						<li><a href="about.html">About 关于</a></li>
 						<br>
 					</ul>
 					<ul class="icons">
-						<li><a href="studentcouncil" class="">Student Council</a></li>
-
+						<img src="/images/SC/logo.png" alt="">
+						<a href="studentcouncil" class="">Student Council</a>
 					</ul>
 				</nav>
 
 				<!-- Main -->
 					<div id="main">
-
 						<!-- Post -->
 							<section class="post">
 								<header class="major">
-									<span class="date">April 25, 2017</span>
-									<h1>This is a<br />
-									Generic Page</h1>
+
+									<h1>Enrollment<br />
+									入学</h1>
 									<p>Aenean ornare velit lacus varius enim ullamcorper proin aliquam<br />
 									facilisis ante sed etiam magna interdum congue. Lorem ipsum dolor<br />
 									amet nullam sed etiam veroeros.</p>
@@ -81,8 +81,9 @@ <h3><br />Email <br />电子邮件</h3>
 				</footer>
 			<!-- Copyright -->
 				<div id="copyright">
-					<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /></ul>
-					<ul><li><a href="/credits.html">This site is managed by students, Click here to see the credits</a></li></ul>
+					<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /><br /></ul>
+					<ul><li><a href="/credits.html">Created by Eric Zhang and Levi Ji<br/></a></li></ul>
+					<ul><li><a href="/studentcouncil/contact.html">Maintained by the Ministry of Media</a></li></ul>
 					<ul><li><div class="col-4" ></div><span class="image fit" ><a href="https://zcstudio.online"><img src="images/ZCS/ZCSC401.png" alt="" /></a></span></div></li></ul>
 				</div>
 

diff --git a/images/QDN9.png b/images/QDN9.png
diff --git a/images/QDN9ID - 副本.png b/images/QDN9ID - 副本.png
diff --git a/images/QDN9ID.png b/images/QDN9ID.png
diff --git a/images/QDN9_Campus_1.jpg b/images/QDN9_Campus_1.jpg
diff --git a/images/QDN9_Campus_2.jpg b/images/QDN9_Campus_2.jpg
diff --git a/images/QDN9_Campus_3.jpg b/images/QDN9_Campus_3.jpg
diff --git a/images/SC/OSBanner.png b/images/SC/OSBanner.png
diff --git a/images/SC/PMBanner.png b/images/SC/PMBanner.png
diff --git a/images/SC/SCBanner.png b/images/SC/SCBanner.png
diff --git a/images/SC/SCEmblem.png b/images/SC/SCEmblem.png
diff --git a/images/SC/logo.png b/images/SC/logo.png
diff --git a/images/Seven Core.png b/images/Seven Core.png
diff --git a/images/ZCS/ZCS75.png b/images/ZCS/ZCS75.png
diff --git a/images/ZCS/ZCSC200.png b/images/ZCS/ZCSC200.png
diff --git a/images/ZCS/ZCSC40.png b/images/ZCS/ZCSC40.png
diff --git a/images/ZCS/ZCSC400.png b/images/ZCS/ZCSC400.png
diff --git a/images/ZCS/ZCSC401.png b/images/ZCS/ZCSC401.png
diff --git a/images/bg.png b/images/bg.png
diff --git a/images/event/awardceremony_1.png b/images/event/awardceremony_1.png
diff --git a/images/event/funday_1.png b/images/event/funday_1.png
diff --git a/images/event/funday_2.png b/images/event/funday_2.png
diff --git a/images/event/talentshow_1.jpg b/images/event/talentshow_1.jpg
diff --git a/images/event/talentshow_2.jpg b/images/event/talentshow_2.jpg
diff --git a/images/event/terryfoxrun_1.png b/images/event/terryfoxrun_1.png
diff --git a/images/overlay.png b/images/overlay.png
diff --git a/images/pic01.jpg b/images/pic01.jpg
diff --git a/images/pic02.jpg b/images/pic02.jpg
diff --git a/images/pic03.jpg b/images/pic03.jpg
diff --git a/images/pic04.jpg b/images/pic04.jpg
diff --git a/images/pic05.jpg b/images/pic05.jpg
diff --git a/images/pic06.jpg b/images/pic06.jpg
diff --git a/images/pic07.jpg b/images/pic07.jpg
diff --git a/images/pic08.jpg b/images/pic08.jpg
diff --git a/images/pic09.jpg b/images/pic09.jpg
diff --git a/images/teacher/bian.png b/images/teacher/bian.png
diff --git a/images/teacher/bray.png b/images/teacher/bray.png
diff --git a/images/teacher/dirk.png b/images/teacher/dirk.png
diff --git a/images/teacher/hampton.png b/images/teacher/hampton.png
diff --git a/images/teacher/lani.png b/images/teacher/lani.png
diff --git a/images/teacher/troy.png b/images/teacher/troy.png
diff --git a/images/united_bg.png b/images/united_bg.png
diff --git a/index.html b/index.html
@@ -1,7 +1,8 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<title>CQSS Homepage</title>
+		<title>Canada Qingdao Secondary School</title>
+		<link rel="shortcut icon" href="/images/bg.png" />
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 		<link rel="stylesheet" href="assets/css/main.css" />
@@ -14,7 +15,7 @@
 					<div id="intro">
 						<h2>We are </h2>
 						<h1>Canada Qingdao <br /> Secondary School</h1>
-						<img src="images/bg.png" alt="" width="15%" height="15%">
+						<img src="/images/bg.png" alt="" width="15%" height="15%">
 						<br>
 						<h2>我们是</h2>
 						<h1>青岛九中中加班</h1>
@@ -34,16 +35,17 @@ <h1>青岛九中中加班</h1>
 					<nav id="nav">
 						<ul class="links">
 							<li class="active"><a href="index.html">Home 主页</a></li>
-							<li><a href="#mainB">News 学校新闻</a></li>
+							<li><a href="#mainB">News 新闻</a></li>
 							<li><a href="teachers.html">Teachers 教师</a></li>
 							<li><a href="enrollment.html">Enrollment 入学</a></li>
 							<li><a href="schoolevent.html">Event 活动</a></li>
 							<li><a href="about.html">About 关于</a></li>
 							<br>
 						</ul>
+						<hr />
 						<ul class="icons">
-							<li><a href="studentcouncil" class="">Student Council</a></li>
-
+							<img src="/images/SC/logo.png" alt="">
+							<a href="studentcouncil" class="">Student Council</a>
 						</ul>
 					</nav>
 
@@ -56,7 +58,7 @@ <h1>青岛九中中加班</h1>
 									<h2><a href="#">2024 <br /> Summer Talent Show <br>夏季才艺展示</a></h2>
 
 									</header>
-								<a href="#" class="image main"><img src="images/event/talentshow_1.jpg" alt="A picture of the 2024 CQSS Summer Talent Show" /></a>
+								<a class="image main"><img src="images/event/talentshow_1.jpg" alt="A picture of the 2024 CQSS Summer Talent Show" /></a>
 								<p>An annual talent festival, entirely planned and organised by students, 
 									featuring performances by both students and teachers, and a great stage to showcase yourself.</p>
 
@@ -145,7 +147,7 @@ <h2>2024 CQSS<br />
 										<h2>2024 夏季才艺秀</h2>
 
 									</header>
-									<a href="#" class="image fit"><img src="images/event/talentshow_1.jpg" alt="" /></a>
+									<a class="image fit"><img src="images/event/talentshow_1.jpg" alt="" /></a>
 									<p>An annual talent festival, entirely planned and organised by students, 
 										featuring performances by both students and teachers, and a great stage to showcase yourself.</p>
 									<p>一年一度的才艺盛会，完全由学生策划举办，由学生与教师共同参与表演，一个展示自我的绝佳舞台。</p>
@@ -228,8 +230,9 @@ <h3><br />Email <br />电子邮件</h3>
 					</footer>
 				<!-- Copyright -->
 					<div id="copyright">
-						<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /></ul>
-						<ul><li><a href="/credits.html">This site is managed by students, Click here to see the credits</a></li></ul>
+						<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /><br /></ul>
+						<ul><li><a href="/credits.html">Created by Eric Zhang and Levi Ji<br/></a></li></ul>
+						<ul><li><a href="/studentcouncil/contact.html">Maintained by the Ministry of Media</a></li></ul>
 						<ul><li><div class="col-4" ></div><span class="image fit" ><a href="https://zcstudio.online"><img src="images/ZCS/ZCSC401.png" alt="" /></a></span></div></li></ul>
 					</div>
 			</div>

diff --git a/schoolevent.html b/schoolevent.html
@@ -1,7 +1,8 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<title>CQSS Homepage</title>
+		<title>Canada Qingdao Secondary School</title>
+		<link rel="shortcut icon" href="/images/bg.png" />
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 		<link rel="stylesheet" href="assets/css/main.css" />
@@ -19,16 +20,16 @@
 				<nav id="nav">
 					<ul class="links">
 						<li><a href="index.html">Home 主页</a></li>
-						<li><a href="index.html">News 学校新闻</a></li>
+						<li><a href="index.html#mainB">News 学校新闻</a></li>
 						<li><a href="teachers.html">Teachers 教师</a></li>
 						<li><a href="enrollment.html">Enrollment 入学</a></li>
 						<li class="active"><a href="schoolevent.html">Event 活动</a></li>
 						<li><a href="about.html">About 关于</a></li>
 						<br>
 					</ul>
 					<ul class="icons">
-						<li><a href="studentcouncil" class="">Student Council</a></li>
-
+						<img src="/images/SC/logo.png" alt="">
+						<a href="studentcouncil" class="">Student Council</a>
 					</ul>
 				</nav>
 
@@ -45,7 +46,7 @@ <h2 style="text-align:center">School Event<br />学校活动</h2>
 										<h2>Talent Show<br />
 											艺术节</h2>
 									</header>
-									<a href="#" class="image fit"><img src="images/event/talentshow_1.jpg" alt="" /></a>
+									<a class="image fit"><img src="images/event/talentshow_1.jpg" alt="" /></a>
 									<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.</p>
 								</article>
 								<article>
@@ -54,7 +55,7 @@ <h2>Talent Show<br />
 										<h2>Terry Fox Run<br />
 											特里·福克斯公益跑</a></h2>
 									</header>
-									<a href="#" class="image fit"><img src="images/event/terryfoxrun_1.png" alt="" /></a>
+									<a class="image fit"><img src="images/event/terryfoxrun_1.png" alt="" /></a>
 									<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.</p>
 								</article>
 								<article>
@@ -63,34 +64,34 @@ <h2>Terry Fox Run<br />
 										<h2>Field Trip<br />
 										春季郊游</a></h2>
 									</header>
-									<a href="#" class="image fit"><img src="images/pic04.jpg" alt="" /></a>
+									<a class="image fit"><img src="images/pic04.jpg" alt="" /></a>
 									<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.</p>
 								</article>
 								<article>
 									<header>
 										<span class="date">Summer - Winter</span>
-										<h2><a href="#">Sports Tournament<br />
+										<h2><a>Sports Tournament<br />
 										体育巡回赛</a></h2>
 									</header>
-									<a href="#" class="image fit"><img src="images/pic05.jpg" alt="" /></a>
+									<a class="image fit"><img src="images/pic05.jpg" alt="" /></a>
 									<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.</p>
 								</article>
 								<article>
 									<header>
 										<span class="date">April 11, 2017</span>
-										<h2><a href="#">Fun Day<br />
+										<h2><a>Fun Day<br />
 											趣味运动会</a></h2>
 									</header>
-									<a href="#" class="image fit"><img src="images/event/funday_1.png" alt="" /></a>
+									<a class="image fit"><img src="images/event/funday_1.png" alt="" /></a>
 									<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.</p>
 								</article>
 								<article>
 									<header>
 										<span class="date">April - May</span>
-										<h2><a href="#">Spelling Bee<br />
+										<h2><a >Spelling Bee<br />
 											拼写比赛</a></h2>
 									</header>
-									<a href="#" class="image fit"><img src="images/pic07.jpg" alt="" /></a>
+									<a  class="image fit"><img src="images/pic07.jpg" alt="" /></a>
 									<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.</p>
 
 								</article>
@@ -130,11 +131,12 @@ <h3><br />Email <br />电子邮件</h3>
 
 					</footer>
 				<!-- Copyright -->
-					<div id="copyright">
-						<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /></ul>
-						<ul><li><a href="/credits.html">This site is managed by students, Click here to see the credits</a></li></ul>
-						<ul><li><div class="col-4" ></div><span class="image fit" ><a href="https://zcstudio.online"><img src="images/ZCS/ZCSC401.png" alt="" /></a></span></div></li></ul>
-					</div>
+				<div id="copyright">
+					<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /><br /></ul>
+					<ul><li><a href="/credits.html">Created by Eric Zhang and Levi Ji<br/></a></li></ul>
+					<ul><li><a href="/studentcouncil/contact.html">Maintained by the Ministry of Media</a></li></ul>
+					<ul><li><div class="col-4" ></div><span class="image fit" ><a href="https://zcstudio.online"><img src="images/ZCS/ZCSC401.png" alt="" /></a></span></div></li></ul>
+				</div>
 
 			</div>
 

diff --git a/studentcouncil/contact.html b/studentcouncil/contact.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<title>CQSS Homepage</title>
-		<meta charset="utf-8" />
+		<title>Canada Qingdao Secondary School</title>
+		<link rel="shortcut icon" href="/images/bg.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 		<link rel="stylesheet" href="/assets/css/main.css" />
 		<noscript><link rel="stylesheet" href="/assets/css/noscript.css" /></noscript>
@@ -24,11 +24,14 @@
 							<li><a href="openday.html">Open Day</a></li>
 							<li class="active"><a href="contact.html">Contact Us</a></li>
 						</ul>
+						<ul class="icons">
+							<img src="/images/SC/logo.png" alt="">
+						</ul>
 					</nav>
 
 				<!-- Main -->
 					<div id="main">
-						<span class="image fit"><img src="/images/SC/PMBanner.png" alt="" /></span>
+						<span class="image fit"><img src="/images/SC/OSBanner.png" alt="" /></span>
 						<!-- Post -->
 							<section class="post">
 								<header class="major">
@@ -118,9 +121,12 @@ <h3>Departmental Affairs</h3>
 					</footer>
 
 				<!-- Copyright -->
-					<div id="copyright">
-						<ul><li>&copy; Student Council of Canada Qingdao Secondary School</li><li>Powered by <a href="https://www.zcstudio.online">ZCSTUDIO</a></li></ul>
-					</div>
+				<div id="copyright">
+					<ul><li>&copy; Student Council of Canada Qingdao Secondary School</li></ul>
+					<ul><li><a href="/credits.html">Created by Eric Zhang and Levi Ji<br/></a></li></ul>
+					<ul><li><a href="/studentcouncil/contact.html">Maintained by the Ministry of Media</a></li></ul>
+					<ul><li><div class="col-4" ></div><span class="image fit" ><a href="https://zcstudio.online"><img src="/images/ZCS/ZCSC401.png" alt="" /></a></span></div></li></ul>
+				</div>
 
 			</div>