Skip to content

Commit

Permalink
Merge pull request #9 from EZLJ/main
Browse files Browse the repository at this point in the history 
Daily Update
  • Loading branch information
@PZV5077
PZV5077 authored Jun 11, 2024
2 parents 674fcc7 + 75cc8cc commit aaf412a
Show file tree
Hide file tree
Showing 37 changed files with 6,371 additions and 60 deletions.
Empty file removed LICENCE
View file
Empty file.
12 changes: 4 additions & 8 deletions about.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
<!DOCTYPE HTML>
<!--
Massively by HTML5 UP
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<head>
<title>Canada Qingdao Secondary School</title>
Expand All @@ -29,12 +24,13 @@
<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="houses.html">Houses 学院</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/">Student Council</a></li>
<li><a href="/studentcouncil/"><img src="/images/SC/logo_small.png" alt="" height=100% style="float:left"></a></li>
</ul>
</nav>

Expand All @@ -45,8 +41,8 @@
<section class="post">
<header class="major">
<span class="date">April 25, 2017</span>
<h1>This is a<br />
Generic Page</h1>
<h1>We are<br />
Canada Qingdao Secondary School</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>
Expand Down
3 changes: 2 additions & 1 deletion articles/talentshow2024.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@
<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="houses.html">Houses 学院</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/">Student Council</a></li>
<li><a href="/studentcouncil/"><img src="/images/SC/logo_small.png" alt="" height=100% style="float:left"></a></li>
</ul>
</nav>

Expand Down
6,143 changes: 6,142 additions & 1 deletion assets/css/fontawesome-all.min.css
View file

Large diffs are not rendered by default.

35 changes: 31 additions & 4 deletions assets/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,33 @@
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
*/

/*Extra CSS*/

.aligncenter {
clear: both;
display: block;
margin: auto;
}


.heimu, .heimu a, a .heimu, .heimu a.new {
background-color: #252525;
color: #252525;
text-shadow: none;
}
.heimu:hover, .heimu:active,
.heimu:hover .heimu, .heimu:active .heimu {
color: white !important;
}
.heimu:hover a, a:hover .heimu,
.heimu:active a, a:active .heimu {
color: lightblue !important;
}
.heimu:hover .new, .heimu .new:hover, .new:hover .heimu,
.heimu:active .new, .heimu .new:active, .new:active .heimu {
color: #BA0000 !important;
}

html, body, div, span, applet, object,
iframe, h1, h2, h3, h4, h5, h6, p, blockquote,
pre, a, abbr, acronym, address, big, cite,
Expand Down Expand Up @@ -3242,8 +3269,8 @@ input, select, textarea {
/* background-image: url(/images/united_bg.png); */

/* background: linear-gradient(139deg,#D40909 14.23%,#FF9C00 28.51%,#FFFF1A 42.85%,#00FF0B 57.14%,#00B2FE 71.42%,#8603FF 85.71%); */
/* background: radial-gradient(circle at 100% 29.67%,#D40909 14.23%,#FF9C00 28.51%,#FFFF1A 42.85%,#00FF0B 57.14%,#00B2FE 71.42%,#8603FF 85.71%); */

/* background: radial-gradient(circle at 100% 29.67%,#D40909 14.23%,#FF9C00 28.51%,#FFFF1A 42.85%,#00FF0B 57.14%,#00B2FE 71.42%,#8603FF 85.71%);
*/
/* Yellow House */
/* background-image: linear-gradient(to top, #fddb92 0%, #ffd500 100%); */

Expand All @@ -3253,8 +3280,8 @@ input, select, textarea {
/* background-image: linear-gradient(to top, #ff0844 0%, #ffb199 100%); */

/* Green House */
/* background-image: linear-gradient(to top, #0ba360 0%, #3cba92 100%); */

/* background-image: linear-gradient(to top, #0ba360 0%, #3cba92 100%);
*/
/* Orange House */
/* background-image: linear-gradient(-20deg, #fc6076 0%, #ff9a44 100%); */

Expand Down
44 changes: 20 additions & 24 deletions credits.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@
<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="houses.html">Houses 学院</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/">Student Council</a></li>
<li><a href="/studentcouncil/"><img src="/images/SC/logo_small.png" alt="" height=100% style="float:left"></a></li>
</ul>
</nav>

Expand All @@ -45,37 +47,31 @@ <h1>Credits</h1>
<p>The authors would like to express his sincerest gratitude to the following for their unselfish help in building the website</p>
<li><b>Mr. William Wei</b>, for his help with the visual and artistic effects.</li>
<li><b>Mr. Eason Han</b>, for his careful selection of photographs for the website</li>
<li><b>Mr. Uni Hampton</b>, the school's principal, for his support and encouragement</li>
<li><b>Mr. Umi Hampton</b>, the school's principal, for his support and encouragement</li>
<li><b>Mr. Shan Zhou</b>, the school's IT teacher, who gave us some very valuable advice and support</li>
<li><b>All members of Student Council</b>, thank you for your support of our work.</li>
<li>Theme inspired by <a href="https://www.html5up.net">html5up.net</a> | @ajlkn, under the <a href="https://creativecommons.org/licenses/by/3.0/">CCA 3.0</a> license.</li>
<br>

<p>This site is maintained by the Ministry of Media, <a href="/studentcouncil/index.html">Student Council</a>.</p>

<img src="images/ZCS/sillyboy.png" alt="" class="aligncenter" height="50px" id="myImage" />
<br>
<span id="hiddenText" class="heimu" title="surprise" style="display: none; justify-content: center;">Levi Sucks.</span>
<script>
var clickCount = 0;
var image = document.getElementById("myImage");
var hiddenText = document.getElementById("hiddenText");
image.addEventListener("click", function() {
clickCount++;
if (clickCount === 5) {
hiddenText.style.display = "flex";
}
});
</script>
</section>

</div>

<!-- Footer -->
<footer id="intro">
<section class="split contact">
<section class="alt">
<h3>Address <br />学校地址</h3>
<h7>No.559 Qixinghe Road, Huangdao District, <br/>
Qingdao, Shandong Province, China <br />山东省青岛市黄岛区七星河路559号</h7>
</section>

<section>
<h3><br />Phone <br />电话</h3>
<p>+86 8888 8888</a></p>
</section>
<section>
<h3><br />Email <br />电子邮件</h3>
<p><a href="mailto:info@untitled.tld">info@untitled.tld</a></p>
</section>
</section>

</footer>

<!-- Copyright -->
<div id="copyright">
<ul><li>&copy; 2024 Canada Qingdao Secondary School</li><li>All Rights Reserved.</li><br /><br /></ul>
Expand Down
3 changes: 2 additions & 1 deletion enrollment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@
<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="houses.html">Houses 学院</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/">Student Council</a></li>
<li><a href="/studentcouncil/"><img src="/images/SC/logo_small.png" alt="" height=100% style="float:left"></a></li>
</ul>
</nav>

Expand Down
105 changes: 105 additions & 0 deletions houses.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<!DOCTYPE HTML>

<html>
<head>
<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>
</head>
<body class="is-preload">

<!-- Wrapper -->
<div id="wrapper">

<!-- Header -->
<header id="header">
<a href="index.html" class="logo">Canada Qingdao Secondary School</a>
</header>

<!-- Nav -->
<nav id="nav">
<ul class="links">
<li><a href="index.html">Home 主页</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="houses.html">Houses 学院</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/"><img src="/images/SC/logo_small.png" alt="" height=100% style="float:left"></a></li>
</ul>
</nav>

<!-- Main -->
<div id="main">

<!-- Post -->
<section class="post">
<header class="major">
<h1>Houses<br />学院</h1>
<p>Each CQSS student will be randomly assigned to a house at the time of admission, and will compete with other students in the house during House Time each day
<br />每一名CQSS学生在入学时都会被随机分到一个学院，在每天的House Time, 他们将和学院内的其他同学进行活动，并与其他学院竞争</p>
</header>
<h2>Orange House</h2>
<div class="image main"><img src="images/pic01.jpg" alt="" /></div>
<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur sapien risus, commodo eget turpis at, elementum convallis enim turpis, lorem ipsum dolor sit amet nullam.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus. Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum.</p>


<h2>Purple House</h2>
<div class="image main"><img src="images/pic01.jpg" alt="" /></div>
<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur sapien risus, commodo eget turpis at, elementum convallis enim turpis, lorem ipsum dolor sit amet nullam.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus. Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum.</p>



</section>

</div>

<!-- Footer -->
<footer id="intro">
<section class="split contact">
<section class="alt">
<h3>Address <br />学校地址</h3>
<h7>No.559 Qixinghe Road, Huangdao District, <br/>
Qingdao, Shandong Province, China <br />山东省青岛市黄岛区七星河路559号</h7>
</section>

<section>
<h3><br />Phone <br />电话</h3>
<p>+86 8888 8888</a></p>
</section>
<section>
<h3><br />Email <br />电子邮件</h3>
<p><a href="mailto:info@untitled.tld">info@untitled.tld</a></p>
</section>
</section>

</footer>
<!-- Copyright -->
<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>

<!-- Scripts -->
<script src="assets/js/jquery.min.js"></script>
<script src="assets/js/jquery.scrollex.min.js"></script>
<script src="assets/js/jquery.scrolly.min.js"></script>
<script src="assets/js/browser.min.js"></script>
<script src="assets/js/breakpoints.min.js"></script>
<script src="assets/js/util.js"></script>
<script src="assets/js/main.js"></script>

</body>
</html>
Binary file modified images/SC/SCEmblem.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/SC/logo.ico
View file
Binary file not shown.
Binary file added images/SC/logo_nav.ico
View file
Binary file not shown.
1 change: 1 addition & 0 deletions images/SC/shield.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/ZCS/sillyboy.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ <h1>青岛九中中加班</h1>
<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="houses.html">Houses 学院</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/">Student Council</a></li>
<li><a href="/studentcouncil/"><img src="/images/SC/logo_small.png" alt="" height=100% style="float:left"></a></li>
</ul>
</nav>

Expand Down
Loading

0 comments on commit aaf412a

Please sign in to comment.