diff --git a/about.html b/about.html index b661eeb..591aab8 100644 --- a/about.html +++ b/about.html @@ -6,8 +6,8 @@ --> - Generic Page - Massively by HTML5 UP - + Canada Qingdao Secondary School + @@ -26,7 +26,7 @@ @@ -81,8 +81,9 @@


Email
电子邮件

diff --git a/articles/talentshow2024.html b/articles/talentshow2024.html index eba9195..c0ccc9c 100644 --- a/articles/talentshow2024.html +++ b/articles/talentshow2024.html @@ -6,8 +6,8 @@ --> - Generic Page - Massively by HTML5 UP - + Canada Qingdao Secondary School + @@ -26,7 +26,7 @@ diff --git a/assets/css/main.css b/assets/css/main.css index e265a5f..016d9ec 100644 --- 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 index 011f683..385ac09 100644 --- a/enrollment.html +++ b/enrollment.html @@ -6,7 +6,8 @@ --> - Generic Page - Massively by HTML5 UP + Canada Qingdao Secondary School + @@ -26,7 +27,7 @@
-
- April 25, 2017 -

This is a
- Generic Page

+ +

Enrollment
+ 入学

Aenean ornare velit lacus varius enim ullamcorper proin aliquam
facilisis ante sed etiam magna interdum congue. Lorem ipsum dolor
amet nullam sed etiam veroeros.

@@ -81,8 +81,9 @@


Email
电子邮件

diff --git a/images/QDN9.png b/images/QDN9.png index 060f301..93d1817 100644 Binary files a/images/QDN9.png and b/images/QDN9.png differ diff --git "a/images/QDN9ID - \345\211\257\346\234\254.png" "b/images/QDN9ID - \345\211\257\346\234\254.png" deleted file mode 100644 index 3433e58..0000000 Binary files "a/images/QDN9ID - \345\211\257\346\234\254.png" and /dev/null differ diff --git a/images/QDN9ID.png b/images/QDN9ID.png index 3b11357..57f7a68 100644 Binary files a/images/QDN9ID.png and b/images/QDN9ID.png differ diff --git a/images/QDN9_Campus_1.jpg b/images/QDN9_Campus_1.jpg index 9ce0e9f..01f12d9 100644 Binary files a/images/QDN9_Campus_1.jpg and b/images/QDN9_Campus_1.jpg differ diff --git a/images/QDN9_Campus_2.jpg b/images/QDN9_Campus_2.jpg index 304d8d6..3c58efc 100644 Binary files a/images/QDN9_Campus_2.jpg and b/images/QDN9_Campus_2.jpg differ diff --git a/images/QDN9_Campus_3.jpg b/images/QDN9_Campus_3.jpg index a38d1bc..485126b 100644 Binary files a/images/QDN9_Campus_3.jpg and b/images/QDN9_Campus_3.jpg differ diff --git a/images/SC/OSBanner.png b/images/SC/OSBanner.png index 22d6db4..bddf517 100644 Binary files a/images/SC/OSBanner.png and b/images/SC/OSBanner.png differ diff --git a/images/SC/PMBanner.png b/images/SC/PMBanner.png index 2fdceda..76675a3 100644 Binary files a/images/SC/PMBanner.png and b/images/SC/PMBanner.png differ diff --git a/images/SC/SCBanner.png b/images/SC/SCBanner.png index fce47a3..6b881f3 100644 Binary files a/images/SC/SCBanner.png and b/images/SC/SCBanner.png differ diff --git a/images/SC/SCEmblem.png b/images/SC/SCEmblem.png index bb928b4..d4d0f70 100644 Binary files a/images/SC/SCEmblem.png and b/images/SC/SCEmblem.png differ diff --git a/images/SC/logo.png b/images/SC/logo.png new file mode 100644 index 0000000..cfa1f04 Binary files /dev/null and b/images/SC/logo.png differ diff --git a/images/Seven Core.png b/images/Seven Core.png index b42e299..7611151 100644 Binary files a/images/Seven Core.png and b/images/Seven Core.png differ diff --git a/images/ZCS/ZCS75.png b/images/ZCS/ZCS75.png index dad2223..131cb0b 100644 Binary files a/images/ZCS/ZCS75.png and b/images/ZCS/ZCS75.png differ diff --git a/images/ZCS/ZCSC200.png b/images/ZCS/ZCSC200.png index 96e30b7..3e35181 100644 Binary files a/images/ZCS/ZCSC200.png and b/images/ZCS/ZCSC200.png differ diff --git a/images/ZCS/ZCSC40.png b/images/ZCS/ZCSC40.png index 0b828be..233e667 100644 Binary files a/images/ZCS/ZCSC40.png and b/images/ZCS/ZCSC40.png differ diff --git a/images/ZCS/ZCSC400.png b/images/ZCS/ZCSC400.png index d8fee10..22324f9 100644 Binary files a/images/ZCS/ZCSC400.png and b/images/ZCS/ZCSC400.png differ diff --git a/images/ZCS/ZCSC401.png b/images/ZCS/ZCSC401.png index f0d030f..a56b544 100644 Binary files a/images/ZCS/ZCSC401.png and b/images/ZCS/ZCSC401.png differ diff --git a/images/bg.png b/images/bg.png index 011cf82..f23dd0e 100644 Binary files a/images/bg.png and b/images/bg.png differ diff --git a/images/event/awardceremony_1.png b/images/event/awardceremony_1.png index 69df37f..18590bd 100644 Binary files a/images/event/awardceremony_1.png and b/images/event/awardceremony_1.png differ diff --git a/images/event/funday_1.png b/images/event/funday_1.png index 8fd8e83..dd70a88 100644 Binary files a/images/event/funday_1.png and b/images/event/funday_1.png differ diff --git a/images/event/funday_2.png b/images/event/funday_2.png index 7025a23..283820a 100644 Binary files a/images/event/funday_2.png and b/images/event/funday_2.png differ diff --git a/images/event/talentshow_1.jpg b/images/event/talentshow_1.jpg index 0dcf982..6381440 100644 Binary files a/images/event/talentshow_1.jpg and b/images/event/talentshow_1.jpg differ diff --git a/images/event/talentshow_2.jpg b/images/event/talentshow_2.jpg index 3658f33..0e25b0d 100644 Binary files a/images/event/talentshow_2.jpg and b/images/event/talentshow_2.jpg differ diff --git a/images/event/terryfoxrun_1.png b/images/event/terryfoxrun_1.png index 4796c4b..f246014 100644 Binary files a/images/event/terryfoxrun_1.png and b/images/event/terryfoxrun_1.png differ diff --git a/images/overlay.png b/images/overlay.png index 127bb2b..acf8589 100644 Binary files a/images/overlay.png and b/images/overlay.png differ diff --git a/images/pic01.jpg b/images/pic01.jpg index b8c5e1e..f3a18c1 100644 Binary files a/images/pic01.jpg and b/images/pic01.jpg differ diff --git a/images/pic02.jpg b/images/pic02.jpg deleted file mode 100644 index fe3be4f..0000000 Binary files a/images/pic02.jpg and /dev/null differ diff --git a/images/pic03.jpg b/images/pic03.jpg deleted file mode 100644 index 282e4f5..0000000 Binary files a/images/pic03.jpg and /dev/null differ diff --git a/images/pic04.jpg b/images/pic04.jpg deleted file mode 100644 index b0206cb..0000000 Binary files a/images/pic04.jpg and /dev/null differ diff --git a/images/pic05.jpg b/images/pic05.jpg deleted file mode 100644 index 3731316..0000000 Binary files a/images/pic05.jpg and /dev/null differ diff --git a/images/pic06.jpg b/images/pic06.jpg deleted file mode 100644 index a9762ce..0000000 Binary files a/images/pic06.jpg and /dev/null differ diff --git a/images/pic07.jpg b/images/pic07.jpg deleted file mode 100644 index 57d9304..0000000 Binary files a/images/pic07.jpg and /dev/null differ diff --git a/images/pic08.jpg b/images/pic08.jpg deleted file mode 100644 index e0f281d..0000000 Binary files a/images/pic08.jpg and /dev/null differ diff --git a/images/pic09.jpg b/images/pic09.jpg deleted file mode 100644 index cfdb688..0000000 Binary files a/images/pic09.jpg and /dev/null differ diff --git a/images/teacher/bian.png b/images/teacher/bian.png index f6f9353..d5d78bb 100644 Binary files a/images/teacher/bian.png and b/images/teacher/bian.png differ diff --git a/images/teacher/bray.png b/images/teacher/bray.png index 0e9a459..1027fcf 100644 Binary files a/images/teacher/bray.png and b/images/teacher/bray.png differ diff --git a/images/teacher/dirk.png b/images/teacher/dirk.png index 6f64af2..364e60e 100644 Binary files a/images/teacher/dirk.png and b/images/teacher/dirk.png differ diff --git a/images/teacher/hampton.png b/images/teacher/hampton.png index 99293d6..92658ba 100644 Binary files a/images/teacher/hampton.png and b/images/teacher/hampton.png differ diff --git a/images/teacher/lani.png b/images/teacher/lani.png index 4106395..cb07821 100644 Binary files a/images/teacher/lani.png and b/images/teacher/lani.png differ diff --git a/images/teacher/troy.png b/images/teacher/troy.png index 90de364..a539142 100644 Binary files a/images/teacher/troy.png and b/images/teacher/troy.png differ diff --git a/images/united_bg.png b/images/united_bg.png index 0fd9ae8..e9ff317 100644 Binary files a/images/united_bg.png and b/images/united_bg.png differ diff --git a/index.html b/index.html index ab5798e..c67b7e8 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,8 @@ - CQSS Homepage + Canada Qingdao Secondary School + @@ -14,7 +15,7 @@

We are

Canada Qingdao
Secondary School

- +

我们是

青岛九中中加班

@@ -34,16 +35,17 @@

青岛九中中加班

@@ -56,7 +58,7 @@

青岛九中中加班

2024
Summer Talent Show
夏季才艺展示

- A picture of the 2024 CQSS Summer Talent Show + A picture of the 2024 CQSS Summer Talent Show

An annual talent festival, entirely planned and organised by students, featuring performances by both students and teachers, and a great stage to showcase yourself.

@@ -145,7 +147,7 @@

2024 CQSS

2024 夏季才艺秀

- +

An annual talent festival, entirely planned and organised by students, featuring performances by both students and teachers, and a great stage to showcase yourself.

一年一度的才艺盛会，完全由学生策划举办，由学生与教师共同参与表演，一个展示自我的绝佳舞台。

@@ -228,8 +230,9 @@


Email
电子邮件

diff --git a/schoolevent.html b/schoolevent.html index a5c6053..4d837bf 100644 --- a/schoolevent.html +++ b/schoolevent.html @@ -1,7 +1,8 @@ - CQSS Homepage + Canada Qingdao Secondary School + @@ -19,7 +20,7 @@ @@ -45,7 +46,7 @@

School Event
学校活动

Talent Show
艺术节

- +

Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.

@@ -54,7 +55,7 @@

Talent Show

Terry Fox Run
特里·福克斯公益跑

- +

Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.

@@ -63,34 +64,34 @@

Terry Fox Run

Field Trip
春季郊游

- +

Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.

Summer - Winter -

Sports Tournament
+

Sports Tournament
体育巡回赛

- +

Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.

April 11, 2017 -

Fun Day
+

Fun Day
趣味运动会

- +

Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.

April - May -

Spelling Bee
+

Spelling Bee
拼写比赛

- +

Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis magna etiam.

@@ -130,11 +131,12 @@


Email
电子邮件

- - + + diff --git a/studentcouncil/contact.html b/studentcouncil/contact.html index 72067ed..8387f10 100644 --- a/studentcouncil/contact.html +++ b/studentcouncil/contact.html @@ -1,8 +1,8 @@ - CQSS Homepage - + Canada Qingdao Secondary School + @@ -24,11 +24,14 @@
  • Open Day
  • Contact Us
    • +
    - +
    @@ -118,9 +121,12 @@

    Departmental Affairs

    - + +
    diff --git a/studentcouncil/index.html b/studentcouncil/index.html index 98c1801..a36ac32 100644 --- a/studentcouncil/index.html +++ b/studentcouncil/index.html @@ -1,8 +1,8 @@ - CQSS Homepage - + Canada Qingdao Secondary School + @@ -24,6 +24,9 @@
  • Open Day
  • Contact Us
    • + @@ -143,9 +146,12 @@

    Components of the Student Council

    - + + diff --git a/studentcouncil/openday.html b/studentcouncil/openday.html index d3acef0..d037c9b 100644 --- a/studentcouncil/openday.html +++ b/studentcouncil/openday.html @@ -1,8 +1,8 @@ - CQSS Homepage - + Canada Qingdao Secondary School + @@ -24,11 +24,14 @@
  • Open Day
  • Contact Us
    • +
    - +
    @@ -54,9 +57,12 @@

    Open Day Schedule

    - + +
    diff --git a/studentcouncil/publicrelease.html b/studentcouncil/publicrelease.html index 8a0c66f..e540d4d 100644 --- a/studentcouncil/publicrelease.html +++ b/studentcouncil/publicrelease.html @@ -2,8 +2,8 @@ - CQSS Homepage - + Canada Qingdao Secondary School + @@ -25,6 +25,9 @@
  • Open Day
  • Contact Us
    • +
    @@ -52,8 +55,12 @@

    Search by Division

    + diff --git a/studentcouncil/surprise/index.html b/studentcouncil/surprise/index.html index 8e977dd..ed64f91 100644 --- a/studentcouncil/surprise/index.html +++ b/studentcouncil/surprise/index.html @@ -3,15 +3,15 @@ Credits and Easter Egg - - +
    -
    Creators of this Website are

    Eric Zhang
    and
    Levi Ji.
    +
    Creators of this Website are

    Eric Zhang
    and
    Levi Ji
    Canada Qingdao Secondary School
    + \ No newline at end of file diff --git a/teachers.html b/teachers.html index 511b2a5..96ef036 100644 --- a/teachers.html +++ b/teachers.html @@ -1,7 +1,8 @@ - Generic Page - Massively by HTML5 UP + Canada Qingdao Secondary School + @@ -21,7 +22,7 @@ @@ -222,8 +223,9 @@


    Email
    电子邮件